commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From patri...@apache.org
Subject cvs commit: jakarta-commons/digester/src/java/org/apache/commons/digester Digester.java
Date Thu, 15 Aug 2002 16:42:08 GMT
patrickl    2002/08/15 09:42:08

  Modified:    digester/src/java/org/apache/commons/digester Digester.java
  Log:
  This patch add a small condition when setting the Digester publicId value. When a parser
try to resolve a DTD, the first validation will contains the proper dtd public's ID, but second
invokation will be equal to null. This patch fixes a bug in Tomcat 4.0 and 5.0.
  Submitted by:	Jean-Francois Arcand (jeanfrancois.arcand@sun.com)
  
  Revision  Changes    Path
  1.64      +7 -6      jakarta-commons/digester/src/java/org/apache/commons/digester/Digester.java
  
  Index: Digester.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/Digester.java,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- Digester.java	10 Aug 2002 22:05:42 -0000	1.63
  +++ Digester.java	15 Aug 2002 16:42:08 -0000	1.64
  @@ -1201,7 +1201,7 @@
               saxLog.debug("startElement(" + namespaceURI + "," + localName + "," +
                       qName + ")");
           }
  -
  +        
           // Save the body text accumulated for our surrounding element
           bodyTexts.push(bodyText);
           if (debug) {
  @@ -1337,7 +1337,8 @@
           if (saxLog.isDebugEnabled()) {
               saxLog.debug("resolveEntity('" + publicId + "', '" + systemId + "')");
           }
  -        this.publicId = publicId;
  +        if (publicId != null)
  +            this.publicId = publicId;
                                          
           // Has this system identifier been registered?
           String entityURL = null;
  
  
  

--
To unsubscribe, e-mail:   <mailto:commons-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@jakarta.apache.org>


Mime
View raw message