From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 31 Dec 2009 13:51:33 +0000 (+0000)
Subject: A little more JSP 2.2 EL impl
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=773293a82670af08d59e4ba26a0b8468a61346f4;p=tomcat7.0

A little more JSP 2.2 EL impl

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

diff --git a/java/javax/el/CompositeELResolver.java b/java/javax/el/CompositeELResolver.java
index 5da448ca1..afb73c300 100644
--- a/java/javax/el/CompositeELResolver.java
+++ b/java/javax/el/CompositeELResolver.java
@@ -127,7 +127,16 @@ public class CompositeELResolver extends ELResolver {
     @Override
     public Object invoke(ELContext context, Object base, Object method,
             Class<?>[] paramTypes, Object[] params) {
-        // TODO 
+        context.setPropertyResolved(false);
+        int sz = this.size;
+        Object obj;
+        for (int i = 0; i < sz; i++) {
+            obj = this.resolvers[i].invoke(context, base, method, paramTypes,
+                    params);
+            if (context.isPropertyResolved()) {
+                return obj;
+            }
+        }
         return null;
     }