[jboss-cvs] JBossAS SVN: r92101 - in projects/bootstrap/trunk: impl-base/src/main/java/org/jboss/bootstrap/impl/base/server and 1 other directory.

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

Author: ALRubinger
Date: 2009-08-07 00:11:31 -0400 (Fri, 07 Aug 2009)
New Revision: 92101

Modified:
   projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/server/AbstractJBossASServerBase.java
   projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractServer.java
Log:
[JBBOOT-105] Send the "STOP" Kernel and JMX events before initing the shutdown sequence; by legacy behaviour these are really "preshutdown" notifications

Modified: projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/server/AbstractJBossASServerBase.java
===================================================================
--- projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/server/AbstractJBossASServerBase.java	2009-08-07 03:17:09 UTC (rev 92100)
+++ projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/server/AbstractJBossASServerBase.java	2009-08-07 04:11:31 UTC (rev 92101)
@@ -285,7 +285,7 @@
       final LifecycleEventHandler startHandler = new KernelStartEventLifecycleEventHandler(bootstrap);
       final LifecycleEventHandler stopHandler = new KernelStopEventLifecycleEventHandler(bootstrap);
       this.registerEventHandler(startHandler, LifecycleState.STARTED);
-      this.registerEventHandler(stopHandler, LifecycleState.STOPPED);
+      this.registerEventHandler(stopHandler, LifecycleState.STOPPING);
 
       // Log the server info
       this.logServerInfo();

Modified: projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractServer.java
===================================================================
--- projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractServer.java	2009-08-07 03:17:09 UTC (rev 92100)
+++ projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractServer.java	2009-08-07 04:11:31 UTC (rev 92101)
@@ -297,6 +297,9 @@
          log.info("Stopping: " + this);
          final StopWatch watch = new StopWatch(true);
          this.setState(LifecycleState.STOPPING);
+         
+         // Send JMX Notification
+         this.sendStopJmxNotification();
 
          // Shutdown the Bootstraps
          if (log.isTraceEnabled())
@@ -323,9 +326,6 @@
             serverInitializer.cleanup(this.covarientReturn());
          }
 
-         // Send JMX Notification
-         this.sendStopJmxNotification();
-
          // Done and set states
          log.info("Stopped: " + this + " in " + watch);
          // So we fire "stopped" events and draw the difference