[patch] Patch to correct the putting/resetting of the JspContext ELContext attribute

patch.txt (text/plain), 1.44 KB, created by Karl von Randow on 2012-03-07 22:32:19 UTC

(hide)

Description: Patch to correct the putting/resetting of the JspContext ELContext attribute

Filename:

MIME Type:

Creator: Karl von Randow

Created: 2012-03-07 22:32:19 UTC

Size: 1.44 KB

patch

obsolete

>Index: java/org/apache/jasper/compiler/Generator.java >=================================================================== >--- java/org/apache/jasper/compiler/Generator.java (revision 1293935) >+++ java/org/apache/jasper/compiler/Generator.java (working copy) >@@ -2132,9 +2132,6 @@ > out.println(");"); > } > >- // Restore EL context >- out.printil("jspContext.getELContext().putContext(javax.servlet.jsp.JspContext.class,getJspContext());"); >- > n.setEndJavaLine(out.getJavaLine()); > } > >@@ -4219,6 +4216,7 @@ > out.printil("}"); > out.printil("try {"); > out.pushIndent(); >+ out.printil("Object _jspx_saved_JspContext = this.jspContext.getELContext().getContext(javax.servlet.jsp.JspContext.class);"); > out.printil("this.jspContext.getELContext().putContext(javax.servlet.jsp.JspContext.class,this.jspContext);"); > out.printil("switch( this.discriminator ) {"); > out.pushIndent(); >@@ -4231,6 +4229,10 @@ > } > out.popIndent(); > out.printil("}"); // switch >+ >+ // restore nested JspContext on ELContext >+ out.printil("jspContext.getELContext().putContext(javax.servlet.jsp.JspContext.class,_jspx_saved_JspContext);"); >+ > out.popIndent(); > out.printil("}"); // try > out.printil("catch( java.lang.Throwable e ) {"); View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]