From 5612134410394f92e11753b48817d85028e6d481 Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Mon, 21 Sep 2015 08:48:02 +0000
Subject: [PATCH] OPENDJ-2280 Log specific messages for bind/StartTLS/SASL bind in progress
---
opendj-server-legacy/src/main/java/org/opends/server/api/ClientConnection.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/ClientConnection.java b/opendj-server-legacy/src/main/java/org/opends/server/api/ClientConnection.java
index 06de38a..c509c38 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/ClientConnection.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/ClientConnection.java
@@ -93,11 +93,18 @@
protected AtomicBoolean saslBindInProgress;
/**
- * Indicates if a bind or start TLS request is currently in progress
- * on this client connection. If so, then no further socket reads
- * will occur until the request completes.
+ * Indicates if a bind request is currently in progress on this client
+ * connection. If so, then no further socket reads will occur until the
+ * request completes.
*/
- protected AtomicBoolean bindOrStartTLSInProgress;
+ protected AtomicBoolean bindInProgress;
+
+ /**
+ * Indicates if a Start TLS request is currently in progress on this client
+ * connection. If so, then no further socket reads will occur until the
+ * request completes.
+ */
+ protected AtomicBoolean startTLSInProgress;
/**
* Indicates whether any necessary finalization work has been done for this
@@ -139,7 +146,8 @@
authenticationInfo = new AuthenticationInfo();
saslAuthState = null;
saslBindInProgress = new AtomicBoolean(false);
- bindOrStartTLSInProgress = new AtomicBoolean(false);
+ bindInProgress = new AtomicBoolean(false);
+ startTLSInProgress = new AtomicBoolean(false);
sizeLimit = DirectoryServer.getSizeLimit();
timeLimit = DirectoryServer.getTimeLimit();
idleTimeLimit = DirectoryServer.getIdleTimeLimit();
@@ -1545,9 +1553,20 @@
* the socket again. This must be called after processing each
* bind request in a multistage SASL bind.
*/
- public void finishBindOrStartTLS()
+ public void finishBind()
{
- bindOrStartTLSInProgress.set(false);
+ bindInProgress.set(false);
+ }
+
+ /**
+ * Indicates a bind or start TLS request processing is finished
+ * and the client connection may start processing data read from
+ * the socket again. This must be called after processing each
+ * bind request in a multistage SASL bind.
+ */
+ public void finishStartTLS()
+ {
+ startTLSInProgress.set(false);
}
/**
--
Gitblit v1.10.0