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 2010/07/30 21:05:55 UTC

svn commit: r980927 - /myfaces/core/trunk/api/src/main/java/javax/faces/component/_DeltaStateHelper.java

Author: lu4242
Date: Fri Jul 30 19:05:55 2010
New Revision: 980927

URL: http://svn.apache.org/viewvc?rev=980927&view=rev
Log:
MYFACES-2616 Fix UIData state saving model (spec issue 153) (allow restoreState without mix previous states)

Modified:
    myfaces/core/trunk/api/src/main/java/javax/faces/component/_DeltaStateHelper.java

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_DeltaStateHelper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_DeltaStateHelper.java?rev=980927&r1=980926&r2=980927&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_DeltaStateHelper.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_DeltaStateHelper.java Fri Jul 30 19:05:55 2010
@@ -595,6 +595,15 @@ class _DeltaStateHelper implements State
             return;
 
         Object[] serializedState = (Object[]) state;
+        
+        if (!isInitialStateMarked() && !_fullState.isEmpty())
+        {
+            _fullState.clear();
+            if(_deltas != null)
+            {
+                _deltas.clear();
+            }
+        }
 
         for (int cnt = 0; cnt < serializedState.length; cnt += 2)
         {