From 773293a82670af08d59e4ba26a0b8468a61346f4 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 31 Dec 2009 13:51:33 +0000
Subject: [PATCH] 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
---
 java/javax/el/CompositeELResolver.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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;
     }
 
-- 
2.11.0