luehe 2002/11/07 11:09:03
Modified: jasper2/src/share/org/apache/jasper/compiler Generator.java
Log:
Use 'this' qualifier to disambiguate jspContext instance
(e.g., required when invoking fragment from within simple tag).
Revision Changes Path
1.122 +11 -11
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.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- Generator.java 6 Nov 2002 22:49:07 -0000 1.121
+++ Generator.java 7 Nov 2002 19:09:03 -0000 1.122
@@ -1832,8 +1832,8 @@
// Copy virtual page scope of tag file to page scope of invoking
// page
- out.printil("((org.apache.jasper.runtime.JspContextWrapper)
jspContext).copyTagToPageScope(javax.servlet.jsp.tagext.VariableInfo.NESTED);");
- out.printil("((org.apache.jasper.runtime.JspContextWrapper)
jspContext).copyTagToPageScope(javax.servlet.jsp.tagext.VariableInfo.AT_BEGIN);");
+ out.printil("((org.apache.jasper.runtime.JspContextWrapper)
this.jspContext).copyTagToPageScope(javax.servlet.jsp.tagext.VariableInfo.NESTED);");
+ out.printil("((org.apache.jasper.runtime.JspContextWrapper)
this.jspContext).copyTagToPageScope(javax.servlet.jsp.tagext.VariableInfo.AT_BEGIN);");
// Invoke fragment
String varReaderAttr = n.getTextAttribute("varReader");
@@ -1852,8 +1852,8 @@
out.pushIndent();
// Copy page scope of invoking page back to virtual page scope of
// tag file
- out.printil("((org.apache.jasper.runtime.JspContextWrapper)
jspContext).copyPageToTagScope(javax.servlet.jsp.tagext.VariableInfo.NESTED);");
- out.printil("((org.apache.jasper.runtime.JspContextWrapper)
jspContext).copyPageToTagScope(javax.servlet.jsp.tagext.VariableInfo.AT_BEGIN);");
+ out.printil("((org.apache.jasper.runtime.JspContextWrapper)
this.jspContext).copyPageToTagScope(javax.servlet.jsp.tagext.VariableInfo.NESTED);");
+ out.printil("((org.apache.jasper.runtime.JspContextWrapper)
this.jspContext).copyPageToTagScope(javax.servlet.jsp.tagext.VariableInfo.AT_BEGIN);");
out.popIndent();
out.printil("}");
@@ -1880,8 +1880,8 @@
// Copy virtual page scope of tag file to page scope of invoking
// page
- out.printil("((org.apache.jasper.runtime.JspContextWrapper)
jspContext).copyTagToPageScope(javax.servlet.jsp.tagext.VariableInfo.NESTED);");
- out.printil("((org.apache.jasper.runtime.JspContextWrapper)
jspContext).copyTagToPageScope(javax.servlet.jsp.tagext.VariableInfo.AT_BEGIN);");
+ out.printil("((org.apache.jasper.runtime.JspContextWrapper)
this.jspContext).copyTagToPageScope(javax.servlet.jsp.tagext.VariableInfo.NESTED);");
+ out.printil("((org.apache.jasper.runtime.JspContextWrapper)
this.jspContext).copyTagToPageScope(javax.servlet.jsp.tagext.VariableInfo.AT_BEGIN);");
// Invoke body
String varReaderAttr = n.getTextAttribute("varReader");
@@ -1899,8 +1899,8 @@
out.pushIndent();
// Copy page scope of invoking page back to virtual page scope of
// tag file
- out.printil("((org.apache.jasper.runtime.JspContextWrapper)
jspContext).copyPageToTagScope(javax.servlet.jsp.tagext.VariableInfo.NESTED);");
- out.printil("((org.apache.jasper.runtime.JspContextWrapper)
jspContext).copyPageToTagScope(javax.servlet.jsp.tagext.VariableInfo.AT_BEGIN);");
+ out.printil("((org.apache.jasper.runtime.JspContextWrapper)
this.jspContext).copyPageToTagScope(javax.servlet.jsp.tagext.VariableInfo.NESTED);");
+ out.printil("((org.apache.jasper.runtime.JspContextWrapper)
this.jspContext).copyPageToTagScope(javax.servlet.jsp.tagext.VariableInfo.AT_BEGIN);");
out.popIndent();
out.printil("}");
--
To unsubscribe, e-mail: <mailto:tomcat-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@;jakarta.apache.org>
