Changed try to try with resource

Change this condition so that it does not always evaluate to "false"
https://sonar.onap.org/component_issues?id=org.openecomp.so%3Aso#resolved=false|severities=BLOCKER

Issue-Id:SO-118
Change-Id: I8885beed7ab1fa2e26e1155665d9507746bd9906
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>

diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/xml/XmlTool.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/xml/XmlTool.java
index 1cf4340..c2b8328 100644 (file)
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/xml/XmlTool.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/xml/XmlTool.java
@@ -312,15 +312,10 @@ public final class XmlTool {
         * @throws IOException if there is a problem reading the file
         */
        private static String readResourceFile(String file) throws IOException {
-               InputStream stream = null;
-               try {
-                       stream = XmlTool.class.getClassLoader().getResourceAsStream(file);
 
-                       if (stream == null) {
-                               throw new FileNotFoundException("No such resource file: " + file);
-                       }
+               try (InputStream stream = XmlTool.class.getClassLoader().getResourceAsStream(file);
+                        Reader reader = new InputStreamReader(stream, "UTF-8")) {
 
-                       Reader reader = new InputStreamReader(stream, "UTF-8");
                        StringBuilder out = new StringBuilder();
                        char[] buf = new char[1024];
                        int n;
@@ -328,18 +323,10 @@ public final class XmlTool {
                        while ((n = reader.read(buf)) >= 0) {
                                out.append(buf, 0, n);
                        }
-
-                       stream.close();
-                       stream = null;
                        return out.toString();
-               } finally {
-                       if (stream != null) {
-                               try {
-                                       stream.close();
-                               } catch (Exception e) {
-                                       LOGGER.debug("Exception at readResourceFile close stream: " + e);
-                               }
-                       }
+               } catch (Exception e) {
+                       LOGGER.debug("Exception at readResourceFile stream: " + e);
+                       return null;
                }
        }