From 6353689bd52dcc1dcda557af7de27e6583af027c Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 28 Feb 2012 11:22:15 +0000
Subject: [PATCH] Fix OPENDJ-427: AuthenticatedConnectionFactory hides exception with NPE
---
opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AuthenticatedConnectionFactory.java | 7 +++++--
opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthenticatedConnectionFactory.java | 6 +-----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AuthenticatedConnectionFactory.java b/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AuthenticatedConnectionFactory.java
index 29cff97..03d26b3 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AuthenticatedConnectionFactory.java
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AuthenticatedConnectionFactory.java
@@ -147,8 +147,11 @@
final ErrorResultException errorResult)
{
// Ensure that the connection is closed.
- connection.close();
- connection = null;
+ if (connection != null)
+ {
+ connection.close();
+ connection = null;
+ }
return errorResult;
}
diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthenticatedConnectionFactory.java b/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthenticatedConnectionFactory.java
index 346b64f..9c9f336 100644
--- a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthenticatedConnectionFactory.java
+++ b/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthenticatedConnectionFactory.java
@@ -236,15 +236,11 @@
final ErrorResultException errorResult)
{
// Ensure that the connection is closed.
- try
+ if (connection != null)
{
connection.close();
connection = null;
}
- catch (final Exception e)
- {
- // Ignore.
- }
return errorResult;
}
--
Gitblit v1.10.0