From 86ad6a08499797f9b3204896caee947abb03394f Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <yannick.lecaillez@forgerock.com>
Date: Mon, 07 Nov 2016 13:59:40 +0000
Subject: [PATCH] OPENDJ-3179: Migrate LDAP Connection Handler to SDK Grizzly transport

---
 opendj-server-legacy/src/main/java/org/opends/server/config/AdministrationConnector.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/config/AdministrationConnector.java b/opendj-server-legacy/src/main/java/org/opends/server/config/AdministrationConnector.java
index 6ae77f7..a903dbd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/config/AdministrationConnector.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/config/AdministrationConnector.java
@@ -35,6 +35,7 @@
 import org.forgerock.opendj.config.server.ConfigurationChangeListener;
 import org.forgerock.opendj.ldap.AddressMask;
 import org.forgerock.opendj.ldap.DN;
+import org.forgerock.opendj.reactive.LDAPConnectionHandler2;
 import org.forgerock.opendj.server.config.meta.LDAPConnectionHandlerCfgDefn.SSLClientAuthPolicy;
 import org.forgerock.opendj.server.config.server.AdministrationConnectorCfg;
 import org.forgerock.opendj.server.config.server.ConnectionHandlerCfg;
@@ -47,7 +48,6 @@
 import org.opends.server.core.DirectoryServer;
 import org.opends.server.core.ServerContext;
 import org.opends.server.core.SynchronousStrategy;
-import org.opends.server.protocols.ldap.LDAPConnectionHandler;
 import org.opends.server.types.DirectoryException;
 import org.opends.server.types.FilePermission;
 import org.opends.server.types.InitializationException;
@@ -56,8 +56,8 @@
 import org.opends.server.util.SetupUtils;
 
 /**
- * This class is a wrapper on top of LDAPConnectionHandler to manage
- * the administration connector, which is an LDAPConnectionHandler
+ * This class is a wrapper on top of LDAPConnectionHandler2 to manage
+ * the administration connector, which is an LDAPConnectionHandler2
  * with specific (limited) configuration properties.
  */
 public final class AdministrationConnector implements
@@ -73,7 +73,7 @@
   private static final String FRIENDLY_NAME = "Administration Connector";
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  private LDAPConnectionHandler adminConnectionHandler;
+  private LDAPConnectionHandler2 adminConnectionHandler;
   private AdministrationConnectorCfg config;
 
   /** Predefined values for Administration Connector configuration. */
@@ -131,7 +131,7 @@
     this.config = configuration;
 
     // Administration Connector uses the LDAP connection handler implementation
-    adminConnectionHandler = new LDAPConnectionHandler(
+    adminConnectionHandler = new LDAPConnectionHandler2(
         new SynchronousStrategy(), FRIENDLY_NAME);
     adminConnectionHandler.initializeConnectionHandler(serverContext, new LDAPConnectionCfgAdapter(config));
     adminConnectionHandler.setAdminConnectionHandler();
@@ -157,7 +157,7 @@
    *
    * @return The connection handler linked to this administration connector.
    */
-  public LDAPConnectionHandler getConnectionHandler()
+  public LDAPConnectionHandler2 getConnectionHandler()
   {
     return adminConnectionHandler;
   }

--
Gitblit v1.10.0