From 5844ed3b82d5abb7bce4e799a822d164bacccc7a Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Mon, 16 May 2011 16:29:37 +0000
Subject: [PATCH] Fix for Issue OPENDJ-151 - Resolve a couple of potential issues raised by FindBugs.
---
opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java b/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
index 60f3a0c..2b0f427 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.admin.client.cli;
@@ -814,10 +815,11 @@
else
if (trustStorePathArg.isPresent())
{
+ FileInputStream fos = null;
+
try
{
- FileInputStream fos =
- new FileInputStream(trustStorePathArg.getValue());
+ fos = new FileInputStream(trustStorePathArg.getValue());
String trustStorePasswordStringValue = null;
char[] trustStorePasswordValue = null;
if (trustStorePasswordArg.isPresent())
@@ -845,7 +847,6 @@
truststore = KeyStore.getInstance(KeyStore.getDefaultType());
truststore.load(fos, trustStorePasswordValue);
- fos.close();
}
catch (KeyStoreException e)
{
@@ -875,6 +876,17 @@
// are in a best effort mode.
LOG.log(Level.WARNING, "Error with the truststore", e);
}
+ finally
+ {
+ if (fos != null)
+ {
+ try
+ {
+ fos.close();
+ }
+ catch (Exception e) {}
+ }
+ }
}
trustManager = new ApplicationTrustManager(truststore);
}
@@ -893,9 +905,10 @@
char[] keyStorePasswordValue = null;
if (keyStorePathArg.isPresent())
{
+ FileInputStream fos = null;
try
{
- FileInputStream fos = new FileInputStream(keyStorePathArg.getValue());
+ fos = new FileInputStream(keyStorePathArg.getValue());
if (keyStorePasswordArg.isPresent())
{
keyStorePasswordStringValue = keyStorePasswordArg.getValue();
@@ -911,7 +924,6 @@
keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
keyStore.load(fos,keyStorePasswordValue);
- fos.close();
}
catch (KeyStoreException e)
{
@@ -948,6 +960,17 @@
// in a best effort mode.
LOG.log(Level.WARNING, "Error with the keystore", e);
}
+ finally
+ {
+ if (fos != null)
+ {
+ try {
+ fos.close();
+ }
+ catch (Exception e) {}
+ }
+ }
+
char[] password = null;
if (keyStorePasswordStringValue != null)
{
--
Gitblit v1.10.0