X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fmodel-loader.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fmodelloader%2Fservice%2FModelLoaderService.java;fp=src%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fmodelloader%2Fservice%2FModelLoaderService.java;h=22f7671770daf6e24850f19cecc30ebf4baaecfb;hp=c338e5b90b42472d699104b74a8e2625c85ed60f;hb=211189e641f5b3aef7b02f47d5e82e522c8c592f;hpb=35e3de3f0d5b2b02fc6ef92ec577fe6b7cd05e3c

diff --git a/src/main/java/org/onap/aai/modelloader/service/ModelLoaderService.java b/src/main/java/org/onap/aai/modelloader/service/ModelLoaderService.java
index c338e5b..22f7671 100644
--- a/src/main/java/org/onap/aai/modelloader/service/ModelLoaderService.java
+++ b/src/main/java/org/onap/aai/modelloader/service/ModelLoaderService.java
@@ -21,6 +21,7 @@
 package org.onap.aai.modelloader.service;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -80,12 +81,12 @@ public class ModelLoaderService implements ModelLoaderInterface {
         logger.info(ModelLoaderMsgs.LOADING_CONFIGURATION);
         ModelLoaderConfig.setConfigHome(configDir);
         Properties configProperties = new Properties();
-        try {
-            configProperties.load(Files.newInputStream(Paths.get(configDir, "model-loader.properties")));
+        try (InputStream configInputStream = Files.newInputStream(Paths.get(configDir, "model-loader.properties"))) {
+            configProperties.load(configInputStream);
             config = new ModelLoaderConfig(configProperties);
             
             // Set the truststore for SDC Client to connect to Dmaap central bus if applicable (as in case of TI)
-            if (config.isUseHttpsWithDmaap()) {
+            if (Boolean.TRUE.equals(config.isUseHttpsWithDmaap())) {
                 String trustStorePath = config.getKeyStorePath();
                 String trustStorePassword = config.getKeyStorePassword();
                 if (trustStorePath != null && Paths.get(trustStorePath).toFile().isFile() && trustStorePassword != null