commit aaa08726307eb197939ff1e60560f4fa81f7c786
author Mark Emlyn David Thomas <markt@apache.org> Sun Jun 06 21:51:30 2010 +0000
committer Mark Emlyn David Thomas <markt@apache.org> Sun Jun 06 21:51:30 2010 +0000
tree fc5a3b6cebc85f97a55a7012bd2a57754f7bfbeb
parent 0129913ee4f241076b221f2ba416a4a7c88f1a2c

Remainder of fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=49372
Avoid invalid Lifecycle transitions on failed start due to already bound shutdown port

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@952001 13f79535-47bb-0310-9956-ffa450edef68

java/org/apache/catalina/core/StandardService.java

diff --git a/java/org/apache/catalina/core/StandardService.java b/java/org/apache/catalina/core/StandardService.java
index af346eb..9f14466 100644
--- a/java/org/apache/catalina/core/StandardService.java
+++ b/java/org/apache/catalina/core/StandardService.java
@@ -479,7 +479,12 @@
         // Stop our defined Connectors first
         synchronized (connectors) {
             for (int i = 0; i < connectors.length; i++) {
-                ((Lifecycle) connectors[i]).stop();
+                // If Service fails to start, connectors may not have been
+                // started
+                if (!LifecycleState.INITIALIZED.equals(
+                        ((Lifecycle) connectors[i]).getState())) {
+                    ((Lifecycle) connectors[i]).stop();
+                }
             }
         }