[jboss-cvs] JBossAS SVN: r93068 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers.

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

Author: remy.maucherat at jboss.com
Date: 2009-09-01 06:57:39 -0400 (Tue, 01 Sep 2009)
New Revision: 93068

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java
Log:
- Add a safety net for connector shutdown.
- Stop notification seems broken (the start notification works, though).

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java	2009-09-01 10:38:43 UTC (rev 93067)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java	2009-09-01 10:57:39 UTC (rev 93068)
@@ -451,7 +451,7 @@
       // Hot undeploy
       final LifecycleState currentState = (LifecycleState) server.getAttribute(ServerImplMBean.OBJECT_NAME, "State");
       boolean inShutdown = currentState.equals(LifecycleState.STOPPING);
-      if (inShutdown == false)
+      if (!inShutdown || connectorsRunning)
       {
          log.debug("Server '" + ServerImplMBean.OBJECT_NAME + "' already started, stopping connectors now");
 
@@ -631,7 +631,7 @@
       connectorsRunning = true;
    }
 
-   public void stopConnectors() throws Exception
+   public synchronized void stopConnectors() throws Exception
    {
       if (tomcatDeployer == null)
          throw new IllegalStateException("Must set TomcatDeployer before stopping connectors");