From 32034d853f3a284424ccfa87b6de210f1ca814e1 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 29 Nov 2011 00:31:21 +0000
Subject: [PATCH] Fix OPENDJ-43 (Synchronous Connection decorator implementations should not use AsynchronousConnections) and OPENDJ-328 (Make it easier to implement connection decorators).
---
opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java b/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java
index 6c07efa..5a7a566 100644
--- a/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java
+++ b/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java
@@ -121,12 +121,11 @@
private final class SearchWorkerThread extends WorkerThread
{
private SearchRequest sr;
-
private Object[] data;
- private SearchWorkerThread(final AsynchronousConnection connection,
+ private SearchWorkerThread(final Connection connection,
final ConnectionFactory connectionFactory)
{
super(connection, connectionFactory);
@@ -135,8 +134,7 @@
@Override
- public FutureResult<?> performOperation(
- final AsynchronousConnection connection,
+ public FutureResult<?> performOperation(final Connection connection,
final DataSource[] dataSources, final long startTime)
{
if (sr == null)
@@ -159,20 +157,17 @@
sr.setFilter(String.format(filter, data));
sr.setName(String.format(baseDN, data));
}
- return connection.search(sr, new SearchStatsHandler(startTime));
+ return connection.searchAsync(sr, null, new SearchStatsHandler(
+ startTime));
}
}
private String filter;
-
private String baseDN;
-
private SearchScope scope;
-
private DereferenceAliasesPolicy dereferencesAliasesPolicy;
-
private String[] attributes;
@@ -186,8 +181,7 @@
@Override
- WorkerThread newWorkerThread(
- final AsynchronousConnection connection,
+ WorkerThread newWorkerThread(final Connection connection,
final ConnectionFactory connectionFactory)
{
return new SearchWorkerThread(connection, connectionFactory);
--
Gitblit v1.10.0