From ca401c4f9e30ab59cb12fc4098aec21b660f686f Mon Sep 17 00:00:00 2001
From: Abhishek Koneru <akoneru@redhat.com>
Date: Thu, 19 Jul 2012 12:46:10 -0400
Subject: Patch 25 - Misc Fixes

---
 base/kra/src/com/netscape/kra/StorageKeyUnit.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'base/kra/src/com')

diff --git a/base/kra/src/com/netscape/kra/StorageKeyUnit.java b/base/kra/src/com/netscape/kra/StorageKeyUnit.java
index 6ef3d7d16..387e20bf7 100644
--- a/base/kra/src/com/netscape/kra/StorageKeyUnit.java
+++ b/base/kra/src/com/netscape/kra/StorageKeyUnit.java
@@ -168,23 +168,29 @@ public class StorageKeyUnit extends EncryptionUnit implements
             if (mKeySplitting) {
 
                 byte certFileData[] = null;
+                FileInputStream fi = null;
                 try {
                     File certFile = new File(
                             mConfig.getString(PROP_CERTDB));
 
                     certFileData = new byte[
                             (Long.valueOf(certFile.length())).intValue()];
-                    FileInputStream fi = new FileInputStream(certFile);
+                    fi = new FileInputStream(certFile);
 
                     fi.read(certFileData);
-                    fi.close();
-
                     // pick up cert by nickName
 
                 } catch (IOException e) {
                     mKRA.log(ILogger.LL_INFO,
                             CMS.getLogMessage("CMSCORE_KRA_STORAGE_READ_CERT", e.toString()));
                     throw new EBaseException(CMS.getUserMessage("CMS_BASE_CERT_ERROR", e.toString()));
+                } finally {
+                    try {
+                        if (fi != null)
+                            fi.close();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
                 }
 
                 try {
-- 
cgit