You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by so...@apache.org on 2011/02/25 00:26:59 UTC

svn commit: r1074353 - /myfaces/trinidad/branches/1.2.12.5.0.4-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java

Author: sobryan
Date: Thu Feb 24 23:26:59 2011
New Revision: 1074353

URL: http://svn.apache.org/viewvc?rev=1074353&view=rev
Log:
TRINIDAD-2045 - Commit patch made by Venkata Guddanti

Modified:
    myfaces/trinidad/branches/1.2.12.5.0.4-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java

Modified: myfaces/trinidad/branches/1.2.12.5.0.4-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.5.0.4-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java?rev=1074353&r1=1074352&r2=1074353&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.5.0.4-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java (original)
+++ myfaces/trinidad/branches/1.2.12.5.0.4-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java Thu Feb 24 23:26:59 2011
@@ -248,6 +248,15 @@ public abstract class UIXCollection exte
       setRowKey(currencyKey);
     }
 
+    // Finally clean up any internal model state that we might be holding on to. We do not want to hold onto any 
+    // application data in between requests 
+    InternalState iState = _getInternalState(false);
+    if (iState != null)
+    {
+      iState._value = null;
+      iState._model= null;
+    }
+    
     return savedState;
   }
 
@@ -266,11 +275,7 @@ public abstract class UIXCollection exte
     if (iState != null)
     {
       stampState = iState._stampState;
-      clientKeyMgr = iState._clientKeyMgr;
-      
-      // Make sure that we are not holding on to any application data in our state
-      iState._value = null;
-      iState._model= null;
+      clientKeyMgr = iState._clientKeyMgr;      
     }
     else
     {