You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gc...@apache.org on 2010/01/13 23:13:06 UTC
svn commit: r898970 -
/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/FacetHashMap.java
Author: gcrawford
Date: Wed Jan 13 22:13:05 2010
New Revision: 898970
URL: http://svn.apache.org/viewvc?rev=898970&view=rev
Log:
TRINIDAD-1686 Trinidad 2: NPE when adding component in a facet
Modified:
myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/FacetHashMap.java
Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/FacetHashMap.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/FacetHashMap.java?rev=898970&r1=898969&r2=898970&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/FacetHashMap.java (original)
+++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/FacetHashMap.java Wed Jan 13 22:13:05 2010
@@ -65,9 +65,12 @@
{
ChildArrayList.__removeFromParent(value, -1);
}
-
+
+ // calling setParent triggers an addEvent, which might have listeners,
+ // so first put the component in the map, then set the parent
+ UIComponent comp = super.put(key, value);
value.setParent(_parent);
- return (super.put(key, value));
+ return comp;
}
@Override