From aafa7e2dce3d0bb59184c2b4db5bad92ab467bd5 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 04 Nov 2014 14:03:05 +0000
Subject: [PATCH] OPENDJ-1545 Remove Workflow, NetworkGroups and related attempts at building a proxy
---
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
index 6462af2..5084bfc 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
@@ -29,6 +29,7 @@
import java.io.Closeable;
import java.io.IOException;
import java.net.InetAddress;
+import java.net.Socket;
import java.nio.ByteBuffer;
import java.nio.channels.*;
import java.security.cert.Certificate;
@@ -468,11 +469,6 @@
SocketChannel clientChannel, String protocol) throws DirectoryException
{
this.connectionHandler = connectionHandler;
- if (connectionHandler.isAdminConnectionHandler())
- {
- setNetworkGroup(NetworkGroup.getAdminNetworkGroup());
- }
-
this.clientChannel = clientChannel;
timeoutClientChannel = new TimeoutWriteByteChannel();
opsInProgressLock = new Object();
@@ -486,15 +482,14 @@
keepStats = connectionHandler.keepStats();
this.protocol = protocol;
writeSelector = new AtomicReference<Selector>();
- clientAddress =
- clientChannel.socket().getInetAddress().getHostAddress();
- clientPort = clientChannel.socket().getPort();
- serverAddress =
- clientChannel.socket().getLocalAddress().getHostAddress();
- serverPort = clientChannel.socket().getLocalPort();
- statTracker =
- this.connectionHandler.getStatTracker();
+ final Socket socket = clientChannel.socket();
+ clientAddress = socket.getInetAddress().getHostAddress();
+ clientPort = socket.getPort();
+ serverAddress = socket.getLocalAddress().getHostAddress();
+ serverPort = socket.getLocalPort();
+
+ statTracker = this.connectionHandler.getStatTracker();
if (keepStats)
{
@@ -519,6 +514,17 @@
connectionID = DirectoryServer.newConnectionAccepted(this);
}
+ /** {@inheritDoc} */
+ @Override
+ public NetworkGroup getNetworkGroup()
+ {
+ if (connectionHandler.isAdminConnectionHandler())
+ {
+ return NetworkGroup.getAdminNetworkGroup();
+ }
+ return NetworkGroup.getDefaultNetworkGroup();
+ }
+
/**
* Retrieves the connection ID assigned to this connection.
*
--
Gitblit v1.10.0