From 22094368c2865dcfb6daf8366425212b721a4657 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 05 Feb 2009 17:42:14 +0000
Subject: [PATCH] Merge ASN1 branch to trunk

---
 opends/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/opends/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java b/opends/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java
index d42ddc9..ecf2be3 100644
--- a/opends/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java
+++ b/opends/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java
@@ -43,7 +43,6 @@
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 import org.opends.messages.Message;
-import org.opends.server.api.ConnectionSecurityProvider;
 import org.opends.server.api.DirectoryThread;
 import org.opends.server.api.ServerShutdownListener;
 import org.opends.server.core.DirectoryServer;
@@ -222,9 +221,7 @@
 
                 try
                 {
-                  ConnectionSecurityProvider securityProvider =
-                       clientConnection.getConnectionSecurityProvider();
-                  if (! securityProvider.readData())
+                  if (! clientConnection.processDataRead())
                   {
                     key.cancel();
                   }

--
Gitblit v1.10.0