You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2011/05/31 19:09:10 UTC

svn commit: r1129806 - /myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/component/UIData.java

Author: lu4242
Date: Tue May 31 17:09:10 2011
New Revision: 1129806

URL: http://svn.apache.org/viewvc?rev=1129806&view=rev
Log:
MYFACES-3161 UIData.restoreDescendantComponentStates fails when empty datatable is used and a new row is created

Modified:
    myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/component/UIData.java

Modified: myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/component/UIData.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/component/UIData.java?rev=1129806&r1=1129805&r2=1129806&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/component/UIData.java (original)
+++ myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/component/UIData.java Tue May 31 17:09:10 2011
@@ -604,7 +604,7 @@ public class UIData extends UIComponentB
                     childState = object[0];
                     descendantState = object[1];
                 }
-                if (component instanceof EditableValueHolder)
+                if (childState != null && component instanceof EditableValueHolder)
                 {
                     ((EditableValueHolderState) childState).restoreState((EditableValueHolder) component);
                 }