From d38daa78b7d7ad9ccdfdfbd9fa5c14eb8e62e278 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 17 Dec 2012 15:49:42 +0000
Subject: [PATCH] Minor fix: reset bind/tls connection state after error.

---
 opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPClientFilter.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPClientFilter.java b/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPClientFilter.java
index ee66956..32cb50d 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPClientFilter.java
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPClientFilter.java
@@ -136,12 +136,14 @@
                                         return;
                                     }
                                 } catch (final ErrorResultException e) {
+                                    ldapConnection.setBindOrStartTLSInProgress(false);
                                     future.adaptErrorResult(e.getResult());
                                     return;
                                 } catch (final IOException e) {
                                     // FIXME: I18N need to have a better error
                                     // message.
                                     // FIXME: Is this the best result code?
+                                    ldapConnection.setBindOrStartTLSInProgress(false);
                                     final Result errorResult =
                                             Responses
                                                     .newResult(ResultCode.CLIENT_SIDE_LOCAL_ERROR)

--
Gitblit v1.10.0