cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/parser ParserUtils.java

[kinman]

kinman      02/05/20 10:41:41

  Modified:    jasper/src/share/org/apache/jasper/compiler JspUtil.java
               jasper/src/share/org/apache/jasper/parser ParserUtils.java
  Log:
  - Fixed 8565: resolveEntity returns null instead of throwing an exception
  
  Revision  Changes    Path
  1.14      +7 -7      
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspUtil.java
  
  Index: JspUtil.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspUtil.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- JspUtil.java      24 Jul 2001 22:39:48 -0000      1.13
  +++ JspUtil.java      20 May 2002 17:41:41 -0000      1.14
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspUtil.java,v
 1.13 2001/07/24 22:39:48 craigmcc Exp $
  - * $Revision: 1.13 $
  - * $Date: 2001/07/24 22:39:48 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspUtil.java,v
 1.14 2002/05/20 17:41:41 kinman Exp $
  + * $Revision: 1.14 $
  + * $Date: 2002/05/20 17:41:41 $
    *
    * ====================================================================
    * 
  @@ -72,7 +72,7 @@
   
   import org.apache.jasper.Constants;
   import org.apache.jasper.JasperException;
  -
  +import org.apache.jasper.logging.Logger;
   
   import org.w3c.dom.*;
   import javax.xml.parsers.DocumentBuilder;
  @@ -475,9 +475,9 @@
                return isrc;
            }
        }
  -     throw new SAXException(
  -         Constants.getString("jsp.error.parse.xml.invalidPublicId",
  -                             new Object[]{publicId}));
  +     Constants.message("jsp.error.parse.xml.invalidPublicId",
  +                             new Object[]{publicId}, Logger.ERROR);
  +        return null;
       }
   }
   
  
  
  
  1.5       +5 -4      
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/parser/ParserUtils.java
  
  Index: ParserUtils.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/parser/ParserUtils.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ParserUtils.java  17 Jul 2001 20:48:51 -0000      1.4
  +++ ParserUtils.java  20 May 2002 17:41:41 -0000      1.5
  @@ -73,6 +73,7 @@
   
   import org.apache.jasper.Constants;
   import org.apache.jasper.JasperException;
  +import org.apache.jasper.logging.Logger;
   
   import org.w3c.dom.Comment;
   import org.w3c.dom.Document;
  @@ -95,7 +96,7 @@
    * use a separate class loader for the parser to be used.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.4 $ $Date: 2001/07/17 20:48:51 $
  + * @version $Revision: 1.5 $ $Date: 2002/05/20 17:41:41 $
    */
   
   public class ParserUtils {
  @@ -418,9 +419,9 @@
                return isrc;
            }
        }
  -     throw new SAXException(
  -         Constants.getString("jsp.error.parse.xml.invalidPublicId",
  -                             new Object[]{publicId}));
  +     Constants.message("jsp.error.parse.xml.invalidPublicId",
  +                             new Object[]{publicId}, Logger.ERROR);
  +        return null;
       }
   }
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>