[patch] 2010-02-16_tc55_bug42390_bug48616.patch

2010-02-16_tc55_bug42390_bug48616.patch (text/plain), 3.18 KB, created by Konstantin Kolinko on 2010-02-16 04:14:49 UTC

(hide)

Description: 2010-02-16_tc55_bug42390_bug48616.patch

Filename:

MIME Type:

Creator: Konstantin Kolinko

Created: 2010-02-16 04:14:49 UTC

Size: 3.18 KB

patch

obsolete

>Index: jasper/src/share/org/apache/jasper/compiler/Generator.java >=================================================================== >--- jasper/src/share/org/apache/jasper/compiler/Generator.java (revision 910047) >+++ jasper/src/share/org/apache/jasper/compiler/Generator.java (working copy) >@@ -301,6 +301,9 @@ > } > > public void visit(Node.CustomTag n) throws JasperException { >+ // XXX - Actually there is no need to declare those >+ // "_jspx_" + varName + "_" + nestingLevel variables when we are >+ // inside a JspFragment. > > if (n.getCustomNestingLevel() > 0) { > TagVariableInfo[] tagVarInfos = n.getTagVariableInfos(); >@@ -2466,6 +2469,11 @@ > } > > private void declareScriptingVars(Node.CustomTag n, int scope) { >+ if (isFragment) { >+ // No need to declare Java variables, if we inside a >+ // JspFragment, because a fragment is always scriptless. >+ return; >+ } > > Vector vec = n.getScriptingVars(scope); > if (vec != null) { >@@ -2515,6 +2523,14 @@ > if (n.getCustomNestingLevel() == 0) { > return; > } >+ if (isFragment) { >+ // No need to declare Java variables, if we inside a >+ // JspFragment, because a fragment is always scriptless. >+ // Thus, there is no need to save/ restore/ sync them. >+ // Note, that JspContextWrapper.syncFoo() methods will take >+ // care of saving/ restoring/ sync'ing of JspContext attributes. >+ return; >+ } > > TagVariableInfo[] tagVarInfos = n.getTagVariableInfos(); > VariableInfo[] varInfos = n.getVariableInfos(); >@@ -2576,6 +2592,14 @@ > if (n.getCustomNestingLevel() == 0) { > return; > } >+ if (isFragment) { >+ // No need to declare Java variables, if we inside a >+ // JspFragment, because a fragment is always scriptless. >+ // Thus, there is no need to save/ restore/ sync them. >+ // Note, that JspContextWrapper.syncFoo() methods will take >+ // care of saving/ restoring/ sync'ing of JspContext attributes. >+ return; >+ } > > TagVariableInfo[] tagVarInfos = n.getTagVariableInfos(); > VariableInfo[] varInfos = n.getVariableInfos(); >@@ -2631,6 +2655,15 @@ > * the given scope. > */ > private void syncScriptingVars(Node.CustomTag n, int scope) { >+ if (isFragment) { >+ // No need to declare Java variables, if we inside a >+ // JspFragment, because a fragment is always scriptless. >+ // Thus, there is no need to save/ restore/ sync them. >+ // Note, that JspContextWrapper.syncFoo() methods will take >+ // care of saving/ restoring/ sync'ing of JspContext attributes. >+ return; >+ } >+ > TagVariableInfo[] tagVarInfos = n.getTagVariableInfos(); > VariableInfo[] varInfos = n.getVariableInfos(); > 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]