InputStream bezárása

diff --git a/server/-product/production/LOCAL/jobs/steps/CalculateMD5Step.java b/server/-product/production/LOCAL/jobs/steps/CalculateMD5Step.java
index 9db442c78dd75e35b3016e92c9c1012e1b8149cd..75af5964a072a8f43ce6e87f652d2ddb1b49c7b4 100644 (file)
--- a/server/-product/production/LOCAL/jobs/steps/CalculateMD5Step.java
+++ b/server/-product/production/LOCAL/jobs/steps/CalculateMD5Step.java
@@ -29,6 +29,8 @@ public class CalculateMD5Step extends JobStep {
 \r
                String md5String = DatatypeConverter.printHexBinary(digest).toUpperCase();\r
                logger.info("calculated MD5 hash= {}", md5String);\r
+               dis.close();\r
+               is.close();\r
                return new Object[] { md5String };\r
        }\r
 }
\ No newline at end of file

diff --git a/server/-product/production/OMAR/jobs/steps/CalculateMD5Step.java b/server/-product/production/OMAR/jobs/steps/CalculateMD5Step.java
index 9db442c78dd75e35b3016e92c9c1012e1b8149cd..75af5964a072a8f43ce6e87f652d2ddb1b49c7b4 100644 (file)
--- a/server/-product/production/OMAR/jobs/steps/CalculateMD5Step.java
+++ b/server/-product/production/OMAR/jobs/steps/CalculateMD5Step.java
@@ -29,6 +29,8 @@ public class CalculateMD5Step extends JobStep {
 \r
                String md5String = DatatypeConverter.printHexBinary(digest).toUpperCase();\r
                logger.info("calculated MD5 hash= {}", md5String);\r
+               dis.close();\r
+               is.close();\r
                return new Object[] { md5String };\r
        }\r
 }
\ No newline at end of file

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/CalculateMD5Step.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/CalculateMD5Step.java
index 7f0aa908981dd5af70b13192d7e5bda1acc38b32..a73df30fef4e67d6cb2c5c62c8d7de39e9c90013 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/CalculateMD5Step.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/CalculateMD5Step.java
@@ -29,6 +29,8 @@ public class CalculateMD5Step extends JobStep {
 \r
                String md5String = DatatypeConverter.printHexBinary(digest).toUpperCase();\r
                logger.info("calculated MD5 hash= {}", md5String);\r
+               dis.close();\r
+               is.close();\r
                return new Object[] { md5String };\r
        }\r
 }
\ No newline at end of file

diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java
index 34f3f9b82828a5c46df156d005df5aa7cbc430de..0b8f315500a2e6d6c6a7f10b41d8bca25274e043 100644 (file)
--- a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java
@@ -556,6 +556,7 @@ public class JobEngineConfiguration implements IJobEngineConfiguration {
                Path templatesPath = null;\r
                String filePath = null;\r
                String duplicateFileName = null;\r
+               InputStream is = null;\r
                try {\r
                        templatesPath = Paths.get(systemConfig.getConfig(DIR_TEMPLATES));\r
                        duplicateFileName = FilenameUtils.getName(selectedJob.getString("template")).replace(".xml", "")\r
@@ -565,13 +566,21 @@ public class JobEngineConfiguration implements IJobEngineConfiguration {
                                duplicateFileName = FilenameUtils.getName(duplicateFileName).replace(".xml", "").concat("-copy.xml");\r
                                filePath = templatesPath.toString() + FileSystems.getDefault().getSeparator() + duplicateFileName;\r
                        }\r
-                       InputStream is = new FileInputStream(templatesPath.toString() + FileSystems.getDefault().getSeparator()\r
+                       is = new FileInputStream(templatesPath.toString() + FileSystems.getDefault().getSeparator()\r
                                        + selectedJob.getString("template"));\r
                        Files.copy(is, Paths.get(filePath));\r
                } catch (FileNotFoundException e) {\r
                        logger.error("File not found: {}", filePath);\r
                } catch (IOException e) {\r
                        logger.error("IOException: {}", e.getCause());\r
+               } finally {\r
+                       if (is != null) {\r
+                               try {\r
+                                       is.close();\r
+                               } catch (IOException e) {\r
+                                       logger.error("IOException: {}", e.getCause());\r
+                               }\r
+                       }\r
                }\r
                return duplicateFileName;\r
 \r