commit 5121114bc02ce4e6f4661b38b272e1e25f7600b1
author Leonardo Uribe <lu4242@apache.org> Fri Oct 19 16:20:16 2012 +0000
committer Leonardo Uribe <lu4242@apache.org> Fri Oct 19 16:20:16 2012 +0000
tree fb5d4aab5cda8d712ca7c741f1165526fafe88bf
parent 31c3670210be7d21d40b2944a52b9ce804bf0cf0

MYFACES-3632 resource bundle name with bean property collition when trying to set value 

impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceBundleResolver.java

diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceBundleResolver.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceBundleResolver.java
index a4a883f..87b2bb5 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceBundleResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceBundleResolver.java
@@ -55,13 +55,29 @@
     public void setValue(final ELContext context, final Object base, final Object property, final Object value)
         throws NullPointerException, PropertyNotFoundException, PropertyNotWritableException, ELException
     {
+        // JSF 1.2 spec section 5.6.1.3
+        // "... If base is null and property is a String equal to the value of the
+        // <var> element of one of the <resource-bundle>'s in the application 
+        // configuration resources throw javax.el.PropertyNotWriteable, since
+        // ResourceBundles are read-only. ..."
+        // Since something is done only when base is null, it is better to check 
+        // for not null and return.
+        if (base != null)
+        {
+            return;
+        }
 
         if ((base == null) && (property == null))
+        {
             throw new PropertyNotFoundException();
+        }
 
         if (!(property instanceof String))
+        {
             return;
+        }
 
+        // base is null and property is a String value, check for resource bundle.
         final ResourceBundle bundle = getResourceBundle(context, (String)property);
 
         if (bundle != null)
@@ -76,11 +92,17 @@
     {
 
         if (base != null)
+        {
             return false;
+        }
         if (property == null)
+        {
             throw new PropertyNotFoundException();
+        }
         if (!(property instanceof String))
+        {
             return false;
+        }
 
         final ResourceBundle bundle = getResourceBundle(context, (String)property);
 
@@ -99,11 +121,17 @@
     {
 
         if (base != null)
+        {
             return null;
+        }
         if (property == null)
+        {
             throw new PropertyNotFoundException();
+        }
         if (!(property instanceof String))
+        {
             return null;
+        }
 
         final ResourceBundle bundle = getResourceBundle(context, (String)property);
 
@@ -122,11 +150,17 @@
     {
 
         if (base != null)
+        {
             return null;
+        }
         if (property == null)
+        {
             throw new PropertyNotFoundException();
+        }
         if (!(property instanceof String))
+        {
             return null;
+        }
 
         final ResourceBundle bundle = getResourceBundle(context, (String)property);
 
@@ -144,7 +178,9 @@
     {
 
         if (base != null)
+        {
             return null;
+        }
 
         final ArrayList<FeatureDescriptor> descriptors = new ArrayList<FeatureDescriptor>();
 
@@ -164,7 +200,9 @@
     {
 
         if (base != null)
+        {
             return null;
+        }
 
         return String.class;
     }