[jboss-cvs] JBossAS SVN: r88844 - branches/Branch_5_x_BootstrapLegacyRemoval/system-jmx/src/main/org/jboss/system/server/jmx.

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

Author: ALRubinger
Date: 2009-05-13 19:23:15 -0400 (Wed, 13 May 2009)
New Revision: 88844

Modified:
   branches/Branch_5_x_BootstrapLegacyRemoval/system-jmx/src/main/org/jboss/system/server/jmx/JMXKernel.java
Log:
[JBAS-6916][JBAS-6856] Manually request Runtime.exit() in JMXKernel, as this has been removed from bootstrap

Modified: branches/Branch_5_x_BootstrapLegacyRemoval/system-jmx/src/main/org/jboss/system/server/jmx/JMXKernel.java
===================================================================
--- branches/Branch_5_x_BootstrapLegacyRemoval/system-jmx/src/main/org/jboss/system/server/jmx/JMXKernel.java	2009-05-13 23:13:24 UTC (rev 88843)
+++ branches/Branch_5_x_BootstrapLegacyRemoval/system-jmx/src/main/org/jboss/system/server/jmx/JMXKernel.java	2009-05-13 23:23:15 UTC (rev 88844)
@@ -511,15 +511,17 @@
    
    public void shutdown()
    {
-      if (log.isTraceEnabled())
-         log.trace("Shutdown caller:", new Throwable("Here"));
-      try{
-         serverImpl.shutdown();
-      }
-      catch(Throwable t)
-      {
-         throw new RuntimeException("Error in shutdown of server: " + serverImpl,t);
-      }
+      // JBAS-6916
+      // We'll shut down the server via the Main shutdown hook...
+//      if (log.isTraceEnabled())
+//         log.trace("Shutdown caller:", new Throwable("Here"));
+//      try{
+//         serverImpl.shutdown();
+//      }
+//      catch(Throwable t)
+//      {
+//         throw new RuntimeException("Error in shutdown of server: " + serverImpl,t);
+//      }
       
       // JBAS-6916:
       //TODO This must be removed, VM exit is not a feature of server shutdown.