From 5561dc1d06a4c7fdeca761496def031fded7baf0 Mon Sep 17 00:00:00 2001
From: xue_meng_en <1836611252@qq.com>
Date: Mon, 24 Apr 2023 09:37:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=84=E6=BA=90=E6=B3=84?=
 =?UTF-8?q?=E9=9C=B2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/opengauss/cmrestapi/CMRestAPI.java    | 13 ++++++-------
 .../org/opengauss/cmrestapi/OGCmdExecuter.java     | 14 ++++++++++----
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/opengauss/cmrestapi/CMRestAPI.java b/src/main/java/org/opengauss/cmrestapi/CMRestAPI.java
index efea7de..3f0f105 100644
--- a/src/main/java/org/opengauss/cmrestapi/CMRestAPI.java
+++ b/src/main/java/org/opengauss/cmrestapi/CMRestAPI.java
@@ -163,13 +163,12 @@ public class CMRestAPI {
      * void
      */
     public static void getAppWhiteList() {
-        try {
-            if (appWhiteList == null) {
-                appWhiteList = new HashSet<String>();
-            } else {
-                appWhiteList.clear();
-            }
-            BufferedReader br = new BufferedReader(new FileReader(appWhiteListFile));
+        if (appWhiteList == null) {
+            appWhiteList = new HashSet<String>();
+        } else {
+            appWhiteList.clear();
+        }
+        try (BufferedReader br = new BufferedReader(new FileReader(appWhiteListFile))) {
             String line = null;
             while ((line = br.readLine()) != null) {
                 appWhiteList.add(line);
diff --git a/src/main/java/org/opengauss/cmrestapi/OGCmdExecuter.java b/src/main/java/org/opengauss/cmrestapi/OGCmdExecuter.java
index 414988b..da921f5 100644
--- a/src/main/java/org/opengauss/cmrestapi/OGCmdExecuter.java
+++ b/src/main/java/org/opengauss/cmrestapi/OGCmdExecuter.java
@@ -64,11 +64,17 @@ public class OGCmdExecuter {
      * CmdResult
      */
     public static CmdResult execCmd(String command) {
+        logger.debug("Excuting command: {}.",command);
+        String[] cmd = new String[]{"/bin/sh", "-c", command};
+        Process process = null;
         try {
-            logger.debug("Excuting command: {}.",command);
-            String[] cmd = new String[]{"/bin/sh", "-c", command};
-            Process process = Runtime.getRuntime().exec(cmd);
-            BufferedReader br = new BufferedReader(new InputStreamReader(process.getInputStream()));
+            process = Runtime.getRuntime().exec(cmd);
+        } catch (IOException e) {
+            e.printStackTrace();
+            logger.error("Exception happend when excute shell command: {}.\nDetail:\n{}", command, e);
+            return null;
+        }
+        try (BufferedReader br = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
             StringBuffer sb = new StringBuffer();
             String line;
             while ((line = br.readLine()) != null) {
-- 
Gitee