[myfaces-trinidad] 03/03: TRINIDAD-2045 - Commit patch made by Venkata Guddanti

[de...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

deki pushed a commit to branch 1.2.12.5.0.5-branch
in repository https://gitbox.apache.org/repos/asf/myfaces-trinidad.git

commit 666641e935dfbaff1fb8e9b1f7863296a136ca2c
Author: Scott Bryan <so...@apache.org>
AuthorDate: Thu Feb 24 23:13:59 2011 +0000

    TRINIDAD-2045 - Commit patch made by Venkata Guddanti
---
 .../apache/myfaces/trinidad/component/UIXCollection.java  | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java b/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java
index f2d042a..0620fed 100644
--- a/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java
+++ b/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java
@@ -248,6 +248,15 @@ public abstract class UIXCollection extends UIXComponentBase
       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 extends UIXComponentBase
     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
     {

-- 
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.