Author: remy.maucherat(a)jboss.com Date: 2009-01-13 09:52:23 -0500 (Tue, 13 Jan 2009) New Revision: 900 Modified: trunk/PATCHES.txt trunk/java/org/apache/jasper/compiler/Generator.java trunk/java/org/apache/jasper/runtime/JspContextWrapper.java trunk/webapps/docs/changelog.xml Log: - Revert Jasper patch. Modified: trunk/PATCHES.txt =================================================================== --- trunk/PATCHES.txt 2009-01-12 16:18:42 UTC (rev 899) +++ trunk/PATCHES.txt 2009-01-13 14:52:23 UTC (rev 900) @@ -40,3 +40,12 @@ various New JDBC pool module + +733748 +SSL session tracking (may not be practical at all) + +733768 733769 733775 +Generics in Servlet API (not accepted yet) + +733771 +Deprecate some wrapper methods in Servlet API (not accepted yet) Modified: trunk/java/org/apache/jasper/compiler/Generator.java =================================================================== --- trunk/java/org/apache/jasper/compiler/Generator.java 2009-01-12 16:18:42 UTC (rev 899) +++ trunk/java/org/apache/jasper/compiler/Generator.java 2009-01-13 14:52:23 UTC (rev 900) @@ -2050,6 +2050,9 @@ 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) { @@ -2063,11 +2066,6 @@ 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(); Modified: trunk/java/org/apache/jasper/runtime/JspContextWrapper.java =================================================================== --- trunk/java/org/apache/jasper/runtime/JspContextWrapper.java 2009-01-12 16:18:42 UTC (rev 899) +++ trunk/java/org/apache/jasper/runtime/JspContextWrapper.java 2009-01-13 14:52:23 UTC (rev 900) @@ -335,16 +335,6 @@ } /** - * 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() { @@ -361,17 +351,6 @@ * 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 iter = null; switch (scope) { @@ -397,9 +376,9 @@ 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); } } } Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2009-01-12 16:18:42 UTC (rev 899) +++ trunk/webapps/docs/changelog.xml 2009-01-13 14:52:23 UTC (rev 900) @@ -126,9 +126,6 @@ <bug>46471</bug>: Use jar url and tag file path to uniquely ID a tag file to prevent naming clashes. (markt) </fix> - <fix> - <bug>46339</bug>: Fix variable sync problems for fragments. Submitted by Kin-Man Chung. (markt) - </fix> </changelog> </subsection> </section>