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/api/ConnectionHandler.java |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/opends/src/server/org/opends/server/api/ConnectionHandler.java b/opends/src/server/org/opends/server/api/ConnectionHandler.java
index 52fdf46..920963e 100644
--- a/opends/src/server/org/opends/server/api/ConnectionHandler.java
+++ b/opends/src/server/org/opends/server/api/ConnectionHandler.java
@@ -22,7 +22,7 @@
  * CDDL HEADER END
  *
  *
- *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Copyright 2006-2009 Sun Microsystems, Inc.
  */
 package org.opends.server.api;
 import org.opends.messages.Message;
@@ -85,23 +85,15 @@
 
   /**
    * Closes this connection handler so that it will no longer accept
-   * new client connections. It may or may not disconnect existing
-   * client connections based on the provided flag. Note, however,
-   * that some connection handler implementations may not have any way
-   * to continue processing requests from existing connections, in
-   * which case they should always be closed regardless of the value
-   * of the {@code closeConnections} flag.
+   * new client connections. Implementations should disconnect any
+   * existing connections.
    *
    * @param finalizeReason
    *          The reason that this connection handler should be
    *          finalized.
-   * @param closeConnections
-   *          Indicates whether any established client connections
-   *          associated with the connection handler should also be
-   *          closed.
    */
   public abstract void finalizeConnectionHandler(
-      Message finalizeReason, boolean closeConnections);
+      Message finalizeReason);
 
 
 
@@ -219,6 +211,7 @@
    * Operates in a loop, accepting new connections and ensuring that
    * requests on those connections are handled properly.
    */
+  @Override
   public abstract void run();
 
 
@@ -274,6 +267,7 @@
    *
    * @return A string representation of this connection handler.
    */
+  @Override
   public String toString() {
     StringBuilder buffer = new StringBuilder();
     toString(buffer);

--
Gitblit v1.10.0