luehe 2003/03/07 16:58:09
Modified: jasper2/src/share/org/apache/jasper/compiler Generator.java
jasper2/src/share/org/apache/jasper/runtime
JspContextWrapper.java
Log:
Removed "page --> tag" synchronization points, as agreed by JSR-152-EG
Revision Changes Path
1.173 +3 -23
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.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- Generator.java 6 Mar 2003 17:49:45 -0000 1.172
+++ Generator.java 8 Mar 2003 00:58:09 -0000 1.173
@@ -1822,18 +1822,8 @@
} else {
out.printil("_jspx_sout = null;");
}
- out.printil("try {");
- out.pushIndent();
out.printin(toGetterMethod(n.getTextAttribute("fragment")));
out.println(".invoke(_jspx_sout);");
- out.popIndent();
- out.printil( "} finally {" );
- out.pushIndent();
- // Copy page scope of invoking page back to virtual page scope of
- // tag file
- out.printil("((org.apache.jasper.runtime.JspContextWrapper)
this.jspContext).syncAfterInvoke();");
- out.popIndent();
- out.printil("}");
// Store varReader in appropriate scope
if (varReaderAttr != null || varAttr != null) {
@@ -1868,20 +1858,10 @@
} else {
out.printil("_jspx_sout = null;");
}
- out.printil("try {");
- out.pushIndent();
out.printil("if (getJspBody() != null)");
out.pushIndent();
out.printil("getJspBody().invoke(_jspx_sout);");
out.popIndent();
- out.popIndent();
- out.printil( "} finally {" );
- out.pushIndent();
- // Copy page scope of invoking page back to virtual page scope of
- // tag file
- out.printil("((org.apache.jasper.runtime.JspContextWrapper)
this.jspContext).syncAfterInvoke();");
- out.popIndent();
- out.printil("}");
// Store varReader in appropriate scope
if (varReaderAttr != null || varAttr != null) {
1.18 +3 -48
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspContextWrapper.java
Index: JspContextWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspContextWrapper.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JspContextWrapper.java 15 Feb 2003 00:24:22 -0000 1.17
+++ JspContextWrapper.java 8 Mar 2003 00:58:09 -0000 1.18
@@ -383,7 +383,6 @@
* Synchronize variables at begin of tag file
*/
public void syncBeginTagFile() {
- copyPageToTagScope(VariableInfo.AT_BEGIN);
saveNestedVariables();
}
@@ -396,56 +395,12 @@
}
/**
- * Synchronize variables after fragment invokation
- */
- public void syncAfterInvoke() {
- copyPageToTagScope(VariableInfo.NESTED);
- copyPageToTagScope(VariableInfo.AT_BEGIN);
- }
-
- /**
* Synchronize variables at end of tag file
*/
public void syncEndTagFile() {
copyTagToPageScope(VariableInfo.AT_BEGIN);
copyTagToPageScope(VariableInfo.AT_END);
restoreNestedVariables();
- }
-
-
-
- /**
- * Copies the variables of the given scope from the page scope of the
- * invoking JSP context to the virtual page scope of this JSP context
- * wrapper.
- *
- * @param scope variable scope (one of NESTED or AT_BEGIN)
- */
- private void copyPageToTagScope(int scope) {
- Iterator iter = null;
-
- switch (scope) {
- case VariableInfo.NESTED:
- if (nestedVars != null) {
- iter = nestedVars.iterator();
- }
- break;
- case VariableInfo.AT_BEGIN:
- if (atBeginVars != null) {
- iter = atBeginVars.iterator();
- }
- break;
- }
-
- while ((iter != null) && iter.hasNext()) {
- String varName = (String) iter.next();
- String aliasName = findAlias(varName);
-
- Object obj = invokingJspCtxt.getAttribute(aliasName);
- if (obj != null) {
- setAttribute(varName, obj);
- }
- }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
