From 24de5cebcb55e1c0e91fd67ae0c12d8e9d023b85 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 12 Jan 2009 21:29:40 +0000
Subject: [PATCH] Revert r733072 after feedback from EG that original INVALID
 for https://issues.apache.org/bugzilla/show_bug.cgi?id=46339 was correct.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@733905 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/jasper/compiler/Generator.java     |  8 +++----
 .../apache/jasper/runtime/JspContextWrapper.java   | 25 ++--------------------
 2 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java
index 495981d50..8804f5e22 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -2032,6 +2032,9 @@ class Generator {
 
             n.setBeginJavaLine(out.getJavaLine());
 
+            // Copy virtual page scope of tag file to page scope of invoking
+            // page
+            out.printil("((org.apache.jasper.runtime.JspContextWrapper) this.jspContext).syncBeforeInvoke();");
             String varReaderAttr = n.getTextAttribute("varReader");
             String varAttr = n.getTextAttribute("var");
             if (varReaderAttr != null || varAttr != null) {
@@ -2045,11 +2048,6 @@ class Generator {
             out.print(toGetterMethod(n.getTextAttribute("fragment")));
             out.println(" != null) {");
             out.pushIndent();
-            // Copy virtual page scope of tag file to page scope of invoking
-            // page
-            out.printil("((org.apache.jasper.runtime.JspContextWrapper) this.jspContext).syncBeforeInvoke(");
-            out.print(toGetterMethod(n.getTextAttribute("fragment")));
-            out.println(".getJspContext());");
             out.printin(toGetterMethod(n.getTextAttribute("fragment")));
             out.println(".invoke(_jspx_sout);");
             out.popIndent();
diff --git a/java/org/apache/jasper/runtime/JspContextWrapper.java b/java/org/apache/jasper/runtime/JspContextWrapper.java
index b4e2f6ae1..11a3b2136 100644
--- a/java/org/apache/jasper/runtime/JspContextWrapper.java
+++ b/java/org/apache/jasper/runtime/JspContextWrapper.java
@@ -336,16 +336,6 @@ public class JspContextWrapper extends PageContext implements VariableResolver {
 	}
 
 	/**
-     * Synchronize variables before fragment invokation
-     * @param jspContext The JspContext the variable should sync to.  This
-     *        is usually the context of the page where the fragment is. 
-     */
-    public void syncBeforeInvoke(JspContext jspContext) {
-        copyTagToPageScope(VariableInfo.NESTED, (PageContext)jspContext);
-        copyTagToPageScope(VariableInfo.AT_BEGIN, (PageContext)jspContext);
-    }
-
-    /**
 	 * Synchronize variables at end of tag file
 	 */
 	public void syncEndTagFile() {
@@ -362,17 +352,6 @@ public class JspContextWrapper extends PageContext implements VariableResolver {
 	 *            variable scope (one of NESTED, AT_BEGIN, or AT_END)
 	 */
 	private void copyTagToPageScope(int scope) {
-        copyTagToPageScope(scope,  invokingJspCtxt);
-    }
-
-	/**
-     * Copies the variables of the given scope from the virtual page scope of
-     * this JSP context wrapper to the page scope of the specified JSP context.
-     *
-     * @param scope variable scope (one of NESTED, AT_BEGIN, or AT_END)
-     * @param jspContext the target context
-     */
-    private void copyTagToPageScope(int scope, PageContext jspContext) {
 		Iterator<String> iter = null;
 
 		switch (scope) {
@@ -398,9 +377,9 @@ public class JspContextWrapper extends PageContext implements VariableResolver {
 			Object obj = getAttribute(varName);
 			varName = findAlias(varName);
 			if (obj != null) {
-			    jspContext.setAttribute(varName, obj);
+				invokingJspCtxt.setAttribute(varName, obj);
 			} else {
-			    jspContext.removeAttribute(varName, PAGE_SCOPE);
+				invokingJspCtxt.removeAttribute(varName, PAGE_SCOPE);
 			}
 		}
 	}
-- 
2.11.0