tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r681156 - in /tomcat: container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextConfig.java container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt
Date Wed, 30 Jul 2008 18:06:26 GMT
Author: markt
Date: Wed Jul 30 11:06:25 2008
New Revision: 681156

URL: http://svn.apache.org/viewvc?rev=681156&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=29936
Don't use parser from a webapp to parse web.xml and possibly context.xml files.

Modified:
    tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
    tomcat/container/tc5.5.x/webapps/docs/changelog.xml
    tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextConfig.java?rev=681156&r1=681155&r2=681156&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
Wed Jul 30 11:06:25 2008
@@ -322,10 +322,6 @@
         
         long t1=System.currentTimeMillis();
 
-        if (webDigester == null){
-            webDigester = createWebDigester();
-        }
-        
         URL url=null;
         // Process the application web.xml file
         synchronized (webDigester) {
@@ -606,10 +602,6 @@
                       + " " + defaultWebXml + " " + file , e);
         }
 
-        if (webDigester == null){
-            webDigester = createWebDigester();
-        }
-        
         if (stream != null) {
             processDefaultWebConfig(webDigester, stream, source);
             webRuleSet.recycle();
@@ -768,9 +760,6 @@
         
         if (source == null)
             return;
-        if (contextDigester == null){
-            contextDigester = createContextDigester();
-        }
         synchronized (contextDigester) {
             try {
                 source.setByteStream(stream);
@@ -979,6 +968,16 @@
     protected void init() {
         // Called from StandardContext.init()
 
+        if (webDigester == null){
+            webDigester = createWebDigester();
+            webDigester.getParser();
+        }
+        
+        if (contextDigester == null){
+            contextDigester = createContextDigester();
+            contextDigester.getParser();
+        }
+
         if (log.isDebugEnabled())
             log.debug(sm.getString("contextConfig.init"));
         context.setConfigured(false);

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=681156&r1=681155&r2=681156&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Jul 30 11:06:25 2008
@@ -50,6 +50,10 @@
         requested. Patch provided by Charles R Caldarale. (markt)
       </fix>
       <fix>
+        <bug>29936</bug>: Don't use parser from a webapp to parse web.xml and
possibly
+        context.xml files. (markt)
+      </fix>
+      <fix>
         <bug>44529</bug>: No roles specified (deny all) should take precedence
         over no auth-constraint specified (allow-all). (markt)
       </fix> 

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=681156&r1=681155&r2=681156&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 30 11:06:25 2008
@@ -79,13 +79,6 @@
   +1: markt
   -1: fhanik - same as all the above 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=29936
-  Create digesters and parsers earlier so we aren't using the webapp class
-  loader when we create them.
-  http://svn.apache.org/viewvc?rev=649974&view=rev
-  +1: markt, fhanik, yoavs
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=31257
   Quote endorsed dirs if they contain a space
   http://svn.apache.org/viewvc?rev=649993&view=rev



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message