From: Dan Timoney <dtimoney@att.com>
Date: Thu, 21 Sep 2017 17:42:35 +0000 (+0000)
Subject: Merge "Add RPCs for vCPE"
X-Git-Tag: v1.2.1~34
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=41b8ad74ae947dba387994e4169d4f664612cb34;hp=63ad0d0f89f3da8006b05384e27dfa0d0077aacb;p=sdnc%2Fnorthbound.git

Merge "Add RPCs for vCPE"
---

diff --git a/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiUtil.java b/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiUtil.java
index ca95e79c..c03bc120 100644
--- a/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiUtil.java
+++ b/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiUtil.java
@@ -22,23 +22,15 @@ public class GenericResourceApiUtil extends MdsalHelper {
 
 		File file = new File(PROPERTIES_FILE);
 		properties = new Properties();
-		InputStream input = null;
-		if (file.isFile() && file.canRead()) {
-			try	{
-				input = new FileInputStream(file);
+		if(file.isFile() && file.canRead()) {
+			try(InputStream input = new FileInputStream(file)){
 				properties.load(input);
 				LOG.info("Loaded properties from " + PROPERTIES_FILE );
 				setYangMappingProperties(properties);
+			} catch (IOException e) {
+				LOG.error("Failed to close properties file " + PROPERTIES_FILE +"\n",e);
 			} catch (Exception e) {
 				LOG.error("Failed to load properties " + PROPERTIES_FILE +"\n",e);
-			} finally {
-				if (input != null) {
-					try {
-						input.close();
-					} catch (IOException e) {
-						LOG.error("Failed to close properties file " + PROPERTIES_FILE +"\n",e);
-					}
-				}
 			}
 		}
 	}