Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48616, a regression caused...

The requirement for variable declaration also depends on whether or not a fragment helper has been used for the parent tag (if any). Where such a helper has been used, the variables must be redefined.
Test cases for both bugs and the JSP TCK pass with this patch applied.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@905145 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java
index 8da493e..84958b6 100644 (file)
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -167,6 +167,26 @@ class Generator {
         return b.toString();
     }
 
+    /**
+     * Finds the <jsp:body> subelement of the given parent node. If not
+     * found, null is returned.
+     */
+    protected static Node.JspBody findJspBody(Node parent) {
+        Node.JspBody result = null;
+
+        Node.Nodes subelements = parent.getBody();
+        for (int i = 0; (subelements != null) && (i < subelements.size()); i++) {
+            Node n = subelements.getNode(i);
+            if (n instanceof Node.JspBody) {
+                result = (Node.JspBody) n;
+                break;
+            }
+        }
+
+        return result;
+    }
+
+
     private String createJspId() {
         if (this.jspIdPrefix == null) {
             StringBuilder sb = new StringBuilder(32);
@@ -971,25 +991,6 @@ class Generator {
             }
         }
 
-        /**
-         * Finds the <jsp:body> subelement of the given parent node. If not
-         * found, null is returned.
-         */
-        private Node.JspBody findJspBody(Node parent) {
-            Node.JspBody result = null;
-
-            Node.Nodes subelements = parent.getBody();
-            for (int i = 0; (subelements != null) && (i < subelements.size()); i++) {
-                Node n = subelements.getNode(i);
-                if (n instanceof Node.JspBody) {
-                    result = (Node.JspBody) n;
-                    break;
-                }
-            }
-
-            return result;
-        }
-
         @Override
         public void visit(Node.ForwardAction n) throws JasperException {
             Node.JspAttribute page = n.getPage();

diff --git a/java/org/apache/jasper/compiler/ScriptingVariabler.java b/java/org/apache/jasper/compiler/ScriptingVariabler.java
index 9323d18..b703ac9 100644 (file)
--- a/java/org/apache/jasper/compiler/ScriptingVariabler.java
+++ b/java/org/apache/jasper/compiler/ScriptingVariabler.java
@@ -70,7 +70,7 @@ class ScriptingVariabler {
         public void visit(Node.CustomTag n) throws JasperException {
             setScriptingVars(n, VariableInfo.AT_BEGIN);
             setScriptingVars(n, VariableInfo.NESTED);
-            new ScriptingVariableVisitor(err).visitBody(n);
+            visitBody(n);
             setScriptingVars(n, VariableInfo.AT_END);
         }
 
@@ -86,9 +86,9 @@ class ScriptingVariabler {
             Vector<Object> vec = new Vector<Object>();
 
             Integer ownRange = null;
+            Node.CustomTag parent = n.getCustomTagParent();
             if (scope == VariableInfo.AT_BEGIN
                     || scope == VariableInfo.AT_END) {
-                Node.CustomTag parent = n.getCustomTagParent();
                 if (parent == null)
                     ownRange = MAX_SCOPE;
                 else
@@ -107,8 +107,11 @@ class ScriptingVariabler {
                     String varName = varInfos[i].getVarName();
                     
                     Integer currentRange = scriptVars.get(varName);
-                    if (currentRange == null
-                            || ownRange.compareTo(currentRange) > 0) {
+                    // If a fragment helper has been used for the parent tag
+                    // the scripting variables always need to be declared
+                    if (currentRange == null ||
+                            ownRange.compareTo(currentRange) > 0 ||
+                            parent != null && isImplemetedAsFragment(parent)) {
                         scriptVars.put(varName, ownRange);
                         vec.add(varInfos[i]);
                     }
@@ -131,8 +134,11 @@ class ScriptingVariabler {
                     }
 
                     Integer currentRange = scriptVars.get(varName);
-                    if (currentRange == null
-                            || ownRange.compareTo(currentRange) > 0) {
+                    // If a fragment helper has been used for the parent tag
+                    // the scripting variables always need to be declared
+                    if (currentRange == null ||
+                            ownRange.compareTo(currentRange) > 0 ||
+                            parent != null && isImplemetedAsFragment(parent)) {
                         scriptVars.put(varName, ownRange);
                         vec.add(tagVarInfos[i]);
                     }
@@ -143,6 +149,22 @@ class ScriptingVariabler {
         }
     }
 
+    private static boolean isImplemetedAsFragment(Node.CustomTag n) {
+        // Replicates logic from Generator to determine if a fragment
+        // helper will be used
+        if (n.implementsSimpleTag()) {
+            if (Generator.findJspBody(n) == null) {
+                if (!n.hasEmptyBody()) {
+                    return true;
+                }
+                return false;
+            }
+            return true;
+        }
+        return false;
+    }
+
+    
     public static void set(Node.Nodes page, ErrorDispatcher err)
             throws JasperException {
         page.visit(new CustomTagCounter());