You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by lu...@apache.org on 2003/02/07 20:19:26 UTC
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Compiler.java
luehe 2003/02/07 11:19:26
Modified: jasper2/src/share/org/apache/jasper/compiler Compiler.java
Log:
fixed cause of NPE in JspDocumentParser
Revision Changes Path
1.50 +17 -15 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java
Index: Compiler.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- Compiler.java 30 Jan 2003 20:13:56 -0000 1.49
+++ Compiler.java 7 Feb 2003 19:19:25 -0000 1.50
@@ -199,24 +199,26 @@
JspConfig jspConfig = options.getJspConfig();
JspConfig.JspProperty jspProperty =
jspConfig.findJspProperty(ctxt.getJspFile());
- if (jspProperty != null) {
- // If the current uri is matched by a pattern specified in
- // a jsp-property-group in web.xml, initialize pageInfo with
- // those properties.
- if (jspProperty.isXml() != null) {
- pageInfo.setIsXmlSpecified(true);
- }
- if (jspProperty.isELIgnored() != null) {
- pageInfo.setELIgnoredSpecified(true);
- }
- pageInfo.setIsXml(JspUtil.booleanValue(jspProperty.isXml()));
- pageInfo.setPageEncoding(jspProperty.getPageEncoding());
- pageInfo.setELIgnored(JspUtil.booleanValue(jspProperty.isELIgnored()));
- pageInfo.setScriptingInvalid(JspUtil.booleanValue(jspProperty.isScriptingInvalid()));
+
+ // If the current uri is matched by a pattern specified in
+ // a jsp-property-group in web.xml, initialize pageInfo with
+ // those properties.
+ if (jspProperty.isXml() != null) {
+ pageInfo.setIsXmlSpecified(true);
+ }
+ if (jspProperty.isELIgnored() != null) {
+ pageInfo.setELIgnoredSpecified(true);
+ }
+ pageInfo.setIsXml(JspUtil.booleanValue(jspProperty.isXml()));
+ pageInfo.setPageEncoding(jspProperty.getPageEncoding());
+ pageInfo.setELIgnored(JspUtil.booleanValue(jspProperty.isELIgnored()));
+ pageInfo.setScriptingInvalid(JspUtil.booleanValue(jspProperty.isScriptingInvalid()));
+ if (jspProperty.getIncludePrelude() != null) {
pageInfo.setIncludePrelude(jspProperty.getIncludePrelude());
+ }
+ if (jspProperty.getIncludeCoda() != null) {
pageInfo.setIncludeCoda(jspProperty.getIncludeCoda());
}
-
String javaFileName = ctxt.getServletJavaFileName();
// Setup the ServletWriter
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org