svn commit: r209942 - /myfaces/impl/trunk/src/java/org/apache/myfaces/el/PropertyResolverImpl.java

[mm...@apache.org]

Author: mmarinschek
Date: Sat Jul  9 06:37:37 2005
New Revision: 209942

URL: http://svn.apache.org/viewcvs?rev=209942&view=rev
Log:
fixing MyFaces-315, thanks to Duffy Gillman

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

Modified: myfaces/impl/trunk/src/java/org/apache/myfaces/el/PropertyResolverImpl.java
URL: http://svn.apache.org/viewcvs/myfaces/impl/trunk/src/java/org/apache/myfaces/el/PropertyResolverImpl.java?rev=209942&r1=209941&r2=209942&view=diff
==============================================================================
--- myfaces/impl/trunk/src/java/org/apache/myfaces/el/PropertyResolverImpl.java (original)
+++ myfaces/impl/trunk/src/java/org/apache/myfaces/el/PropertyResolverImpl.java Sat Jul  9 06:37:37 2005
@@ -54,15 +54,18 @@
     {
         try
         {
-            if (base == null || property == null ||
-                property instanceof String && ((String)property).length() == 0)
-            {
-                return null;
-            }
-            if (base instanceof Map)
-            {
-                return ((Map) base).get(property);
-            }
+           //fix for myfaces-315 - empty string as key to a map-value is allowed
+           //thanks to duffy gillman
+           if (base == null || property == null ||
+               (property instanceof String && ((String)property).length() == 0 &&
+                !(base instanceof Map)))
+           {
+               return null;
+           }
+           if (base instanceof Map)
+           {
+               return ((Map) base).get(property);
+           }
 
             // If none of the special bean types, then process as normal Bean
             return getProperty(base, property.toString());