From 4b027fbf020c55c2f8244ac2c7ef8fe4807e46c5 Mon Sep 17 00:00:00 2001
From: Jave-Chen <acc4hf@126.com>
Date: Tue, 7 Jan 2020 21:53:55 +0800
Subject: [PATCH] =?UTF-8?q?Fix=20SonarCloud=20bug=20=E2=80=9CResources=20s?=
 =?UTF-8?q?hould=20be=20closed=E2=80=9D=20(#1667)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 #1666 Fix SonarCloud bug “Resources should be closed”
---
 .../api/utils/ZooKeeperState.java             | 58 +++++++++----------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java
index 523f8103aa..968a51ad63 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java
@@ -55,41 +55,41 @@ public class ZooKeeperState {
 	public void getZookeeperInfo() {
 		String content = cmd("srvr");
 		if (StringUtils.isNotBlank(content)) {
-			Scanner scannerForStat = new Scanner(content);
-			while (scannerForStat.hasNext()) {
-				String line = scannerForStat.nextLine();
-				if (line.startsWith("Latency min/avg/max:")) {
-					String[] latencys = getStringValueFromLine(line).split("/");
-					minLatency = Integer.parseInt(latencys[0]);
-					avgLatency = Integer.parseInt(latencys[1]);
-					maxLatency = Integer.parseInt(latencys[2]);
-				} else if (line.startsWith("Received:")) {
-					received = Long.parseLong(getStringValueFromLine(line));
-				} else if (line.startsWith("Sent:")) {
-					sent = Long.parseLong(getStringValueFromLine(line));
-				} else if (line.startsWith("Outstanding:")) {
-					outStanding = Integer.parseInt(getStringValueFromLine(line));
-				} else if (line.startsWith("Zxid:")) {
-					zxid = Long.parseLong(getStringValueFromLine(line).substring(2), 16);
-				} else if (line.startsWith("Mode:")) {
-					mode = getStringValueFromLine(line);
-				} else if (line.startsWith("Node count:")) {
-					nodeCount = Integer.parseInt(getStringValueFromLine(line));
+			try (Scanner scannerForStat = new Scanner(content))  {
+				while (scannerForStat.hasNext()) {
+					String line = scannerForStat.nextLine();
+					if (line.startsWith("Latency min/avg/max:")) {
+						String[] latencys = getStringValueFromLine(line).split("/");
+						minLatency = Integer.parseInt(latencys[0]);
+						avgLatency = Integer.parseInt(latencys[1]);
+						maxLatency = Integer.parseInt(latencys[2]);
+					} else if (line.startsWith("Received:")) {
+						received = Long.parseLong(getStringValueFromLine(line));
+					} else if (line.startsWith("Sent:")) {
+						sent = Long.parseLong(getStringValueFromLine(line));
+					} else if (line.startsWith("Outstanding:")) {
+						outStanding = Integer.parseInt(getStringValueFromLine(line));
+					} else if (line.startsWith("Zxid:")) {
+						zxid = Long.parseLong(getStringValueFromLine(line).substring(2), 16);
+					} else if (line.startsWith("Mode:")) {
+						mode = getStringValueFromLine(line);
+					} else if (line.startsWith("Node count:")) {
+						nodeCount = Integer.parseInt(getStringValueFromLine(line));
+					}
 				}
-			}
-			scannerForStat.close();
+			} 	
 		}
 
 		String wchsText = cmd("wchs");
 		if (StringUtils.isNotBlank(wchsText)) {
-			Scanner scannerForWchs = new Scanner(wchsText);
-			while (scannerForWchs.hasNext()) {
-				String line = scannerForWchs.nextLine();
-				if (line.startsWith("Total watches:")) {
-					watches = Integer.parseInt(getStringValueFromLine(line));
+			try (Scanner scannerForWchs = new Scanner(wchsText)) {
+				while (scannerForWchs.hasNext()) {
+					String line = scannerForWchs.nextLine();
+					if (line.startsWith("Total watches:")) {
+						watches = Integer.parseInt(getStringValueFromLine(line));
+					}
 				}
-			}
-			scannerForWchs.close();
+			}	
 		}
 
 		String consText = cmd("cons");