1710 Rebase - Second Attempt

[so.git] / bpmn / MSOCoreBPMN / src / main / java / org / openecomp / mso / bpmn / core / ReadFileTask.java

diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/ReadFileTask.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/ReadFileTask.java
index 3adba19..389fdc0 100644 (file)
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/ReadFileTask.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/ReadFileTask.java
@@ -24,11 +24,11 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.stream.Collectors;
 
 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;
 
 /**
@@ -66,21 +66,45 @@ public class ReadFileTask extends BaseTask {
                                + "file = " + theFile);
                }
 
-        if (shouldFail(execution)) {
-            throw new ProcessEngineException(getTaskName() + " Failed");
-        }
+               Boolean shouldFail = (Boolean) execution.getVariable("shouldFail");
+
+               if (shouldFail != null && shouldFail) {
+                       throw new ProcessEngineException(getClass().getSimpleName() + " Failed");
+               }
 
                Object value = execution.getVariable(theInputVariable);
 
                if (value == null) {
-                       try(InputStream xmlStream = getClass().getResourceAsStream(theFile)) {
+                       InputStream xmlStream = null;
+
+                       try {
+                               xmlStream = getClass().getResourceAsStream(theFile);
 
                                if (xmlStream == null) {
                                        throw new IOException("Resource not found: " + theFile);
                                }
 
                                BufferedReader reader = new BufferedReader(new InputStreamReader(xmlStream));
-                               value = reader.lines().collect(Collectors.joining());
+                               StringBuilder output = new StringBuilder();
+                               String line;
+
+                               while ((line = reader.readLine()) != null) {
+                                       output.append(line);
+                               }
+
+                               xmlStream.close();
+                               xmlStream = null;
+
+                               value = output.toString();
+
+                       } finally {
+                               if (xmlStream != null) {
+                                       try {
+                                               xmlStream.close();
+                                       } catch (Exception e) {
+                                               // Do nothing
+                                       }
+                               }
                        }
                }
                execution.setVariable(theInputVariable, value);