[jboss-cvs] JBoss Messaging SVN: r5246 - branches/Branch_1_4/tests/src/org/jboss/test/messaging/tools/container.

[jboss-cvs-commits at lists.jboss.org]

Author: clebert.suconic at jboss.com
Date: 2008-11-03 11:58:47 -0500 (Mon, 03 Nov 2008)
New Revision: 5246

Modified:
   branches/Branch_1_4/tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java
Log:
Fixing test hangs

Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java
===================================================================
--- branches/Branch_1_4/tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java	2008-11-03 14:22:52 UTC (rev 5245)
+++ branches/Branch_1_4/tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java	2008-11-03 16:58:47 UTC (rev 5246)
@@ -155,25 +155,36 @@
 
    public synchronized void kill() throws Exception
    {
-      log.info("kill() invoked - first deregistering from the rmi registry");
-
-      // unregister myself from the RMI registry
-
-      Registry registry = LocateRegistry.getRegistry(DEFAULT_REGISTRY_PORT);
-
-      String name = RMI_SERVER_PREFIX + server.getServerID();
-      registry.unbind(name);
-      log.info("unregistered " + name + " from registry");
-
-      // unregister myself from the RMI registry
-
-      name = NAMING_SERVER_PREFIX + server.getServerID();
-      registry.unbind(name);
-      log.info("unregistered " + name + " from registry");
-
-      log.info("Killing VM!!!!");
-
-      Runtime.getRuntime().halt(1);
+      try
+      {
+         log.info("kill() invoked - first deregistering from the rmi registry");
+   
+         // unregister myself from the RMI registry
+   
+         Registry registry = LocateRegistry.getRegistry(DEFAULT_REGISTRY_PORT);
+   
+         String name = RMI_SERVER_PREFIX + server.getServerID();
+         registry.unbind(name);
+         log.info("unregistered " + name + " from registry");
+   
+         // unregister myself from the RMI registry
+   
+         name = NAMING_SERVER_PREFIX + server.getServerID();
+         registry.unbind(name);
+         log.info("unregistered " + name + " from registry");
+   
+      }
+      catch (Exception e)
+      {
+         log.error(e.getMessage(), e);
+      }
+      finally
+      {
+         log.info("Killing VM!!!!");
+         
+         // Whatever happens on this method, the VM must be killed or the test will hang
+         Runtime.getRuntime().halt(1);
+      }
    }
 
    public void ping() throws Exception