From: shashikanth <shashikanth.vh@huawei.com>
Date: Mon, 25 Sep 2017 13:11:45 +0000 (+0530)
Subject: Changed try to try with resource
X-Git-Tag: v1.1.0~283^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b8248da19467df661180b0a66f2bdaae665c6bed;p=so.git

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: I0ebc001b3e7f6a13a2d309b69cc4133271a9e87e
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
---

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 6249040342..b27a2fa64e 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
@@ -67,29 +67,12 @@ public class ReadConfigTask extends BaseTask {
 		synchronized (ReadConfigTask.class) {
 			if (properties == null) {
 				properties = new Properties();
-
-				InputStream stream = null;
-
-				try {
-					stream = getClass().getResourceAsStream(thePropertiesFile);
-
-					if (stream == null) {
-						throw new IOException("Resource not found: " + thePropertiesFile);
-					}
+				try (InputStream stream = getClass().getResourceAsStream(thePropertiesFile)) {
 
 					properties.load(stream);
 
-					stream.close();
-					stream = null;
-
-				} finally {
-					if (stream != null) {
-						try {
-							stream.close();
-						} catch (Exception e) {
-						    msoLogger.debug("Exception:", e);
-						}
-					}
+				} catch (Exception e) {
+					msoLogger.debug("Exception at readResourceFile stream: " + e);
 				}
 			}
 		}