From 67405dde9ba213331dab1fc46cb18c485070fd5b Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 05 Jun 2009 09:04:50 +0000
Subject: [PATCH] svn merge -r5333:5417 https://opends.dev.java.net/svn/opends/branches/b2.0
---
opends/src/server/org/opends/server/tasks/DisconnectClientTask.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/opends/src/server/org/opends/server/tasks/DisconnectClientTask.java b/opends/src/server/org/opends/server/tasks/DisconnectClientTask.java
index 9c472a6..6b0373b 100644
--- a/opends/src/server/org/opends/server/tasks/DisconnectClientTask.java
+++ b/opends/src/server/org/opends/server/tasks/DisconnectClientTask.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2009 Sun Microsystems, Inc.
*/
package org.opends.server.tasks;
import org.opends.messages.Message;
@@ -31,7 +31,6 @@
import java.util.List;
-import org.opends.server.admin.std.server.ConnectionHandlerCfg;
import org.opends.server.backends.task.Task;
import org.opends.server.backends.task.TaskState;
import org.opends.server.api.ClientConnection;
@@ -72,6 +71,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public Message getDisplayName() {
return INFO_TASK_DISCONNECT_CLIENT_NAME.get();
}
@@ -195,15 +195,14 @@
/**
* {@inheritDoc}
*/
+ @Override
protected TaskState runTask()
{
// Get the specified client connection.
ClientConnection clientConnection = null;
for (ConnectionHandler<?> handler : DirectoryServer.getConnectionHandlers())
{
- ConnectionHandler<? extends ConnectionHandlerCfg> connHandler =
- (ConnectionHandler<? extends ConnectionHandlerCfg>) handler;
- for (ClientConnection c : connHandler.getClientConnections())
+ for (ClientConnection c : handler.getClientConnections())
{
if (c.getConnectionID() == connectionID)
{
--
Gitblit v1.10.0