From: Skip Wonnell <kw5258@att.com>
Date: Thu, 20 Jul 2017 02:02:57 +0000 (-0400)
Subject: [APPC-93] Resource leak in appc.adapter.chef.chefclient.Utils
X-Git-Tag: v1.2.0~161
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F95%2F6095%2F3;p=appc.git

[APPC-93] Resource leak in appc.adapter.chef.chefclient.Utils

Place instantiation of FileReader and BufferedReader inside a TWR

Change-Id: Ibc0fffa76e536bdccca92731dc7ebc878faf67a1
Signed-off-by: Skip Wonnell <kw5258@att.com>
---

diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/Utils.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/Utils.java
index fc64af5d4..07c983a43 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/Utils.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/Utils.java
@@ -62,15 +62,9 @@ public class Utils {
 	
 	public static String signWithRSA(String inStr, String pemPath) {
 		byte[] outStr = null;
-		BufferedReader br = null;
-		try {
-			br = new BufferedReader(new FileReader(pemPath));
-		} catch (FileNotFoundException e) {
-			e.printStackTrace();
-		}
 		Security.addProvider(new BouncyCastleProvider());
-		try {
-
+		try  (FileReader fr = new FileReader(pemPath);
+				BufferedReader br = new BufferedReader(fr)) {
 			PEMParser pemParser = new PEMParser(br);
 			JcaPEMKeyConverter converter = new JcaPEMKeyConverter();
 			Object object = pemParser.readObject();