kinman 02/05/20 11:02:56
Modified: jasper2/src/share/org/apache/jasper/compiler JspUtil.java
jasper2/src/share/org/apache/jasper/xmlparser
ParserUtils.java
Log:
- Fixed 8565. resolveEntity returns null instead of throwing an exception
Revision Changes Path
1.3 +7 -7
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspUtil.java
Index: JspUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspUtil.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JspUtil.java 26 Apr 2002 20:52:05 -0000 1.2
+++ JspUtil.java 20 May 2002 18:02:56 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspUtil.java,v
1.2 2002/04/26 20:52:05 remm Exp $
- * $Revision: 1.2 $
- * $Date: 2002/04/26 20:52:05 $
+ * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspUtil.java,v
1.3 2002/05/20 18:02:56 kinman Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/05/20 18:02:56 $
*
* ====================================================================
*
@@ -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;
@@ -469,9 +469,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.2 +5 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser/ParserUtils.java
Index: ParserUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser/ParserUtils.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ParserUtils.java 28 Mar 2002 18:46:20 -0000 1.1
+++ ParserUtils.java 20 May 2002 18:02:56 -0000 1.2
@@ -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.1 $ $Date: 2002/03/28 18:46:20 $
+ * @version $Revision: 1.2 $ $Date: 2002/05/20 18:02:56 $
*/
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]>
