Author: markt
Date: Fri Nov 20 20:28:42 2015
New Revision: 1715415
URL: http://svn.apache.org/viewvc?rev=1715415&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58629
Allow an embedded Tomcat instance to start when the Service has no
Engine configured.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardService.java
tomcat/trunk/java/org/apache/catalina/mapper/MapperListener.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardService.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardService.java?rev=1715415&r1=1715414&r2=1715415&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardService.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardService.java Fri Nov 20
20:28:42 2015
@@ -431,7 +431,6 @@ public class StandardService extends Lif
}
}
-
mapperListener.start();
// Start our defined Connectors second
Modified: tomcat/trunk/java/org/apache/catalina/mapper/MapperListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mapper/MapperListener.java?rev=1715415&r1=1715414&r2=1715415&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mapper/MapperListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mapper/MapperListener.java Fri Nov 20
20:28:42 2015
@@ -96,12 +96,13 @@ public class MapperListener extends Life
setState(LifecycleState.STARTING);
- // Find any components that have already been initialized since the
- // MBean listener won't be notified as those components will have
- // already registered their MBeans
+ Engine engine = service.getContainer();
+ if (engine == null) {
+ return;
+ }
+
findDefaultHost();
- Engine engine = service.getContainer();
addListeners(engine);
Container[] conHosts = engine.findChildren();
@@ -120,6 +121,9 @@ public class MapperListener extends Life
setState(LifecycleState.STOPPING);
Engine engine = service.getContainer();
+ if (engine == null) {
+ return;
+ }
removeListeners(engine);
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1715415&r1=1715414&r2=1715415&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Nov 20 20:28:42 2015
@@ -66,6 +66,10 @@
Refactor <code>Service.getContainer()</code> to return an
<code>Engine</code> rather than a <code>Container</code>. (markt)
</scode>
+ <fix>
+ <bug>58629</bug>: Allow an embedded Tomcat instance to start when the
+ <code>Service</code> has no <code>Engine</code> configured. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
