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

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

Author: jfrederic.clere at jboss.com
Date: 2009-09-17 11:02:57 -0400 (Thu, 17 Sep 2009)
New Revision: 93650

Modified:
   branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java
Log:
Port r93068.
Add a safety net for connector shutdown...


Modified: branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java
===================================================================
--- branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java	2009-09-17 14:50:55 UTC (rev 93649)
+++ branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java	2009-09-17 15:02:57 UTC (rev 93650)
@@ -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");