You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@myfaces.apache.org by lu...@apache.org on 2009/11/20 02:33:12 UTC

svn commit: r882381 - /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/PropertyResolverImpl.java

Author: lu4242
Date: Fri Nov 20 01:33:11 2009
New Revision: 882381

URL: http://svn.apache.org/viewvc?rev=882381&view=rev
Log:
PropertyResolver should return null when base or property is null, without invoke ELResolver

Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/PropertyResolverImpl.java

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/PropertyResolverImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/PropertyResolverImpl.java?rev=882381&r1=882380&r2=882381&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/PropertyResolverImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/PropertyResolverImpl.java Fri Nov 20 01:33:11 2009
@@ -43,6 +43,14 @@
     public Object getValue(final Object base, final Object property) throws EvaluationException,
         PropertyNotFoundException
     {
+        if (base == null)
+        {
+            return null;
+        }
+        if (property == null)
+        {
+            return null;
+        }
         return invokeResolver(new ResolverInvoker<Object>(base, property)
         {
             @Override