tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup ContextConfig.java
Date Mon, 06 Sep 2004 18:51:37 GMT
markt       2004/09/06 11:51:37

  Modified:    catalina/src/share/org/apache/catalina/startup
                        ContextConfig.java
  Log:
  Fix for part of bug 20758. Stop Digesters retaining reference to context.
  
  Revision  Changes    Path
  1.71      +5 -1      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
  
  Index: ContextConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- ContextConfig.java	26 Aug 2004 21:41:12 -0000	1.70
  +++ ContextConfig.java	6 Sep 2004 18:51:37 -0000	1.71
  @@ -218,6 +218,7 @@
                   webDigester.clear();
                   webDigester.push(context);
                   webDigester.parse(is);
  +                webDigester.push(null);
               } catch (SAXParseException e) {
                   log(sm.getString("contextConfig.applicationParse"), e);
                   log(sm.getString("contextConfig.applicationPosition",
  @@ -484,6 +485,7 @@
                   webDigester.clear();
                   webDigester.push(context);
                   webDigester.parse(is);
  +                webDigester.push(null);
               } catch (SAXParseException e) {
                   log(sm.getString("contextConfig.defaultParse"), e);
                   log(sm.getString("contextConfig.defaultPosition",
  @@ -924,6 +926,8 @@
               tldDigester.clear();
               tldDigester.push(context);
               tldDigester.parse(resourceStream);
  +            tldDigester.push(null);
  +
           }
   
       }
  
  
  

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


Mime
View raw message