From 1c07d2405e57b4fbff3a57720179f1e229d6696a Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Thu, 12 Jun 2014 10:18:36 +0000
Subject: [PATCH] Fix OPENDJ-1491: NPE can occur during connection failover
---
opendj-core/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java
index 1b13da3..3340904 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java
@@ -819,7 +819,9 @@
private boolean checkState(final ResultHandler<?> h) {
final ErrorResultException error = state.getConnectionError();
if (error != null) {
- h.handleErrorResult(error);
+ if (h != null) {
+ h.handleErrorResult(error);
+ }
return false;
} else {
return true;
--
Gitblit v1.10.0