diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java
index 840062e..d3d57ea 100755
--- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java
+++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java
@@ -290,12 +290,11 @@
             ctx = SSLContext.getInstance("TLS");
 
             KeyManagerFactory kmf = null;
-            try {
+            try (FileInputStream fin = new FileInputStream(keystore_path)){
                 String def = "SunX509";
                 String storeType = "PKCS12";
                 def = KeyStore.getDefaultType();
                 kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
-                FileInputStream fin = new FileInputStream(keystore_path);
 
                 String extension = keystore_path.substring(keystore_path.lastIndexOf(".") + 1);
                 if("JKS".equalsIgnoreCase(extension)) {