From: Omar Sweidan <omar.sweidan@userrendszerhaz.hu>
Date: Fri, 10 Jun 2022 10:51:04 +0000 (+0200)
Subject: InputStream bezárása
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=45ba7d7de9d34a16aa089ae9a3a3a577fd1ed237;p=mediacube.git

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 9db442c7..75af5964 100644
--- 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 {
 
 		String md5String = DatatypeConverter.printHexBinary(digest).toUpperCase();
 		logger.info("calculated MD5 hash= {}", md5String);
+		dis.close();
+		is.close();
 		return new Object[] { md5String };
 	}
 }
\ 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 9db442c7..75af5964 100644
--- 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 {
 
 		String md5String = DatatypeConverter.printHexBinary(digest).toUpperCase();
 		logger.info("calculated MD5 hash= {}", md5String);
+		dis.close();
+		is.close();
 		return new Object[] { md5String };
 	}
 }
\ 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 7f0aa908..a73df30f 100644
--- 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 {
 
 		String md5String = DatatypeConverter.printHexBinary(digest).toUpperCase();
 		logger.info("calculated MD5 hash= {}", md5String);
+		dis.close();
+		is.close();
 		return new Object[] { md5String };
 	}
 }
\ 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 34f3f9b8..0b8f3155 100644
--- 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;
 		String filePath = null;
 		String duplicateFileName = null;
+		InputStream is = null;
 		try {
 			templatesPath = Paths.get(systemConfig.getConfig(DIR_TEMPLATES));
 			duplicateFileName = FilenameUtils.getName(selectedJob.getString("template")).replace(".xml", "")
@@ -565,13 +566,21 @@ public class JobEngineConfiguration implements IJobEngineConfiguration {
 				duplicateFileName = FilenameUtils.getName(duplicateFileName).replace(".xml", "").concat("-copy.xml");
 				filePath = templatesPath.toString() + FileSystems.getDefault().getSeparator() + duplicateFileName;
 			}
-			InputStream is = new FileInputStream(templatesPath.toString() + FileSystems.getDefault().getSeparator()
+			is = new FileInputStream(templatesPath.toString() + FileSystems.getDefault().getSeparator()
 					+ selectedJob.getString("template"));
 			Files.copy(is, Paths.get(filePath));
 		} catch (FileNotFoundException e) {
 			logger.error("File not found: {}", filePath);
 		} catch (IOException e) {
 			logger.error("IOException: {}", e.getCause());
+		} finally {
+			if (is != null) {
+				try {
+					is.close();
+				} catch (IOException e) {
+					logger.error("IOException: {}", e.getCause());
+				}
+			}
 		}
 		return duplicateFileName;