Fix http://java.net/jira/browse/GLASSFISH-20092

Kin Man Chung · Kin Man Chung · commit e816bad39ce5 · 2013-04-01T23:33:11.000Z
Modify EL parsing to allow nested {} and lambda expression calls


svn path=/trunk/; revision=1445
diff --git a/impl/src/main/java/org/apache/jasper/compiler/ELFunctionMapper.java b/impl/src/main/java/org/apache/jasper/compiler/ELFunctionMapper.java
@@ -193,6 +193,10 @@ class Fvisitor extends ELNode.Visitor {
                         new ArrayList<ELNode.Function>();
 		Set<String> keys = new HashSet<String>();
 		public void visit(ELNode.Function n) throws JasperException {
+                    if (n.getUri() == null) {
+                        // Can be a lambda expresion call
+                        return;
+                    }
 		    String key = n.getPrefix() + ":" + n.getName();
 		    if (! keys.contains(key)) {
 			keys.add(key);
diff --git a/impl/src/main/java/org/apache/jasper/compiler/Parser.java b/impl/src/main/java/org/apache/jasper/compiler/Parser.java
@@ -864,6 +864,7 @@ private void parseELExpression(Node parent, String typeEL)
             throws JasperException {
         start = reader.mark();
         boolean singleQuoted = false, doubleQuoted = false;
+        int curl = 0;
         int currentChar;
         do {
             // XXX could move this logic to JspReader
@@ -877,9 +878,13 @@ private void parseELExpression(Node parent, String typeEL)
                 err.jspError(start, "jsp.error.unterminated", typeEL);
             if (currentChar == '"')
                 doubleQuoted = !doubleQuoted;
-            if (currentChar == '\'')
+            else if (currentChar == '\'')
                 singleQuoted = !singleQuoted;
-        } while (currentChar != '}' || (singleQuoted || doubleQuoted));
+            else if (currentChar == '{')
+                curl++;
+            else if (currentChar == '}')
+                curl--;
+        } while (currentChar != '}' || curl >= 0 || singleQuoted || doubleQuoted);
 
         String text = typeEL + reader.getText(start, reader.mark());
         new Node.ELExpression(text, start, parent);
diff --git a/impl/src/main/java/org/apache/jasper/compiler/Validator.java b/impl/src/main/java/org/apache/jasper/compiler/Validator.java
@@ -1596,8 +1596,12 @@ public void visit(ELNode.Function func) throws JasperException {
 
 		    if (uri == null) {
 			if (prefix == null) {
+                            // in EL 3.0, this can be a lambda expression call.
+                            return;
+                            /*
 			    err.jspError(n, "jsp.error.noFunctionPrefix",
 				function);
+                            */
 			}
 			else {
 			    err.jspError(n,
@@ -1720,6 +1724,10 @@ class MapperELVisitor extends ELNode.Visitor {
 
 		public void visit(ELNode.Function n) throws JasperException {
 
+                    if (n.getUri() == null) {
+                        // Can be a lambda expression call
+                        return;
+                    }
 		    Class<?> c = null;
 		    Method method = null;
 		    try {
