Fix a regression in the TLD whitespace parsing fix that broke parsing…

… when whitespace was present between the method name and the opening '(' of the parameters. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1841757 13f79535-47bb-0310-9956-ffa450edef68
apache · Sep 23, 2018 · a0ec446 · a0ec446
1 parent 9e7e68f
commit a0ec446
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/java/org/apache/jasper/compiler/Validator.java b/java/org/apache/jasper/compiler/Validator.java
@@ -423,7 +423,7 @@ private void compareTagEncodings(String thePageDirEnc,
     private static class ValidateVisitor extends Node.Visitor {
 
         // Pattern to extract a method name from a full method signature
-        private static final Pattern METHOD_NAME_PATTERN = Pattern.compile(".*[ \t\n\r]+(.+)[ \t\n\r]*\\(.*");
+        private static final Pattern METHOD_NAME_PATTERN = Pattern.compile(".*[ \t\n\r]+(.+?)[ \t\n\r]*\\(.*");
 
         private final PageInfo pageInfo;
 

diff --git a/test/org/apache/el/TestELInJsp.java b/test/org/apache/el/TestELInJsp.java
@@ -507,6 +507,7 @@ public void testBug60431() throws Exception {
         String result = res.toString();
         assertEcho(result, "01-OK");
         assertEcho(result, "02-OK");
+        assertEcho(result, "03-OK");
     }
 
 

diff --git a/test/webapp/WEB-INF/test.tld b/test/webapp/WEB-INF/test.tld
@@ -48,4 +48,14 @@
     </function-signature>
   </function>
 
+  <function>
+    <name>toArrayB</name>
+    <function-class>org.apache.el.TesterFunctions</function-class>
+    <!-- Do not change whitespace in signature below.
+         It used to test for correctness in o.a.jasper.compiler.Validator. -->
+    <function-signature>
+      java.lang.String toArray (java.lang.String,java.lang.String)
+    </function-signature>
+  </function>
+
 </taglib>
diff --git a/test/webapp/bug6nnnn/bug60431.jsp b/test/webapp/bug6nnnn/bug60431.jsp
@@ -21,5 +21,6 @@
   <body>
     <tags:echo echo="${'01-' += fn:concat('O', 'K')}"/>
     <tags:echo echo="${'02-' += fn:concat(fn:toArray('O', 'K'))}"/>
+    <tags:echo echo="${'03-' += fn:concat(fn:toArrayB('O', 'K'))}"/>
   </body>
 </html>