1 files changed, 7 insertions, 5 deletions
diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBLIBResourceProvider.java b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBLIBResourceProvider.java
index 8e0b534f..411f0470 100644
--- a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBLIBResourceProvider.java
+++ b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBLIBResourceProvider.java
@@ -84,8 +84,7 @@ public class DBLIBResourceProvider {
         // determines properties file as according to the priority described in the class header comment
         final File propertiesFile = determinePropertiesFile(this);
         if (propertiesFile != null) {
-            try {
-                final FileInputStream fileInputStream = new FileInputStream(propertiesFile);
+            try(FileInputStream fileInputStream = new FileInputStream(propertiesFile)) {
                 properties = new Properties();
                 properties.load(fileInputStream);
             } catch (final IOException e) {
@@ -113,9 +112,12 @@ public class DBLIBResourceProvider {
      * @return the file location of the chosen properties file
      */
     private static File reportSuccess(final String message, final Optional<File> fileOptional) {
-        final File file = fileOptional.get();
-        LOG.info("{} {}", message, file.getPath());
-        return file;
+        if(fileOptional.isPresent()) {
+            final File file = fileOptional.get();
+            LOG.info("{} {}", message, file.getPath());
+            return file;
+        }
+        return null;
     }
 
     /**