X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=vnfapi%2Fprovider%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fsdnc%2Fvnfapi%2FVnfSdnUtil.java;h=522ee7f90fd17f44d9f8bfd14d6ca86885efc8fe;hb=e8058c88413de8e648a4c85385b1ec798d31c888;hp=c4d8c52feedfe4599b48aa7a3a8a68bb95b91438;hpb=15cfb74776aafab9319a859f8b7cce9de23df209;p=sdnc%2Fnorthbound.git

diff --git a/vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/VnfSdnUtil.java b/vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/VnfSdnUtil.java
index c4d8c52f..522ee7f9 100644
--- a/vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/VnfSdnUtil.java
+++ b/vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/VnfSdnUtil.java
@@ -53,23 +53,15 @@ public class VnfSdnUtil extends MdsalHelper {
         File propFile = new File(ODLHOME.getAbsolutePath() + "/configuration/vnfapi.properties");
         String propFileName = propFile.getAbsolutePath();
         properties = new Properties();
-        InputStream input = null;
         if (propFile.isFile() && propFile.canRead()) {
-            try    {
-                input = new FileInputStream(propFile);
+            try (InputStream input = new FileInputStream(propFile)) {
                 properties.load(input);
                 LOG.info("Loaded properties from " + propFileName );
                 setYangMappingProperties(properties);
+            } catch (IOException e) {
+                LOG.error("Failed to close properties file " + propFileName +"\n",e);
             } catch (Exception e) {
                 LOG.error("Failed to load properties " + propFileName +"\n",e);
-            } finally {
-                if (input != null) {
-                    try {
-                        input.close();
-                    } catch (IOException e) {
-                        LOG.error("Failed to close properties file " + propFileName +"\n",e);
-                    }
-                }
             }
         }
     }