You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ki...@apache.org on 2003/05/07 04:05:59 UTC
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Collector.java Generator.java Node.java
kinman 2003/05/06 19:05:59
Modified: jasper2/src/share/org/apache/jasper/compiler Collector.java
Generator.java Node.java
Log:
- Fix 19713. Define "request" the out of line method when there is
a <jsp:param> in the body of a custom tag.
Revision Changes Path
1.11 +8 -2 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Collector.java
Index: Collector.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Collector.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Collector.java 1 May 2003 02:35:20 -0000 1.10
+++ Collector.java 7 May 2003 02:05:58 -0000 1.11
@@ -85,6 +85,7 @@
private boolean scriptingElementSeen = false;
private boolean usebeanSeen = false;
private boolean includeActionSeen = false;
+ private boolean paramActionSeen = false;
private boolean setPropertySeen = false;
private boolean hasScriptingVars = false;
private boolean tagFileSeen = false;
@@ -93,6 +94,7 @@
if (n.getValue().isExpression()) {
scriptingElementSeen = true;
}
+ paramActionSeen = true;
}
public void visit(Node.IncludeAction n) throws JasperException {
@@ -167,6 +169,8 @@
usebeanSeen = false;
boolean includeActionSeenSave = includeActionSeen;
includeActionSeen = false;
+ boolean paramActionSeenSave = paramActionSeen;
+ paramActionSeen = false;
boolean setPropertySeenSave = setPropertySeen;
setPropertySeen = false;
boolean hasScriptingVarsSave = hasScriptingVars;
@@ -196,6 +200,7 @@
ci.setScriptless(! scriptingElementSeen);
ci.setHasUseBean(usebeanSeen);
ci.setHasIncludeAction(includeActionSeen);
+ ci.setHasParamAction(paramActionSeen);
ci.setHasSetProperty(setPropertySeen);
ci.setHasScriptingVars(hasScriptingVars);
@@ -204,6 +209,7 @@
usebeanSeen = usebeanSeen || usebeanSeenSave;
setPropertySeen = setPropertySeen || setPropertySeenSave;
includeActionSeen = includeActionSeen || includeActionSeenSave;
+ paramActionSeen = paramActionSeen || paramActionSeenSave;
hasScriptingVars = hasScriptingVars || hasScriptingVarsSave;
}
1.186 +5 -4 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
Index: Generator.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- Generator.java 1 May 2003 16:42:12 -0000 1.185
+++ Generator.java 7 May 2003 02:05:58 -0000 1.186
@@ -2785,7 +2785,8 @@
out.printil("HttpSession session = pageContext.getSession();");
out.printil("ServletContext application = pageContext.getServletContext();");
}
- if (ci.hasUseBean() || ci.hasIncludeAction() || ci.hasSetProperty()) {
+ if (ci.hasUseBean() || ci.hasIncludeAction() || ci.hasSetProperty() ||
+ ci.hasParamAction()) {
out.printil("HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();");
}
if (ci.hasIncludeAction()) {
1.72 +12 -3 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Node.java
Index: Node.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Node.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- Node.java 9 Apr 2003 00:47:15 -0000 1.71
+++ Node.java 7 May 2003 02:05:58 -0000 1.72
@@ -1166,6 +1166,7 @@
// contain no scripting elements.
private boolean hasUseBean;
private boolean hasIncludeAction;
+ private boolean hasParamAction;
private boolean hasSetProperty;
private boolean hasScriptingVars;
@@ -1191,6 +1192,14 @@
public boolean hasIncludeAction() {
return hasIncludeAction;
+ }
+
+ public void setHasParamAction(boolean i) {
+ hasParamAction = i;
+ }
+
+ public boolean hasParamAction() {
+ return hasParamAction;
}
public void setHasSetProperty(boolean s) {
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org