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 2013/08/16 01:01:09 UTC
svn commit: r1514529 -
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/CompositeComponentELResolver.java
Author: lu4242
Date: Thu Aug 15 23:01:09 2013
New Revision: 1514529
URL: http://svn.apache.org/r1514529
Log:
MYFACES-3753 CompositeComponentELResolver map containsKey() should take into account default values
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/CompositeComponentELResolver.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/CompositeComponentELResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/CompositeComponentELResolver.java?rev=1514529&r1=1514528&r2=1514529&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/CompositeComponentELResolver.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/CompositeComponentELResolver.java Thu Aug 15 23:01:09 2013
@@ -302,7 +302,33 @@ public final class CompositeComponentELR
public boolean containsKey(Object key)
{
- return _originalMap.containsKey(key);
+ boolean value = _originalMap.containsKey(key);
+ if (value)
+ {
+ return value;
+ }
+ else
+ {
+ if (_ccBeanInfo == null)
+ {
+ for (PropertyDescriptor attribute : _propertyDescriptors)
+ {
+ if (attribute.getName().equals(key))
+ {
+ return attribute.getValue("default") != null;
+ }
+ }
+ }
+ else
+ {
+ PropertyDescriptor attribute = _ccBeanInfo.getPropertyDescriptorsMap().get(key);
+ if (attribute != null)
+ {
+ return attribute.getValue("default") != null;
+ }
+ }
+ }
+ return false;
}
public boolean containsValue(Object value)