From 218b40d6e175f5b58b89ff7e0b3050577d3aff2f Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Mon, 10 Nov 2008 13:41:49 +0000
Subject: [PATCH] This change fixes issue 3567:
---
opends/src/server/org/opends/server/api/ClientConnection.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/opends/src/server/org/opends/server/api/ClientConnection.java b/opends/src/server/org/opends/server/api/ClientConnection.java
index c56d565..e2be916 100644
--- a/opends/src/server/org/opends/server/api/ClientConnection.java
+++ b/opends/src/server/org/opends/server/api/ClientConnection.java
@@ -32,6 +32,7 @@
import java.nio.ByteBuffer;
import java.nio.channels.Selector;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -45,7 +46,6 @@
import org.opends.server.core.SearchOperation;
import org.opends.server.core.networkgroups.NetworkGroup;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.types.AbstractOperation;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
@@ -814,8 +814,7 @@
* @return The set of operations in progress for this client
* connection.
*/
- public abstract Collection<AbstractOperation>
- getOperationsInProgress();
+ public abstract Collection<Operation> getOperationsInProgress();
@@ -828,8 +827,7 @@
* @return The operation in progress with the specified message ID,
* or {@code null} if no such operation could be found.
*/
- public abstract AbstractOperation
- getOperationInProgress(int messageID);
+ public abstract Operation getOperationInProgress(int messageID);
@@ -857,8 +855,7 @@
* @return The set of persistent searches registered for this
* client.
*/
- public final CopyOnWriteArrayList<PersistentSearch>
- getPersistentSearches()
+ public final List<PersistentSearch> getPersistentSearches()
{
return persistentSearches;
}
@@ -1660,13 +1657,13 @@
if ((authzDN == null) || authzDN.isNullDN())
{
- return java.util.Collections.<Group>emptySet();
+ return Collections.<Group>emptySet();
}
Entry userEntry = DirectoryServer.getEntry(authzDN);
if (userEntry == null)
{
- return java.util.Collections.<Group>emptySet();
+ return Collections.<Group>emptySet();
}
HashSet<Group> groupSet = new HashSet<Group>();
--
Gitblit v1.10.0