Merge "Resolved Policy Blocker issue"

1 files changed, 5 insertions, 11 deletions

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java
index ff5ccffb0..43b62b0c0 100644
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java
@@ -411,23 +411,17 @@ public class CreateDcaeMicroServiceController extends RestrictedBaseController {
 	}
 	
  
+	@SuppressWarnings("unchecked")
 	public Map<String, String> load(String fileName) throws IOException { 
 		File newConfiguration = new File(fileName);
-		InputStream is = null;
-		try {
-			is = new FileInputStream(newConfiguration);
+		Yaml yaml = new Yaml();
+		Map<Object, Object> yamlMap = null;
+		try(InputStream is = new FileInputStream(newConfiguration)){
+			yamlMap = (Map<Object, Object>) yaml.load(is); 
 		} catch (FileNotFoundException e) {
 			LOGGER.error(e);
 		}
 
-		Yaml yaml = new Yaml();
-
-		Map<Object, Object> yamlMap = null;
-		try{
-		    yamlMap = (Map<Object, Object>) yaml.load(is); 
-		}catch(Exception e){
-			LOGGER.error("load:", e);
-		}
 		StringBuilder sb = new StringBuilder(); 
 		Map<String, String> settings = new HashMap<>(); 
 		if (yamlMap == null) {