Author: markt
Date: Mon Jun 20 13:05:17 2016
New Revision: 1749328
URL: http://svn.apache.org/viewvc?rev=1749328&view=rev
Log:
Do not attempt to start web resources during a web application's initialisation
phase since the web application is not fully configured at that point and the
web resources may not be correctly configured.
Follow-up to
https://lists.apache.org/thread.html/8c27e780a079a15169c915a8481ef129e6fc2322d548075d00753a5c@%3Cusers.tomcat.apache.org%3E
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1749328&r1=1749327&r2=1749328&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Mon Jun 20
13:05:17 2016
@@ -4824,8 +4824,8 @@ public class StandardContext extends Con
*/
public void resourcesStart() throws LifecycleException {
- // May have been started (but not fully configured) in init() so no
need
- // to start the resources if they are already available
+ // Check current status in case resources were added that had already
+ // been started
if (!resources.getState().isAvailable()) {
resources.start();
}
@@ -6211,10 +6211,6 @@ public class StandardContext extends Con
namingResources.init();
}
- if (resources != null) {
- resources.start();
- }
-
// Send j2ee.object.created notification
if (this.getObjectName() != null) {
Notification notification = new Notification("j2ee.object.created",
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1749328&r1=1749327&r2=1749328&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jun 20 13:05:17 2016
@@ -78,6 +78,12 @@
Follow-up to <bug>59655</bug>. Improve the documentation for
configuring
permitted cookie names. Patch provided by Kyohei Nakamura. (markt)
</fix>
+ <fix>
+ Do not attempt to start web resources during a web application's
+ initialisation phase since the web application is not fully configured
+ at that point and the web resources may not be correctly configured.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
