LeftOver Cases in Resource Leaks and NULL_RETURNS

1 files changed, 11 insertions, 3 deletions

diff --git a/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java b/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java
index df19bd9fe..9ab2f8505 100644
--- a/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java
+++ b/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java
@@ -221,8 +221,9 @@ public class PKCS12Export {
 
         // get password
         String pwd = null;
+        BufferedReader in = null;
         try {
-            BufferedReader in = new BufferedReader(new FileReader(pwdfile));
+            in = new BufferedReader(new FileReader(pwdfile));
             pwd = in.readLine();
             if (pwd == null) {
                 pwd = "";
@@ -230,10 +231,17 @@ public class PKCS12Export {
         } catch (Exception e) {
             debug("Failed to read the keydb password from the file. Exception: " + e.toString());
             System.exit(1);
+        } finally {
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
         }
-
         String pk12pwd = null;
-        BufferedReader in = null;
+
         try {
             in = new BufferedReader(new FileReader(pk12pwdfile));
             pk12pwd = in.readLine();