luehe 2003/03/27 14:05:19
Modified: jasper2/src/share/org/apache/jasper/compiler JspConfig.java
Log:
Added fix so that JSP Configuration settings do not apply to tag files
Revision Changes Path
1.10 +13 -8
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspConfig.java
Index: JspConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspConfig.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JspConfig.java 5 Feb 2003 23:41:19 -0000 1.9
+++ JspConfig.java 27 Mar 2003 22:05:19 -0000 1.10
@@ -95,6 +95,7 @@
private String defaultIsXml = null; // unspecified
private String defaultIsELIgnored = null; // unspecified
private String defaultIsScriptingInvalid = "false";
+ private JspProperty defaultJspProperty;
public JspConfig(ServletContext ctxt) {
this.ctxt = ctxt;
@@ -216,13 +217,17 @@
if (!initialized) {
processWebDotXml(ctxt);
+ defaultJspProperty = new JspProperty(defaultIsXml,
+ defaultIsELIgnored,
+ defaultIsScriptingInvalid,
+ null, null, null);
initialized = true;
}
-
- if (jspProperties == null) {
- return new JspProperty(defaultIsXml, defaultIsELIgnored,
- defaultIsScriptingInvalid,
- null, null, null);
+
+ // JSP Configuration settings do not apply to tag files
+ if (jspProperties == null || uri.endsWith(".tag")
+ || uri.endsWith(".tagx")) {
+ return defaultJspProperty;
}
String uriPath = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
