Reverting "Merge "fix try block""

This reverts commit 240bbdbdc76e0e91af9f18164eadb2708d14c6fb, reversing
changes made to 3ee69f1af0acddd1e06060ad88c0029fe7ceeaaf.

Change-Id: I61f07ead1d7d3e89c512a2224efecf9ac440df10
Issue-ID: POLICY-961
Signed-off-by: Jorge Hernandez <jh1730@att.com>

1 files changed, 6 insertions, 3 deletions

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDao.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDao.java
index 60b35fb09..a8449e307 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDao.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDao.java
@@ -1923,15 +1923,18 @@ public class PolicyDBDao {
 		
 		private String readConfigFile(String configPath){
 			String configDataString = null;
-
-			try(InputStream configContentStream = new FileInputStream(configPath)) {
+			InputStream configContentStream = null;
+			try {
+				configContentStream = new FileInputStream(configPath);
 				configDataString = IOUtils.toString(configContentStream);
 			} catch (FileNotFoundException e) {
 				logger.error("Caught FileNotFoundException on new FileInputStream("+configPath+")",e);
 				throw new IllegalArgumentException("The config file path does not exist");
 			} catch(IOException e2){
-				logger.error("Caught IOException on newIOUtils.toString(configContentStream)",e2);
+				logger.error("Caught IOException on newIOUtils.toString("+configContentStream+")",e2);
 				throw new IllegalArgumentException("The config file path cannot be read");
+			} finally {
+				IOUtils.closeQuietly(configContentStream);
 			}
 			if(configDataString == null){
 				throw new IllegalArgumentException("The config file path cannot be read");