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

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

Author: remy.maucherat at jboss.com
Date: 2008-11-27 08:01:45 -0500 (Thu, 27 Nov 2008)
New Revision: 81726

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java
Log:
- Use a run flag for connectors to avoid warnings on shutdown.

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	2008-11-27 12:37:17 UTC (rev 81725)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java	2008-11-27 13:01:45 UTC (rev 81726)
@@ -88,6 +88,9 @@
    
    /** The associated Tomcat deployer * */
    private TomcatDeployer tomcatDeployer;
+   
+   // Use a flag because isInShutdown doesn't appear to be correct
+   private boolean connectorsRunning = false;
 
    // Dependency inject the TomcatDeployer pojo
 
@@ -612,6 +615,8 @@
    {
       if (tomcatDeployer == null)
          throw new IllegalStateException("Must set TomcatDeployer before starting connectors");
+      if (connectorsRunning)
+         return;
 
       MBeanServer server = super.getServer();
       ObjectName service = new ObjectName(tomcatDeployer.getDomain() + ":type=Service,serviceName=jboss.web");
@@ -627,12 +632,15 @@
        * TODO: // Notify listeners that connectors have started processing requests sendNotification(new
        * Notification(TOMCAT_CONNECTORS_STARTED, this, getNextNotificationSequenceNumber()));
        */
+      connectorsRunning = true;
    }
 
    public void stopConnectors() throws Exception
    {
       if (tomcatDeployer == null)
          throw new IllegalStateException("Must set TomcatDeployer before stopping connectors");
+      if (!connectorsRunning)
+         return;
 
       MBeanServer server = super.getServer();
       ObjectName service = new ObjectName(tomcatDeployer.getDomain() + ":type=Service,serviceName=jboss.web");
@@ -644,6 +652,7 @@
          connectors[n].pause();
          connectors[n].stop();
       }
+      connectorsRunning = false;
    }
 
    /**