[seam-commits] Seam SVN: r10194 - in trunk/src/main/org/jboss/seam: faces and 1 other directory.

[seam-commits at lists.jboss.org]

Author: norman.richards at jboss.com
Date: 2009-03-20 19:01:25 -0400 (Fri, 20 Mar 2009)
New Revision: 10194

Modified:
   trunk/src/main/org/jboss/seam/el/SeamELResolver.java
   trunk/src/main/org/jboss/seam/faces/UiComponent.java
Log:
JBSEAM-3916

Modified: trunk/src/main/org/jboss/seam/el/SeamELResolver.java
===================================================================
--- trunk/src/main/org/jboss/seam/el/SeamELResolver.java	2009-03-20 01:58:50 UTC (rev 10193)
+++ trunk/src/main/org/jboss/seam/el/SeamELResolver.java	2009-03-20 23:01:25 UTC (rev 10194)
@@ -80,9 +80,13 @@
         }
     }
 
-   private Object resolveInMap(ELContext context, Map map, Object property) {
-        if (map.containsKey(property)) {
-            return null;            
+   private Object resolveInMap(ELContext context, Map map, Object property) {       
+        try {
+            if (map.containsKey(property)) {
+                return null;
+            }
+        } catch (UnsupportedOperationException e) {
+            // eat it
         }
         
         if ("size".equals(property)) {

Modified: trunk/src/main/org/jboss/seam/faces/UiComponent.java
===================================================================
--- trunk/src/main/org/jboss/seam/faces/UiComponent.java	2009-03-20 01:58:50 UTC (rev 10193)
+++ trunk/src/main/org/jboss/seam/faces/UiComponent.java	2009-03-20 23:01:25 UTC (rev 10194)
@@ -37,6 +37,12 @@
       {
 
          @Override
+         public boolean containsKey(Object key) {
+            return get(key) != null;
+         }
+         
+          
+         @Override
          public Set<Map.Entry<String, UIComponent>> entrySet()
          {
             throw new UnsupportedOperationException();