From 3412471ed3f29e7281ca699ac040af2794655c71 Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Thu, 12 Jun 2014 10:21:13 +0000
Subject: [PATCH] Backport fix for OPENDJ-1491: NPE can occur during connection failover
---
opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java b/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java
index b62bb41..fce6f92 100644
--- a/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java
+++ b/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java
@@ -828,7 +828,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