summaryrefslogtreecommitdiffstats
path: root/base/kra
diff options
context:
space:
mode:
authorAbhishek Koneru <akoneru@redhat.com>2012-06-26 15:37:15 -0400
committerEndi Sukma Dewata <edewata@redhat.com>2012-07-02 12:44:05 -0500
commit0f3451befbc14bd6ec29d9e1e3845f970f288653 (patch)
tree346822835936131b9dc6c5fd8692ce9c60eeda03 /base/kra
parent10502e34a10fb3b672aef1161cc271003c7806ba (diff)
downloadpki-0f3451befbc14bd6ec29d9e1e3845f970f288653.tar.gz
pki-0f3451befbc14bd6ec29d9e1e3845f970f288653.tar.xz
pki-0f3451befbc14bd6ec29d9e1e3845f970f288653.zip
LeftOver Cases in Resource Leaks and NULL_RETURNS
Diffstat (limited to 'base/kra')
-rw-r--r--base/kra/src/com/netscape/kra/StorageKeyUnit.java15
1 files changed, 10 insertions, 5 deletions
diff --git a/base/kra/src/com/netscape/kra/StorageKeyUnit.java b/base/kra/src/com/netscape/kra/StorageKeyUnit.java
index f968a8c44..6ef3d7d16 100644
--- a/base/kra/src/com/netscape/kra/StorageKeyUnit.java
+++ b/base/kra/src/com/netscape/kra/StorageKeyUnit.java
@@ -216,7 +216,7 @@ public class StorageKeyUnit extends EncryptionUnit implements
// read certificate from file
byte certData[] = null;
-
+ FileInputStream fi = null;
try {
if (mKeySplitting) {
File certFile = new File(
@@ -224,11 +224,9 @@ public class StorageKeyUnit extends EncryptionUnit implements
certData = new byte[
(Long.valueOf(certFile.length())).intValue()];
- FileInputStream fi = new FileInputStream(certFile);
+ fi = new FileInputStream(certFile);
fi.read(certData);
- fi.close();
-
// pick up cert by nickName
mCert = mManager.findCertByNickname(
config.getString(PROP_NICKNAME));
@@ -257,11 +255,18 @@ public class StorageKeyUnit extends EncryptionUnit implements
CMS.getLogMessage("CMSCORE_KRA_STORAGE_IMPORT_CERT", e.toString()));
throw new EBaseException(CMS.getUserMessage("CMS_BASE_CERT_ERROR", ex.toString()));
}
+ } finally {
+ if (fi != null) {
+ try {
+ fi.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
}
if (mKeySplitting) {
// read private key from the file
- FileInputStream fi = null;
try {
File priFile = new File(mConfig.getString(PROP_KEYDB));