From f67af7588ba1f7827bc6ff907729d14bf39a19f6 Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Wed, 04 Jun 2008 17:24:01 +0000
Subject: [PATCH] Fix for issues 3255, 3265, and 3269:
---
opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java b/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
index 6091c41..56cadb2 100644
--- a/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
+++ b/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
@@ -975,11 +975,19 @@
// Indicate that this connection is no longer valid.
connectionValid = false;
- MessageBuilder msgBuilder = new MessageBuilder();
- msgBuilder.append(disconnectReason.getClosureMessage());
- msgBuilder.append(": ");
- msgBuilder.append(message);
- cancelAllOperations(new CancelRequest(true, msgBuilder.toMessage()));
+ if(message != null)
+ {
+ MessageBuilder msgBuilder = new MessageBuilder();
+ msgBuilder.append(disconnectReason.getClosureMessage());
+ msgBuilder.append(": ");
+ msgBuilder.append(message);
+ cancelAllOperations(new CancelRequest(true, msgBuilder.toMessage()));
+ }
+ else
+ {
+ cancelAllOperations(new CancelRequest(true,
+ disconnectReason.getClosureMessage()));
+ }
finalizeConnectionInternal();
--
Gitblit v1.10.0