From c07708a62d5b06a151760c02cb4140ba3e865dfa Mon Sep 17 00:00:00 2001 From: markt Date: Sun, 6 Jun 2010 21:51:30 +0000 Subject: [PATCH] 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 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/java/org/apache/catalina/core/StandardService.java b/java/org/apache/catalina/core/StandardService.java index af346eb92..9f14466fd 100644 --- a/java/org/apache/catalina/core/StandardService.java +++ b/java/org/apache/catalina/core/StandardService.java @@ -479,7 +479,12 @@ public class StandardService extends LifecycleMBeanBase implements Service { // 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(); + } } } -- 2.11.0