Author: markt
Date: Thu Sep 29 13:16:08 2016
New Revision: 1762766
URL: http://svn.apache.org/viewvc?rev=1762766&view=rev
Log:
When starting web resources, ensure that class resources are only started once.
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java?rev=1762766&r1=1762765&r2=1762766&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java Thu
Sep 29 13:16:08 2016
@@ -692,8 +692,11 @@ public class StandardRoot extends Lifecy
mainResources.add(main);
for (List<WebResourceSet> list : allResources) {
- for (WebResourceSet webResourceSet : list) {
- webResourceSet.start();
+ // Skip class resources since they are started below
+ if (list != classResources) {
+ for (WebResourceSet webResourceSet : list) {
+ webResourceSet.start();
+ }
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1762766&r1=1762765&r2=1762766&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Sep 29 13:16:08 2016
@@ -98,6 +98,10 @@
<code>index.html.br</code> from RAT analysis. Patch provided by Gavin
McDonald. (markt)
</fix>
+ <fix>
+ When starting web resources, ensure that class resources are only
+ started once. (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
