From 2aa388218e55a4b3c828466f822445e3fa618cfa Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 20 Mar 2013 08:58:11 +0000
Subject: [PATCH] OPENDJ-808 Implement a simple commons REST based HTTP connection handler
---
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
index 9f74bf3..131ca77 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
@@ -29,14 +29,14 @@
-import static org.opends.messages.CoreMessages.ERR_ENQUEUE_BIND_IN_PROGRESS;
+import static org.opends.messages.CoreMessages.*;
import static org.opends.messages.ProtocolMessages.*;
-import static org.opends.server.core.DirectoryServer.getMaxInternalBufferSize;
-import static org.opends.server.loggers.AccessLogger.logDisconnect;
-import static org.opends.server.loggers.ErrorLogger.logError;
+import static org.opends.server.core.DirectoryServer.*;
+import static org.opends.server.loggers.AccessLogger.*;
+import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.protocols.ldap.LDAPConstants.*;
-import static org.opends.server.util.ServerConstants.OID_START_TLS_REQUEST;
+import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import java.io.IOException;
@@ -109,6 +109,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void run()
{
try
@@ -159,6 +160,7 @@
// Synchronize concurrent writes to the same connection.
private final Lock writeLock = new ReentrantLock();
+ @Override
public int read(ByteBuffer byteBuffer) throws IOException
{
int bytesRead = clientChannel.read(byteBuffer);
@@ -169,11 +171,13 @@
return bytesRead;
}
+ @Override
public boolean isOpen()
{
return clientChannel.isOpen();
}
+ @Override
public void close() throws IOException
{
clientChannel.close();
@@ -181,6 +185,7 @@
+ @Override
public int write(ByteBuffer byteBuffer) throws IOException
{
writeLock.lock();
@@ -333,6 +338,7 @@
/**
* {@inheritDoc}
*/
+ @Override
protected ASN1WriterHolder initialValue()
{
return new ASN1WriterHolder();
@@ -503,7 +509,7 @@
if (connectionID < 0)
{
disconnect(DisconnectReason.ADMIN_LIMIT_EXCEEDED, true,
- ERR_LDAP_CONNHANDLER_REJECTED_BY_SERVER.get());
+ ERR_CONNHANDLER_REJECTED_BY_SERVER.get());
}
}
@@ -2498,6 +2504,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean prepareTLS(MessageBuilder unavailableReason)
{
if (isSecure() && "TLS".equals(activeProvider.getName()))
--
Gitblit v1.10.0