myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arobinso...@apache.org
Subject svn commit: r1076425 - in /myfaces/trinidad/branches/trinidad-1.2.x: ./ trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java
Date Wed, 02 Mar 2011 22:05:47 GMT
Author: arobinson74
Date: Wed Mar  2 22:05:46 2011
New Revision: 1076425

URL: http://svn.apache.org/viewvc?rev=1076425&view=rev
Log:
TRINIDAD-2047 - do not attempt to save the stamp state when there is no active stamp

Modified:
    myfaces/trinidad/branches/trinidad-1.2.x/   (props changed)
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java

Propchange: myfaces/trinidad/branches/trinidad-1.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar  2 22:05:46 2011
@@ -8,4 +8,4 @@
 /myfaces/trinidad/branches/anrobins_1.2.12.3_visitTree_3:984258-984269
 /myfaces/trinidad/branches/anrobins_1.2.12.3_visitTree_4:984270-988607
 /myfaces/trinidad/branches/jwaldman_StyleMap:754977-770778
-/myfaces/trinidad/trunk:930425,932153,1002826,1031716
+/myfaces/trinidad/trunk:930425,932153,1002826,1031716,1076418

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java?rev=1076425&r1=1076424&r2=1076425&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java
(original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java
Wed Mar  2 22:05:46 2011
@@ -253,15 +253,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 
+    // 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;
   }
 
@@ -1792,6 +1792,13 @@ public abstract class UIXCollection exte
     StampState stampState = _getStampState();
     FacesContext context = getFacesContext();
     Object currencyObj = getRowKey();
+
+    // TRINIDAD-2047: we do not need to save stamp state if there is no active stamp
+    if (currencyObj == null)
+    {
+      return;
+    }
+
     int position = 0;
     for(UIComponent stamp : getStamps())
     {



Mime
View raw message