From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 13 Jan 2010 17:53:36 +0000 (+0000)
Subject: If the method is found, mark the property as resolved
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=f45243537613fa5de9d988e3c08712c5eb28f8b7;p=tomcat7.0

If the method is found, mark the property as resolved

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

diff --git a/java/javax/el/BeanELResolver.java b/java/javax/el/BeanELResolver.java
index f4524f34b..729633d6e 100644
--- a/java/javax/el/BeanELResolver.java
+++ b/java/javax/el/BeanELResolver.java
@@ -429,8 +429,9 @@ public class BeanELResolver extends ELResolver {
     	        }
 	        }
 	    }
+	    Object result = null;
 	    try {
-            return matchingMethod.invoke(base, parameters);
+	        result = matchingMethod.invoke(base, parameters);
         } catch (IllegalArgumentException e) {
             throw new ELException(e);
         } catch (IllegalAccessException e) {
@@ -439,6 +440,8 @@ public class BeanELResolver extends ELResolver {
             throw new ELException(e.getCause());
         }
 	    
+        context.setPropertyResolved(true);
+        return result;
     }
 
 }