myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svieu...@apache.org
Subject svn commit: r279197 - /myfaces/impl/trunk/src/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
Date Wed, 07 Sep 2005 00:38:31 GMT
Author: svieujot
Date: Tue Sep  6 17:38:29 2005
New Revision: 279197

URL: http://svn.apache.org/viewcvs?rev=279197&view=rev
Log:
Revert r279101 that threw exceptions abouts non unique id's. See comments in MYFACES-509.

Modified:
    myfaces/impl/trunk/src/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java

Modified: myfaces/impl/trunk/src/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
URL: http://svn.apache.org/viewcvs/myfaces/impl/trunk/src/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java?rev=279197&r1=279196&r2=279197&view=diff
==============================================================================
--- myfaces/impl/trunk/src/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
(original)
+++ myfaces/impl/trunk/src/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
Tue Sep  6 17:38:29 2005
@@ -232,12 +232,12 @@
     }
 
     private static void checkForDuplicateIds(UIComponent component,
-                                             FacesContext facesContext, Set ids)
+                                             FacesContext facesContext, Set clientIds)
     {
-        String id = component.getId();
-        if(id != null && !ids.add(id))
+        String clientId = component.getClientId(facesContext);
+        if(clientId != null && !clientIds.add(clientId))
         {
-            throw new IllegalArgumentException("Id : "+id+
+            throw new IllegalArgumentException("ClientId : "+clientId+
                     " is duplicated in the faces tree.");
         }
         else
@@ -246,7 +246,7 @@
             while (it.hasNext())
             {
                 UIComponent kid = (UIComponent) it.next();
-                checkForDuplicateIds(kid, facesContext, ids);
+                checkForDuplicateIds(kid, facesContext, clientIds);
             }
         }
     }



Mime
View raw message