From a7c93934f16bf94e5a5be25483f4685827cdefc6 Mon Sep 17 00:00:00 2001 From: Sophia Date: Wed, 19 Apr 2023 03:04:29 +0000 Subject: [PATCH 01/10] update src/main/java/org/opengauss/portalcontroller/Tools.java. Signed-off-by: Sophia --- src/main/java/org/opengauss/portalcontroller/Tools.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/opengauss/portalcontroller/Tools.java b/src/main/java/org/opengauss/portalcontroller/Tools.java index f3dfdc9..dbbe582 100644 --- a/src/main/java/org/opengauss/portalcontroller/Tools.java +++ b/src/main/java/org/opengauss/portalcontroller/Tools.java @@ -357,7 +357,9 @@ public class Tools { String value = ""; Properties pps = new Properties(); try { - pps.load(new FileInputStream(path)); + FileInputStream fin = new FileInputStream(path); + pps.load(fin) + fin.close() value = pps.getProperty(key); } catch (FileNotFoundException e) { LOGGER.error("File not found exception occurred in getting single properties parameter."); -- Gitee From 922c1954f1bd7fca1c442f0a295fcfbe8d245e8d Mon Sep 17 00:00:00 2001 From: Sophia Date: Wed, 19 Apr 2023 07:57:08 +0000 Subject: [PATCH 02/10] =?UTF-8?q?update=20src/main/java/org/opengauss/port?= =?UTF-8?q?alcontroller/Tools.java.=20Do=20not=20hard-code=20'\'=20or=20'/?= =?UTF-8?q?'=20in=20the=20code=20as=20file=20separator.=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sophia --- .../org/opengauss/portalcontroller/Tools.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/opengauss/portalcontroller/Tools.java b/src/main/java/org/opengauss/portalcontroller/Tools.java index dbbe582..ead8b64 100644 --- a/src/main/java/org/opengauss/portalcontroller/Tools.java +++ b/src/main/java/org/opengauss/portalcontroller/Tools.java @@ -523,9 +523,9 @@ public class Tools { * @param migrationparametersTable migrationparametersTable */ public static void changeMigrationDatacheckParameters(Hashtable migrationparametersTable) { - String datacheckSourcePath = PortalControl.portalWorkSpacePath + "config/datacheck/application-source.yml"; - String datacheckSinkPath = PortalControl.portalWorkSpacePath + "config/datacheck/application-sink.yml"; - String datacheckServicePath = PortalControl.portalWorkSpacePath + "config/datacheck/application.yml"; + String datacheckSourcePath = PortalControl.portalWorkSpacePath + "config" + File.separator + "datacheck" + File.separator + "application-source.yml"; + String datacheckSinkPath = PortalControl.portalWorkSpacePath + "config" + File.separator + "datacheck" + File.separator + "application-sink.yml"; + String datacheckServicePath = PortalControl.portalWorkSpacePath + "config" + File.separator + "datacheck" + File.separator + "application.yml"; int checkPort = StartPort.CHECK + PortalControl.portId * 10; ArrayList portList = Tools.getAvailablePorts(checkPort, 3, 1000); int sourcePort = portList.get(0); @@ -735,9 +735,9 @@ public class Tools { public static int writeInputOrder(String command) { int temp = 0; boolean flag = false; - File file = new File(PortalControl.portalWorkSpacePath + "config/input"); + File file = new File(PortalControl.portalWorkSpacePath + "config" + File.separator + "input"); try { - RuntimeExecTools.executeOrder("mkfifo " + PortalControl.portalWorkSpacePath + "config/input", 2000, PortalControl.portalWorkSpacePath + "logs/error.log"); + RuntimeExecTools.executeOrder("mkfifo " + PortalControl.portalWorkSpacePath + "config" + File.separator + "input", 2000, PortalControl.portalWorkSpacePath + "logs/error.log"); BufferedWriter bufferedWriter = new BufferedWriter(new FileWriter(file)); bufferedWriter.write(command); bufferedWriter.flush(); @@ -1377,7 +1377,7 @@ public class Tools { public static void stopExclusiveSoftware(String methodName, String softwareName) { int pid = Tools.getCommandPid(Task.getTaskProcessMap().get(methodName)); if (pid != -1) { - RuntimeExecTools.executeOrder("kill -15 " + pid, 2000, PortalControl.portalWorkSpacePath + "logs/error.log"); + RuntimeExecTools.executeOrder("kill -15 " + pid, 2000, PortalControl.portalWorkSpacePath + "logs" + File.separator + "error.log"); } for (RunningTaskThread runningTaskThread : Plan.getRunningTaskThreadsList()) { if (runningTaskThread.getMethodName().equals(methodName)) { @@ -1403,10 +1403,10 @@ public class Tools { criticalWordList.add(Parameter.PORTAL_NAME); if (!Tools.checkAnotherProcessExist(criticalWordList)) { if (fileExist && useSoftWare) { - RuntimeExecTools.executeOrder(order, 3000, PortalControl.portalWorkSpacePath + "logs/error.log"); + RuntimeExecTools.executeOrder(order, 3000, PortalControl.portalWorkSpacePath + "logs" + File.separator + "error.log"); LOGGER.info("Stop " + name + "."); } else if (fileExist) { - RuntimeExecTools.executeOrder(order, 3000, PortalControl.portalWorkSpacePath + "logs/error.log"); + RuntimeExecTools.executeOrder(order, 3000, PortalControl.portalWorkSpacePath + "logs" + File.separator + "error.log"); } else if (useSoftWare) { LOGGER.info("File " + executeFile + " not exists."); } @@ -1476,11 +1476,11 @@ public class Tools { * @return the boolean */ public static boolean outputDatacheckStatus(String datacheckType) { - String checkSourceLogPath = PortalControl.portalWorkSpacePath + "logs/datacheck/source.log"; + String checkSourceLogPath = PortalControl.portalWorkSpacePath + "logs" + File.separator + "datacheck" + File.separator + "source.log"; boolean flag1 = Tools.outputStatus(checkSourceLogPath); - String checkSinkLogPath = PortalControl.portalWorkSpacePath + "logs/datacheck/sink.log"; + String checkSinkLogPath = PortalControl.portalWorkSpacePath + "logs" + File.separator + "datacheck" + File.separator + "sink.log"; boolean flag2 = Tools.outputStatus(checkSinkLogPath); - String checkLogPath = PortalControl.portalWorkSpacePath + "logs/datacheck/check.log"; + String checkLogPath = PortalControl.portalWorkSpacePath + "logs" + File.separator + "datacheck" + File.separator + "check.log"; boolean flag3 = Tools.outputStatus(checkLogPath); boolean flag = flag1 && flag2 && flag3; Tools.outputInformation(flag, datacheckType + " is running.", datacheckType + " has error."); @@ -1577,7 +1577,7 @@ public class Tools { * Sets x log path. */ public static void setXLogPath() { - String xLogPath = PortalControl.portalWorkSpacePath + "status/incremental/xlog.txt"; + String xLogPath = PortalControl.portalWorkSpacePath + "status" + File.separator + "incremental" + File.separator + "xlog.txt"; String xLogLocation = ""; File file = new File(xLogPath); try { @@ -1597,7 +1597,7 @@ public class Tools { } Hashtable hashtable = new Hashtable<>(); hashtable.put("xlog.location", xLogLocation); - Tools.changePropertiesParameters(hashtable, portalWorkSpacePath + "config/debezium/opengauss-source.properties"); + Tools.changePropertiesParameters(hashtable, portalWorkSpacePath + "config" + File.separator + "debezium" + File.separator + "opengauss-source.properties"); } } -- Gitee From 0c596b1be76e3985f53f297e557ce579872bd468 Mon Sep 17 00:00:00 2001 From: Sophia Date: Wed, 19 Apr 2023 08:03:48 +0000 Subject: [PATCH 03/10] update src/main/java/org/opengauss/portalcontroller/Tools.java. Signed-off-by: Sophia --- src/main/java/org/opengauss/portalcontroller/Tools.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/opengauss/portalcontroller/Tools.java b/src/main/java/org/opengauss/portalcontroller/Tools.java index ead8b64..6382e57 100644 --- a/src/main/java/org/opengauss/portalcontroller/Tools.java +++ b/src/main/java/org/opengauss/portalcontroller/Tools.java @@ -737,7 +737,7 @@ public class Tools { boolean flag = false; File file = new File(PortalControl.portalWorkSpacePath + "config" + File.separator + "input"); try { - RuntimeExecTools.executeOrder("mkfifo " + PortalControl.portalWorkSpacePath + "config" + File.separator + "input", 2000, PortalControl.portalWorkSpacePath + "logs/error.log"); + RuntimeExecTools.executeOrder("mkfifo " + PortalControl.portalWorkSpacePath + "config" + File.separator + "input", 2000, PortalControl.portalWorkSpacePath + "logs" + File.separator + "error.log"); BufferedWriter bufferedWriter = new BufferedWriter(new FileWriter(file)); bufferedWriter.write(command); bufferedWriter.flush(); -- Gitee From c35fb86b86874636014186b7eb619c7a2d9a540b Mon Sep 17 00:00:00 2001 From: Sophia Date: Wed, 19 Apr 2023 08:18:27 +0000 Subject: [PATCH 04/10] update src/main/java/org/opengauss/portalcontroller/Tools.java. Signed-off-by: Sophia --- src/main/java/org/opengauss/portalcontroller/Tools.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/opengauss/portalcontroller/Tools.java b/src/main/java/org/opengauss/portalcontroller/Tools.java index 6382e57..6124de5 100644 --- a/src/main/java/org/opengauss/portalcontroller/Tools.java +++ b/src/main/java/org/opengauss/portalcontroller/Tools.java @@ -357,9 +357,10 @@ public class Tools { String value = ""; Properties pps = new Properties(); try { - FileInputStream fin = new FileInputStream(path); - pps.load(fin) - fin.close() + // FileInputStream fin = new FileInputStream(path); + // pps.load(fin) + // fin.close() + pps.load(new FileInputStream(path)); value = pps.getProperty(key); } catch (FileNotFoundException e) { LOGGER.error("File not found exception occurred in getting single properties parameter."); -- Gitee From 92f9280e83f98fb9ff589e5343dfd6072b48c691 Mon Sep 17 00:00:00 2001 From: Sophia Date: Wed, 19 Apr 2023 08:24:16 +0000 Subject: [PATCH 05/10] update src/main/java/org/opengauss/portalcontroller/Tools.java. Signed-off-by: Sophia --- src/main/java/org/opengauss/portalcontroller/Tools.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/org/opengauss/portalcontroller/Tools.java b/src/main/java/org/opengauss/portalcontroller/Tools.java index 6124de5..d4b5583 100644 --- a/src/main/java/org/opengauss/portalcontroller/Tools.java +++ b/src/main/java/org/opengauss/portalcontroller/Tools.java @@ -357,9 +357,6 @@ public class Tools { String value = ""; Properties pps = new Properties(); try { - // FileInputStream fin = new FileInputStream(path); - // pps.load(fin) - // fin.close() pps.load(new FileInputStream(path)); value = pps.getProperty(key); } catch (FileNotFoundException e) { -- Gitee From 7d777bde3d7fdf28cd6c0f0ba4ce8ed12ae4c2d2 Mon Sep 17 00:00:00 2001 From: Sophia Date: Wed, 19 Apr 2023 08:37:49 +0000 Subject: [PATCH 06/10] update src/main/java/org/opengauss/portalcontroller/Tools.java. Signed-off-by: Sophia --- .../org/opengauss/portalcontroller/Tools.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/opengauss/portalcontroller/Tools.java b/src/main/java/org/opengauss/portalcontroller/Tools.java index d4b5583..2cf62dd 100644 --- a/src/main/java/org/opengauss/portalcontroller/Tools.java +++ b/src/main/java/org/opengauss/portalcontroller/Tools.java @@ -104,7 +104,9 @@ public class Tools { map = (HashMap) map.get(s); } map.put(lastKey, value); - yaml.dump(bigMap, new FileWriter(file)); + FileWriter fileWritter = new FileWriter(file); + yaml.dump(bigMap, fileWritter); + fileWritter.close(); } catch (IOException e) { LOGGER.error("IO exception occurred in changing single yml parameter " + key + "."); } @@ -138,7 +140,9 @@ public class Tools { } map.put(lastKey, changeParametersMap.get(key)); } - yaml.dump(bigMap, new FileWriter(file)); + FileWriter fileWritter = new FileWriter(file); + yaml.dump(bigMap, fileWritter); + fileWritter.close(); } catch (IOException e) { LOGGER.error("IO exception occurred in changing yml parameters."); } @@ -357,7 +361,9 @@ public class Tools { String value = ""; Properties pps = new Properties(); try { - pps.load(new FileInputStream(path)); + FileInputStream fin = new FileInputStream(path); + pps.load(fin); + fin.close(); value = pps.getProperty(key); } catch (FileNotFoundException e) { LOGGER.error("File not found exception occurred in getting single properties parameter."); @@ -379,7 +385,9 @@ public class Tools { Hashtable table = new Hashtable<>(); try { Properties pps = new Properties(); - pps.load(new FileInputStream(path)); + FileInputStream fin = new FileInputStream(path); + pps.load(fin); + fin.close(); for (Object o : pps.keySet()) { if (o instanceof String) { table.put(o.toString(), pps.getProperty(o.toString())); -- Gitee From 8d8702c84d55b4dabc6ec5b910a90e091a4f373f Mon Sep 17 00:00:00 2001 From: Sophia Date: Thu, 20 Apr 2023 08:03:02 +0000 Subject: [PATCH 07/10] update src/main/java/org/opengauss/portalcontroller/Tools.java. Signed-off-by: Sophia --- .../org/opengauss/portalcontroller/Tools.java | 45 ++++++++----------- 1 file changed, 19 insertions(+), 26 deletions(-) diff --git a/src/main/java/org/opengauss/portalcontroller/Tools.java b/src/main/java/org/opengauss/portalcontroller/Tools.java index 2cf62dd..672a04b 100644 --- a/src/main/java/org/opengauss/portalcontroller/Tools.java +++ b/src/main/java/org/opengauss/portalcontroller/Tools.java @@ -104,9 +104,7 @@ public class Tools { map = (HashMap) map.get(s); } map.put(lastKey, value); - FileWriter fileWritter = new FileWriter(file); - yaml.dump(bigMap, fileWritter); - fileWritter.close(); + yaml.dump(bigMap, new FileWriter(file)); } catch (IOException e) { LOGGER.error("IO exception occurred in changing single yml parameter " + key + "."); } @@ -140,9 +138,7 @@ public class Tools { } map.put(lastKey, changeParametersMap.get(key)); } - FileWriter fileWritter = new FileWriter(file); - yaml.dump(bigMap, fileWritter); - fileWritter.close(); + yaml.dump(bigMap, new FileWriter(file)); } catch (IOException e) { LOGGER.error("IO exception occurred in changing yml parameters."); } @@ -361,9 +357,7 @@ public class Tools { String value = ""; Properties pps = new Properties(); try { - FileInputStream fin = new FileInputStream(path); - pps.load(fin); - fin.close(); + pps.load(new FileInputStream(path)); value = pps.getProperty(key); } catch (FileNotFoundException e) { LOGGER.error("File not found exception occurred in getting single properties parameter."); @@ -385,9 +379,7 @@ public class Tools { Hashtable table = new Hashtable<>(); try { Properties pps = new Properties(); - FileInputStream fin = new FileInputStream(path); - pps.load(fin); - fin.close(); + pps.load(new FileInputStream(path)); for (Object o : pps.keySet()) { if (o instanceof String) { table.put(o.toString(), pps.getProperty(o.toString())); @@ -529,9 +521,9 @@ public class Tools { * @param migrationparametersTable migrationparametersTable */ public static void changeMigrationDatacheckParameters(Hashtable migrationparametersTable) { - String datacheckSourcePath = PortalControl.portalWorkSpacePath + "config" + File.separator + "datacheck" + File.separator + "application-source.yml"; - String datacheckSinkPath = PortalControl.portalWorkSpacePath + "config" + File.separator + "datacheck" + File.separator + "application-sink.yml"; - String datacheckServicePath = PortalControl.portalWorkSpacePath + "config" + File.separator + "datacheck" + File.separator + "application.yml"; + String datacheckSourcePath = PortalControl.portalWorkSpacePath + "config/datacheck/application-source.yml"; + String datacheckSinkPath = PortalControl.portalWorkSpacePath + "config/datacheck/application-sink.yml"; + String datacheckServicePath = PortalControl.portalWorkSpacePath + "config/datacheck/application.yml"; int checkPort = StartPort.CHECK + PortalControl.portId * 10; ArrayList portList = Tools.getAvailablePorts(checkPort, 3, 1000); int sourcePort = portList.get(0); @@ -725,6 +717,7 @@ public class Tools { break; } } + br.close(); } catch (FileNotFoundException e) { LOGGER.error("File flag not found."); } catch (IOException e) { @@ -741,9 +734,9 @@ public class Tools { public static int writeInputOrder(String command) { int temp = 0; boolean flag = false; - File file = new File(PortalControl.portalWorkSpacePath + "config" + File.separator + "input"); + File file = new File(PortalControl.portalWorkSpacePath + "config/input"); try { - RuntimeExecTools.executeOrder("mkfifo " + PortalControl.portalWorkSpacePath + "config" + File.separator + "input", 2000, PortalControl.portalWorkSpacePath + "logs" + File.separator + "error.log"); + RuntimeExecTools.executeOrder("mkfifo " + PortalControl.portalWorkSpacePath + "config/input", 2000, PortalControl.portalWorkSpacePath + "logs/error.log"); BufferedWriter bufferedWriter = new BufferedWriter(new FileWriter(file)); bufferedWriter.write(command); bufferedWriter.flush(); @@ -1383,7 +1376,7 @@ public class Tools { public static void stopExclusiveSoftware(String methodName, String softwareName) { int pid = Tools.getCommandPid(Task.getTaskProcessMap().get(methodName)); if (pid != -1) { - RuntimeExecTools.executeOrder("kill -15 " + pid, 2000, PortalControl.portalWorkSpacePath + "logs" + File.separator + "error.log"); + RuntimeExecTools.executeOrder("kill -15 " + pid, 2000, PortalControl.portalWorkSpacePath + "logs/error.log"); } for (RunningTaskThread runningTaskThread : Plan.getRunningTaskThreadsList()) { if (runningTaskThread.getMethodName().equals(methodName)) { @@ -1409,10 +1402,10 @@ public class Tools { criticalWordList.add(Parameter.PORTAL_NAME); if (!Tools.checkAnotherProcessExist(criticalWordList)) { if (fileExist && useSoftWare) { - RuntimeExecTools.executeOrder(order, 3000, PortalControl.portalWorkSpacePath + "logs" + File.separator + "error.log"); + RuntimeExecTools.executeOrder(order, 3000, PortalControl.portalWorkSpacePath + "logs/error.log"); LOGGER.info("Stop " + name + "."); } else if (fileExist) { - RuntimeExecTools.executeOrder(order, 3000, PortalControl.portalWorkSpacePath + "logs" + File.separator + "error.log"); + RuntimeExecTools.executeOrder(order, 3000, PortalControl.portalWorkSpacePath + "logs/error.log"); } else if (useSoftWare) { LOGGER.info("File " + executeFile + " not exists."); } @@ -1482,11 +1475,11 @@ public class Tools { * @return the boolean */ public static boolean outputDatacheckStatus(String datacheckType) { - String checkSourceLogPath = PortalControl.portalWorkSpacePath + "logs" + File.separator + "datacheck" + File.separator + "source.log"; + String checkSourceLogPath = PortalControl.portalWorkSpacePath + "logs/datacheck/source.log"; boolean flag1 = Tools.outputStatus(checkSourceLogPath); - String checkSinkLogPath = PortalControl.portalWorkSpacePath + "logs" + File.separator + "datacheck" + File.separator + "sink.log"; + String checkSinkLogPath = PortalControl.portalWorkSpacePath + "logs/datacheck/sink.log"; boolean flag2 = Tools.outputStatus(checkSinkLogPath); - String checkLogPath = PortalControl.portalWorkSpacePath + "logs" + File.separator + "datacheck" + File.separator + "check.log"; + String checkLogPath = PortalControl.portalWorkSpacePath + "logs/datacheck/check.log"; boolean flag3 = Tools.outputStatus(checkLogPath); boolean flag = flag1 && flag2 && flag3; Tools.outputInformation(flag, datacheckType + " is running.", datacheckType + " has error."); @@ -1583,7 +1576,7 @@ public class Tools { * Sets x log path. */ public static void setXLogPath() { - String xLogPath = PortalControl.portalWorkSpacePath + "status" + File.separator + "incremental" + File.separator + "xlog.txt"; + String xLogPath = PortalControl.portalWorkSpacePath + "status/incremental/xlog.txt"; String xLogLocation = ""; File file = new File(xLogPath); try { @@ -1603,7 +1596,7 @@ public class Tools { } Hashtable hashtable = new Hashtable<>(); hashtable.put("xlog.location", xLogLocation); - Tools.changePropertiesParameters(hashtable, portalWorkSpacePath + "config" + File.separator + "debezium" + File.separator + "opengauss-source.properties"); + Tools.changePropertiesParameters(hashtable, portalWorkSpacePath + "config/debezium/opengauss-source.properties"); } -} +} \ No newline at end of file -- Gitee From 708b75c16fbf31a6747d48a70e0733f84f741ded Mon Sep 17 00:00:00 2001 From: Sophia Date: Thu, 20 Apr 2023 08:05:46 +0000 Subject: [PATCH 08/10] update src/main/java/org/opengauss/portalcontroller/Tools.java. Signed-off-by: Sophia --- src/main/java/org/opengauss/portalcontroller/Tools.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/opengauss/portalcontroller/Tools.java b/src/main/java/org/opengauss/portalcontroller/Tools.java index 672a04b..f8426f0 100644 --- a/src/main/java/org/opengauss/portalcontroller/Tools.java +++ b/src/main/java/org/opengauss/portalcontroller/Tools.java @@ -1598,5 +1598,4 @@ public class Tools { hashtable.put("xlog.location", xLogLocation); Tools.changePropertiesParameters(hashtable, portalWorkSpacePath + "config/debezium/opengauss-source.properties"); } - } \ No newline at end of file -- Gitee From 8a34fda4b5cf1d3e23e7feeddeea9ae324bbef4b Mon Sep 17 00:00:00 2001 From: Sophia Date: Thu, 20 Apr 2023 08:21:30 +0000 Subject: [PATCH 09/10] update src/main/java/org/opengauss/portalcontroller/Tools.java. Signed-off-by: Sophia --- src/main/java/org/opengauss/portalcontroller/Tools.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/opengauss/portalcontroller/Tools.java b/src/main/java/org/opengauss/portalcontroller/Tools.java index f8426f0..deccfb8 100644 --- a/src/main/java/org/opengauss/portalcontroller/Tools.java +++ b/src/main/java/org/opengauss/portalcontroller/Tools.java @@ -366,6 +366,7 @@ public class Tools { LOGGER.error("IO exception occurred in reading parameters in properties files."); Thread.interrupted(); } + pps.clear(); return value; } @@ -385,6 +386,7 @@ public class Tools { table.put(o.toString(), pps.getProperty(o.toString())); } } + pps.clear(); } catch (FileNotFoundException e) { LOGGER.error("File not found exception occurred in getting single properties parameter."); } catch (IOException e) { -- Gitee From 87ff3a3ac426b9d02a66bfdc3e2c3548d13ad521 Mon Sep 17 00:00:00 2001 From: Sophia Date: Fri, 12 May 2023 08:53:48 +0000 Subject: [PATCH 10/10] update src/main/java/org/opengauss/portalcontroller/Tools.java. Signed-off-by: Sophia --- src/main/java/org/opengauss/portalcontroller/Tools.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/opengauss/portalcontroller/Tools.java b/src/main/java/org/opengauss/portalcontroller/Tools.java index deccfb8..c09ce7d 100644 --- a/src/main/java/org/opengauss/portalcontroller/Tools.java +++ b/src/main/java/org/opengauss/portalcontroller/Tools.java @@ -366,7 +366,6 @@ public class Tools { LOGGER.error("IO exception occurred in reading parameters in properties files."); Thread.interrupted(); } - pps.clear(); return value; } @@ -386,7 +385,6 @@ public class Tools { table.put(o.toString(), pps.getProperty(o.toString())); } } - pps.clear(); } catch (FileNotFoundException e) { LOGGER.error("File not found exception occurred in getting single properties parameter."); } catch (IOException e) { @@ -708,8 +706,7 @@ public class Tools { */ public static void readInputOrder() { File file = new File(PortalControl.portalWorkSpacePath + "config/input"); - try { - BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(file))); + try (BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(file)))) { String str = ""; while ((str = br.readLine()) != null) { if (!PortalControl.latestCommand.equals(str.trim())) { @@ -719,7 +716,6 @@ public class Tools { break; } } - br.close(); } catch (FileNotFoundException e) { LOGGER.error("File flag not found."); } catch (IOException e) { @@ -1600,4 +1596,5 @@ public class Tools { hashtable.put("xlog.location", xLogLocation); Tools.changePropertiesParameters(hashtable, portalWorkSpacePath + "config/debezium/opengauss-source.properties"); } -} \ No newline at end of file + +} -- Gitee