X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=bpmn%2FMSOCoreBPMN%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fmso%2Fbpmn%2Fcore%2FReadConfigTask.java;h=b46ffcd7f70fe472f24a7be36333da5ebfccd445;hb=62cd6aaaf74aa91ee0037c0e155c8e7284f07567;hp=09288f0cffcc920ba6e86513d57a69128b5a2b0b;hpb=fa1a211d28a912892fcd888569df033900eb01ee;p=so.git

diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/ReadConfigTask.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/ReadConfigTask.java
index 09288f0cff..b46ffcd7f7 100644
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/ReadConfigTask.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/ReadConfigTask.java
@@ -27,6 +27,7 @@ import java.util.Properties;
 import org.camunda.bpm.engine.ProcessEngineException;
 import org.camunda.bpm.engine.delegate.DelegateExecution;
 import org.camunda.bpm.engine.delegate.Expression;
+
 import org.openecomp.mso.logger.MsoLogger;
 
 /**
@@ -56,20 +57,38 @@ public class ReadConfigTask extends BaseTask {
 			msoLogger.debug("propertiesFile = " + thePropertiesFile);
 		}
 
-        if (shouldFail(execution)) {
-            throw new ProcessEngineException(getTaskName() + " Failed");
-        }
+		Boolean shouldFail = (Boolean) execution.getVariable("shouldFail");
+
+		if (shouldFail != null && shouldFail) {
+			throw new ProcessEngineException(getClass().getSimpleName() + " Failed");
+		}
 
 		synchronized (ReadConfigTask.class) {
 			if (properties == null) {
 				properties = new Properties();
 
-				try(InputStream stream = getClass().getResourceAsStream(thePropertiesFile)) {
+				InputStream stream = null;
+
+				try {
+					stream = getClass().getResourceAsStream(thePropertiesFile);
+
 					if (stream == null) {
 						throw new IOException("Resource not found: " + thePropertiesFile);
 					}
 
 					properties.load(stream);
+
+					stream.close();
+					stream = null;
+
+				} finally {
+					if (stream != null) {
+						try {
+							stream.close();
+						} catch (Exception e) {
+							// Do nothing
+						}
+					}
 				}
 			}
 		}