From 37481f6efa0f769145b86f446328bc47345a4f97 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Thu, 21 Sep 2006 08:00:12 +0000
Subject: [PATCH] JMX RMI connector registration into an RMi registry doesn't seems to hav the same behavior between Java 5 and Java 6 Adapt the code to work both on Java 5 and Java 6

---
 opends/src/server/org/opends/server/protocols/jmx/RmiConnector.java |   17 +----------------
 1 files changed, 1 insertions(+), 16 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 4fe039a..f635fb4 100644
--- a/opends/src/server/org/opends/server/protocols/jmx/RmiConnector.java
+++ b/opends/src/server/org/opends/server/protocols/jmx/RmiConnector.java
@@ -27,12 +27,10 @@
 package org.opends.server.protocols.jmx;
 
 import java.io.IOException;
-import java.rmi.NoSuchObjectException;
 import java.rmi.RemoteException;
 import java.rmi.registry.LocateRegistry;
 import java.rmi.registry.Registry;
 import java.rmi.server.RMISocketFactory;
-import java.rmi.server.UnicastRemoteObject;
 import java.util.HashMap;
 
 import javax.net.ssl.SSLSocketFactory;
@@ -479,19 +477,6 @@
     }
 
     //
-    // Stop the RMI registry
-    try
-    {
-      UnicastRemoteObject.unexportObject(registry, true);
-    }
-    catch (NoSuchObjectException e)
-    {
-      // TODO Log an error message
-      assert debugException(CLASS_NAME, "finalizeConnectionHandler", e);
-    }
-    registry = null;
-
-    //
     // Close the socket
     try
     {
@@ -502,6 +487,6 @@
       // TODO Log an error message
       assert debugException(CLASS_NAME, "finalizeConnectionHandler", e);
     }
-
+    registry = null;
   }
 }

--
Gitblit v1.10.0