Correct fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48039

Return immediately if already started

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

diff --git a/java/org/apache/catalina/core/StandardService.java b/java/org/apache/catalina/core/StandardService.java
index c0cf3c7..0655842 100644 (file)
--- a/java/org/apache/catalina/core/StandardService.java
+++ b/java/org/apache/catalina/core/StandardService.java
@@ -495,8 +495,11 @@ public class StandardService
     public void start() throws LifecycleException {
 
         // Validate and update our current component state
-        if (log.isInfoEnabled() && started) {
-            log.info(sm.getString("standardService.start.started"));
+        if (started) {
+            if (log.isInfoEnabled()) {
+                log.info(sm.getString("standardService.start.started"));
+            }
+            return;
         }
         
         if( ! initialized )