geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1392710 - /geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/el/JasperELResolver.java
Date Tue, 02 Oct 2012 01:34:38 GMT
Author: gawor
Date: Tue Oct  2 01:34:37 2012
New Revision: 1392710

URL: http://svn.apache.org/viewvc?rev=1392710&view=rev
Log:
Additional fix for Japser EL Resolver optimization - https://issues.apache.org/bugzilla/show_bug.cgi?id=53896

Modified:
    geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/el/JasperELResolver.java

Modified: geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/el/JasperELResolver.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/el/JasperELResolver.java?rev=1392710&r1=1392709&r2=1392710&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/el/JasperELResolver.java
(original)
+++ geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/el/JasperELResolver.java
Tue Oct  2 01:34:37 2012
@@ -45,20 +45,19 @@ public class JasperELResolver extends Co
 
     public JasperELResolver(List<ELResolver> appResolvers) { 
         appResolversSize = appResolvers.size();
-        resolvers = new ELResolver[7 /* 7 standard EL resolvers */ + appResolversSize];
-        size = resolvers.length;
-        
-        int index = 0;
-        resolvers[index++] = new ImplicitObjectELResolver();
+	resolvers = new ELResolver[0];
+	size = resolvers.length;
+
+        add(new ImplicitObjectELResolver());
         for (ELResolver appResolver : appResolvers) {
-            resolvers[index++] = appResolver;
+            add(appResolver);
         }
-        resolvers[index++] = new MapELResolver();
-        resolvers[index++] = new ResourceBundleELResolver();
-        resolvers[index++] = new ListELResolver();
-        resolvers[index++] = new ArrayELResolver();    
-        resolvers[index++] = new BeanELResolver();
-        resolvers[index++] = new ScopedAttributeELResolver();
+        add(new MapELResolver());
+        add(new ResourceBundleELResolver());
+        add(new ListELResolver());
+        add(new ArrayELResolver());
+        add(new BeanELResolver());
+        add(new ScopedAttributeELResolver());
     }
 
     @Override
@@ -139,5 +138,5 @@ public class JasperELResolver extends Co
         
         return null;
     }
-    
+
 }



Mime
View raw message