From a415256cc798baf286d618a2c9ddd427c26a518d Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Mon, 14 Dec 2009 13:21:39 +0000
Subject: [PATCH] Remove optional P parameter from result handlers as it is hardly ever needed in practice and just pollutes the APIs.
---
sdk/src/org/opends/sdk/AbstractConnection.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/sdk/src/org/opends/sdk/AbstractConnection.java b/sdk/src/org/opends/sdk/AbstractConnection.java
index 7b3f780..53fc0bc 100644
--- a/sdk/src/org/opends/sdk/AbstractConnection.java
+++ b/sdk/src/org/opends/sdk/AbstractConnection.java
@@ -53,7 +53,7 @@
{
private static final class SingleEntryHandler implements
- SearchResultHandler<Void>
+ SearchResultHandler
{
private volatile SearchResultEntry firstEntry = null;
@@ -63,7 +63,7 @@
- public void handleEntry(Void p, SearchResultEntry entry)
+ public void handleEntry(SearchResultEntry entry)
{
if (firstEntry == null)
{
@@ -74,7 +74,7 @@
- public void handleReference(Void p, SearchResultReference reference)
+ public void handleReference(SearchResultReference reference)
{
if (firstReference == null)
{
@@ -299,18 +299,17 @@
Validator.ensureNotNull(request, entries);
// FIXME: does this need to be thread safe?
- SearchResultHandler<Void> handler = new SearchResultHandler<Void>()
+ SearchResultHandler handler = new SearchResultHandler()
{
- public void handleEntry(Void p, SearchResultEntry entry)
+ public void handleEntry(SearchResultEntry entry)
{
entries.add(entry);
}
- public void handleReference(Void p,
- SearchResultReference reference)
+ public void handleReference(SearchResultReference reference)
{
if (references != null)
{
@@ -319,7 +318,7 @@
}
};
- return search(request, handler, null);
+ return search(request, handler);
}
@@ -345,7 +344,7 @@
NullPointerException
{
SingleEntryHandler handler = new SingleEntryHandler();
- search(request, handler, null);
+ search(request, handler);
if (handler.entryCount == 0)
{
--
Gitblit v1.10.0