Author: remy.maucherat(a)jboss.com Date: 2008-06-24 12:27:43 -0400 (Tue, 24 Jun 2008) New Revision: 684 Modified: trunk/java/org/apache/catalina/core/StandardService.java Log: - Use DELAY_CONNECTOR_STARTUP in stop as well. Modified: trunk/java/org/apache/catalina/core/StandardService.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardService.java 2008-06-24 11:03:55 UTC (rev 683) +++ trunk/java/org/apache/catalina/core/StandardService.java 2008-06-24 16:27:43 UTC (rev 684) @@ -567,9 +567,11 @@ lifecycle.fireLifecycleEvent(BEFORE_STOP_EVENT, null); // Stop our defined Connectors first - synchronized (connectors) { - for (int i = 0; i < connectors.length; i++) { - connectors[i].pause(); + if (!DELAY_CONNECTOR_STARTUP) { + synchronized (connectors) { + for (int i = 0; i < connectors.length; i++) { + connectors[i].pause(); + } } } @@ -589,10 +591,12 @@ } // Stop our defined Connectors first - synchronized (connectors) { - for (int i = 0; i < connectors.length; i++) { - if (connectors[i] instanceof Lifecycle) - ((Lifecycle) connectors[i]).stop(); + if (!DELAY_CONNECTOR_STARTUP) { + synchronized (connectors) { + for (int i = 0; i < connectors.length; i++) { + if (connectors[i] instanceof Lifecycle) + ((Lifecycle) connectors[i]).stop(); + } } }