2017-01-06 18:50 GMT+02:00 <r...@apache.org>: > > Author: remm > Date: Fri Jan 6 16:50:50 2017 > New Revision: 1777647 > > URL: http://svn.apache.org/viewvc?rev=1777647&view=rev > Log: > Revert try/finally for simple tags.
I just succeeded to extract a test case. Can you look at the patch below and give me your feedback? Index: java/org/apache/jasper/compiler/Generator.java =================================================================== --- java/org/apache/jasper/compiler/Generator.java (revision 1777614) +++ java/org/apache/jasper/compiler/Generator.java (working copy) @@ -2655,6 +2655,8 @@ // Declare AT_BEGIN scripting variables declareScriptingVars(n, VariableInfo.AT_BEGIN); saveScriptingVars(n, VariableInfo.AT_BEGIN); + // Declare AT_END scripting variables + declareScriptingVars(n, VariableInfo.AT_END); String tagHandlerClassName = tagHandlerClass.getCanonicalName(); writeNewInstance(tagHandlerVar, tagHandlerClassName); @@ -2709,8 +2711,7 @@ // Synchronize AT_BEGIN scripting variables syncScriptingVars(n, VariableInfo.AT_BEGIN); - // Declare and synchronize AT_END scripting variables - declareScriptingVars(n, VariableInfo.AT_END); + // Synchronize AT_END scripting variables syncScriptingVars(n, VariableInfo.AT_END); out.popIndent(); Index: test/webapp/bug48nnn/bug48616b.jsp =================================================================== --- test/webapp/bug48nnn/bug48616b.jsp (revision 1777614) +++ test/webapp/bug48nnn/bug48616b.jsp (working copy) @@ -26,3 +26,6 @@ <bugs:Bug48616b /> </bugs:Bug46816a> </tags:bug42390> +<% + out.println(X); +%> \ No newline at end of file Index: test/webapp/WEB-INF/tags/bug42390.tag =================================================================== --- test/webapp/WEB-INF/tags/bug42390.tag (revision 1777614) +++ test/webapp/WEB-INF/tags/bug42390.tag (working copy) @@ -14,5 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. --%> -<%@ variable name-given="X" scope="AT_BEGIN" %> +<%@ variable name-given="X" scope="AT_END" %> <jsp:doBody/> \ No newline at end of file