Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50293

Increase default resolver array size. (Jasper adds 5 resolvers.)

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

diff --git a/java/javax/el/CompositeELResolver.java b/java/javax/el/CompositeELResolver.java
index e93b05e..34080be 100644 (file)
--- a/java/javax/el/CompositeELResolver.java
+++ b/java/javax/el/CompositeELResolver.java
@@ -29,7 +29,7 @@ public class CompositeELResolver extends ELResolver {
 
     public CompositeELResolver() {
         this.size = 0;
-        this.resolvers = new ELResolver[2];
+        this.resolvers = new ELResolver[8];
     }
 
     public void add(ELResolver elResolver) {

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8dc11d6..30edd47 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -197,6 +197,11 @@
         <bug>50192</bug>: Improve performance for EL when running under a
         security manager. Based on a patch by Robert Goff. (markt) 
       </fix>
+      <fix>
+        <bug>50293</bug>: Increase the size of internal ELResolver array from 2 
+        to 8 since in typical usage there are at least 5 resolvers. Based on a
+        patch by Robert Goff. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Cluster">