[jboss-cvs] JBossAS SVN: r88620 - branches/Branch_5_x_BootstrapLegacyRemoval/tomcat/src/main/org/jboss/web/tomcat/service/deployers.

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

Author: ALRubinger
Date: 2009-05-11 05:56:17 -0400 (Mon, 11 May 2009)
New Revision: 88620

Modified:
   branches/Branch_5_x_BootstrapLegacyRemoval/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java
Log:
[JBAS-6856] Update Tomcat to look for correct state during startup, no longer using "started" flag

Modified: branches/Branch_5_x_BootstrapLegacyRemoval/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java
===================================================================
--- branches/Branch_5_x_BootstrapLegacyRemoval/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java	2009-05-11 09:52:24 UTC (rev 88619)
+++ branches/Branch_5_x_BootstrapLegacyRemoval/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java	2009-05-11 09:56:17 UTC (rev 88620)
@@ -47,6 +47,7 @@
 import org.apache.tomcat.util.IntrospectionUtils;
 import org.apache.tomcat.util.modeler.Registry;
 import org.jboss.bootstrap.spi.as.server.JBossASServer;
+import org.jboss.bootstrap.spi.lifecycle.LifecycleState;
 import org.jboss.kernel.spi.dependency.KernelController;
 import org.jboss.kernel.spi.dependency.KernelControllerContext;
 import org.jboss.security.plugins.JaasSecurityManagerServiceMBean;
@@ -343,8 +344,8 @@
       // we'll never receive Server.START_NOTIFICATION_TYPE, so check
       // with the Server and start the connectors immediately, if this is the case.
       // Otherwise register to receive the server start-up notification.
-      Boolean started = (Boolean) server.getAttribute(ServerImplMBean.OBJECT_NAME, "Started");
-      if (started.booleanValue() == true)
+      LifecycleState currentState = (LifecycleState) server.getAttribute(ServerImplMBean.OBJECT_NAME, "State");
+      if (currentState.equals(LifecycleState.STARTED))
       {
          log.debug("Server '" + ServerImplMBean.OBJECT_NAME + "' already started, starting connectors now");