From a1fe66da55cf3026942ed561f365c8a0d6fed908 Mon Sep 17 00:00:00 2001 From: KIM-HWI <79562205+kim-hwi@users.noreply.github.com> Date: Tue, 29 Aug 2023 17:30:03 +0900 Subject: [PATCH 1/4] =?UTF-8?q?Throwable=EC=97=90=EC=84=9C=20catch?= =?UTF-8?q?=ED=95=98=EB=8D=98=20NullPointerException=EB=A5=BC=20=EB=B6=84?= =?UTF-8?q?=EB=A6=AC=ED=95=98=EC=97=AC=20catch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rte/bat/core/launch/support/EgovCommandLineRunner.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/launch/support/EgovCommandLineRunner.java b/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/launch/support/EgovCommandLineRunner.java index 7d09e70..d9172da 100644 --- a/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/launch/support/EgovCommandLineRunner.java +++ b/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/launch/support/EgovCommandLineRunner.java @@ -258,6 +258,12 @@ public int start(String jobPath, String jobIdentifier, String[] parameters, Set< LOGGER.warn("jobExecutionTime=" + (jobExecution.getEndTime().getTime() - jobExecution.getStartTime().getTime()) / 1000f + "s"); return exitCodeMapper.intValue(jobExecution.getExitStatus().getExitCode()); + } catch (NullPointerException e) { + String message = "Job Terminated in error: " + e.getMessage(); + //2017.02.15 장동한 시큐어코딩(ES)-부적절한 예외 처리[CWE-253, CWE-440, CWE-754] + LOGGER.error("["+e.getClass()+"] Try/Catch...NullPointerException : " + e.getMessage()); + EgovCommandLineRunner.message = message; + return exitCodeMapper.intValue(ExitStatus.FAILED.getExitCode()); } catch (Throwable e) { String message = "Job Terminated in error: " + e.getMessage(); //2017.02.15 장동한 시큐어코딩(ES)-부적절한 예외 처리[CWE-253, CWE-440, CWE-754] From 85ef21839c08669b1d7e8e3ea95dbb71f0ce0aa1 Mon Sep 17 00:00:00 2001 From: KIM-HWI <79562205+kim-hwi@users.noreply.github.com> Date: Tue, 29 Aug 2023 17:32:01 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EC=A3=BC=EC=84=9D=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rte/bat/core/launch/support/EgovCommandLineRunner.java | 1 - 1 file changed, 1 deletion(-) diff --git a/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/launch/support/EgovCommandLineRunner.java b/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/launch/support/EgovCommandLineRunner.java index d9172da..e32b1c8 100644 --- a/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/launch/support/EgovCommandLineRunner.java +++ b/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/launch/support/EgovCommandLineRunner.java @@ -260,7 +260,6 @@ public int start(String jobPath, String jobIdentifier, String[] parameters, Set< return exitCodeMapper.intValue(jobExecution.getExitStatus().getExitCode()); } catch (NullPointerException e) { String message = "Job Terminated in error: " + e.getMessage(); - //2017.02.15 장동한 시큐어코딩(ES)-부적절한 예외 처리[CWE-253, CWE-440, CWE-754] LOGGER.error("["+e.getClass()+"] Try/Catch...NullPointerException : " + e.getMessage()); EgovCommandLineRunner.message = message; return exitCodeMapper.intValue(ExitStatus.FAILED.getExitCode()); From 33dd7b6d2ac363efa7574dd654340eb5f6b86c87 Mon Sep 17 00:00:00 2001 From: KIM-HWI <79562205+kim-hwi@users.noreply.github.com> Date: Thu, 31 Aug 2023 18:28:50 +0900 Subject: [PATCH 3/4] =?UTF-8?q?LogMessage=20=EC=98=A4=ED=83=88=EC=9E=90=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rte/bat/core/launch/support/EgovCommandLineRunner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/launch/support/EgovCommandLineRunner.java b/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/launch/support/EgovCommandLineRunner.java index e32b1c8..23abba9 100644 --- a/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/launch/support/EgovCommandLineRunner.java +++ b/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/launch/support/EgovCommandLineRunner.java @@ -266,7 +266,7 @@ public int start(String jobPath, String jobIdentifier, String[] parameters, Set< } catch (Throwable e) { String message = "Job Terminated in error: " + e.getMessage(); //2017.02.15 장동한 시큐어코딩(ES)-부적절한 예외 처리[CWE-253, CWE-440, CWE-754] - LOGGER.error("["+e.getClass()+"] Try/Catch...job tart Runing : " + e.getMessage()); + LOGGER.error("["+e.getClass()+"] Try/Catch...job start Running : " + e.getMessage()); EgovCommandLineRunner.message = message; return exitCodeMapper.intValue(ExitStatus.FAILED.getExitCode()); } finally { From fd9d878bc14465755dd4a4c8c81d2d411aaa2af3 Mon Sep 17 00:00:00 2001 From: KIM-HWI <79562205+kim-hwi@users.noreply.github.com> Date: Thu, 31 Aug 2023 18:40:24 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EC=9D=B4=EC=8A=88=EC=97=B0=EA=B2=B0=20?= =?UTF-8?q?=EC=BB=A4=EB=B0=8B=20#137?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rte/bat/core/launch/support/EgovCommandLineRunner.java | 1 - 1 file changed, 1 deletion(-) diff --git a/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/launch/support/EgovCommandLineRunner.java b/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/launch/support/EgovCommandLineRunner.java index 23abba9..d46940f 100644 --- a/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/launch/support/EgovCommandLineRunner.java +++ b/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/launch/support/EgovCommandLineRunner.java @@ -403,5 +403,4 @@ private JobParameters getNextJobParameters(Job job) throws JobParametersNotFound } return jobParameters; } - } \ No newline at end of file