You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2008/04/21 13:28:20 UTC
svn commit: r650105 -
/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
Author: bommel
Date: Mon Apr 21 04:28:16 2008
New Revision: 650105
URL: http://svn.apache.org/viewvc?rev=650105&view=rev
Log:
(MYFACES-1825) duplicate ids not detected in JspStateManagerImpl.checkForDuplicateIds()
Modified:
myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java?rev=650105&r1=650104&r2=650105&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java Mon Apr 21 04:28:16 2008
@@ -377,19 +377,15 @@
" is duplicated in the faces tree. Component : "+component.getClientId(context)+", path: "+
getPathToComponent(component));
}
+ if (component instanceof NamingContainer)
+ {
+ ids = new HashSet<String>();
+ }
Iterator it = component.getFacetsAndChildren();
while (it.hasNext())
{
UIComponent kid = (UIComponent) it.next();
- boolean namingContainer = kid instanceof NamingContainer;
- if (namingContainer)
- {
- checkForDuplicateIds(context, kid, new HashSet<String>());
- }
- else
- {
- checkForDuplicateIds(context, kid, ids);
- }
+ checkForDuplicateIds(context, kid, ids);
}
}