From 9dc10dec2d5d7f61116f7f647b7cf9596ca77be0 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

---
 opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java |   32 +++++++++++++++-----------------
 1 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
index 96ebbab..7f87b77 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
@@ -22,7 +22,7 @@
  * CDDL HEADER END
  *
  *
- *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Copyright 2006-2009 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.jmx;
 import java.io.IOException;
@@ -161,7 +161,7 @@
       listeners.clear();
       listeners.add(new HostPort(config.getListenPort()));
 
-      rmiConnector.finalizeConnectionHandler(true, portChanged);
+      rmiConnector.finalizeConnectionHandler(portChanged);
       try
       {
         rmiConnector.initialize();
@@ -190,25 +190,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.
-   *
-   * @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.
+   * {@inheritDoc}
    */
-  public void finalizeConnectionHandler(Message finalizeReason,
-      boolean closeConnections) {
+  @Override
+  public void finalizeConnectionHandler(Message finalizeReason) {
     // Make sure that we don't get notified of any more changes.
     currentConfig.removeJMXChangeListener(this);
 
     // We should also close the RMI registry.
-    rmiConnector.finalizeConnectionHandler(closeConnections, true);
+    rmiConnector.finalizeConnectionHandler(true);
   }
 
 
@@ -252,6 +242,7 @@
    * @return The set of active client connections that have been
    *         established through this connection handler.
    */
+  @Override
   public Collection<ClientConnection> getClientConnections() {
     return connectionList;
   }
@@ -265,6 +256,7 @@
    * @return The DN of the configuration entry with which this alert
    *         generator is associated.
    */
+  @Override
   public DN getComponentEntryDN() {
     return currentConfig.dn();
   }
@@ -335,6 +327,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public void initializeConnectionHandler(JMXConnectionHandlerCfg config)
          throws ConfigException, InitializationException
   {
@@ -388,6 +381,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public String getConnectionHandlerName() {
     return connectionHandlerName;
   }
@@ -397,6 +391,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public String getProtocol() {
     return protocol;
   }
@@ -406,6 +401,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public Collection<HostPort> getListeners() {
     return listeners;
   }
@@ -477,7 +473,7 @@
    */
   public void processServerShutdown(Message reason) {
     // We should also close the RMI registry.
-    rmiConnector.finalizeConnectionHandler(true, true);
+    rmiConnector.finalizeConnectionHandler(true);
   }
 
 
@@ -497,6 +493,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public void run() {
     try
     {
@@ -512,6 +509,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public void toString(StringBuilder buffer) {
     buffer.append(connectionHandlerName);
   }

--
Gitblit v1.10.0