diff --git a/pom.xml b/pom.xml index 01829335a872e9bf5865629bba0dd132b837967b..f3c2bd85677ba5ca8af8842e031fd71e056e28d4 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.7.12 org.opengauss diff --git a/src/main/java/org/opengauss/cmrestapi/CMRestAPI.java b/src/main/java/org/opengauss/cmrestapi/CMRestAPI.java index efea7dee6e27b81b34a355ba78a129a08b33da8e..3f0f105dbb90733757a2c936af8e37e9778efa17 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(); - } else { - appWhiteList.clear(); - } - BufferedReader br = new BufferedReader(new FileReader(appWhiteListFile)); + if (appWhiteList == null) { + appWhiteList = new HashSet(); + } 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 414988b8caac11722f5d680a2d9a9e21ef370c6a..da921f545de0ae8dbda12ce869f7ad626710a274 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) {