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/protocols/jmx/RmiConnector.java | 43 ++++++++++++-------------------------------
1 files changed, 12 insertions(+), 31 deletions(-)
diff --git a/opends/src/server/org/opends/server/protocols/jmx/RmiConnector.java b/opends/src/server/org/opends/server/protocols/jmx/RmiConnector.java
index 750b547..3858b65 100644
--- a/opends/src/server/org/opends/server/protocols/jmx/RmiConnector.java
+++ b/opends/src/server/org/opends/server/protocols/jmx/RmiConnector.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;
@@ -100,12 +100,6 @@
private String jmxRmiConnectorNoClientCertificateName;
/**
- * The name of the JMX connector with SSL client
- * authentication.
- */
- private String jmxRmiConnectorClientCertificateName;
-
- /**
* The reference to the JMX connector client with no SSL client
* authentication.
*/
@@ -159,9 +153,6 @@
jmxRmiConnectorNoClientCertificateName = baseName + ","
+ "Type=jmxRmiConnectorNoClientCertificateName";
-
- jmxRmiConnectorClientCertificateName = baseName + ","
- + "Type=jmxRmiConnectorClientCertificateName";
}
// ===================================================================
@@ -430,39 +421,29 @@
* client connections. It may or may not disconnect existing client
* connections based on the provided flag.
*
- * @param closeConnections
- * Indicates whether any established client connections
- * associated with the connection handler should also be
- * closed.
* @param stopRegistry Indicates if the RMI registry should be stopped
*/
- public void finalizeConnectionHandler(
- boolean closeConnections, boolean stopRegistry)
+ public void finalizeConnectionHandler(boolean stopRegistry)
{
- if (closeConnections)
+ try
{
- try
+ if (jmxRmiConnectorNoClientCertificate != null)
{
- if (jmxRmiConnectorNoClientCertificate != null)
- {
- jmxRmiConnectorNoClientCertificate.stop();
- }
- if (jmxRmiConnectorClientCertificate != null)
- {
- jmxRmiConnectorClientCertificate.stop();
- }
+ jmxRmiConnectorNoClientCertificate.stop();
}
- catch (Exception e)
+ if (jmxRmiConnectorClientCertificate != null)
{
+ jmxRmiConnectorClientCertificate.stop();
}
- jmxRmiConnectorNoClientCertificate = null;
- jmxRmiConnectorClientCertificate = null;
}
- else
+ catch (Exception e)
{
- rmiAuthenticator.setFinalizedPhase(true);
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
+ jmxRmiConnectorNoClientCertificate = null;
+ jmxRmiConnectorClientCertificate = null;
+
//
// Unregister connectors and stop them.
try
--
Gitblit v1.10.0