From 0b99e26e3e75fe58045645706cd3cc8995fda728 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 27 May 2011 16:14:16 +0000
Subject: [PATCH] Fix OPENDJ-127: Back out OpenDS SDK revision 6648 as it prevents the -M options from working, however doing so seems to significantly impact max throughput (around 20%), probably due to context switching during Future.get() calls.

---
 opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java b/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java
index e5fc802..de17abf 100644
--- a/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java
+++ b/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java
@@ -95,10 +95,9 @@
     private final class BindUpdateStatsResultHandler extends
         UpdateStatsResultHandler<BindResult>
     {
-      private BindUpdateStatsResultHandler(final long startTime,
-          final AsynchronousConnection connection, final ConnectionWorker worker)
+      private BindUpdateStatsResultHandler(final long startTime)
       {
-        super(startTime, connection, worker);
+        super(startTime);
       }
 
 
@@ -117,7 +116,7 @@
 
 
 
-    private final class BindWorkerThread extends ConnectionWorker
+    private final class BindWorkerThread extends WorkerThread
     {
       private SearchRequest sr;
       private BindRequest br;
@@ -183,7 +182,7 @@
 
           final RecursiveFutureResult<SearchResultEntry, BindResult> future =
             new RecursiveFutureResult<SearchResultEntry, BindResult>(
-              new BindUpdateStatsResultHandler(startTime, connection, this))
+              new BindUpdateStatsResultHandler(startTime))
           {
             @Override
             protected FutureResult<? extends BindResult> chainResult(
@@ -206,7 +205,7 @@
         else
         {
           return performBind(connection, data,
-              new BindUpdateStatsResultHandler(startTime, connection, this));
+              new BindUpdateStatsResultHandler(startTime));
         }
       }
 
@@ -418,7 +417,7 @@
 
 
     @Override
-    ConnectionWorker newConnectionWorker(
+    WorkerThread newWorkerThread(
         final AsynchronousConnection connection,
         final ConnectionFactory connectionFactory)
     {

--
Gitblit v1.10.0