You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ar...@apache.org on 2011/03/17 17:41:39 UTC
svn commit: r1082585 - in /myfaces/trinidad/branches/1.2.12.5.0-branch: ./
trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/
trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component/
trinidad-sa...
Author: arobinson74
Date: Thu Mar 17 16:41:39 2011
New Revision: 1082585
URL: http://svn.apache.org/viewvc?rev=1082585&view=rev
Log:
TRINIDAD-2047 - merge onto this branch -- fixes issue with saving the stamp state when no stamping is in process
Modified:
myfaces/trinidad/branches/1.2.12.5.0-branch/ (props changed)
myfaces/trinidad/branches/1.2.12.5.0-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java
myfaces/trinidad/branches/1.2.12.5.0-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component/ (props changed)
myfaces/trinidad/branches/1.2.12.5.0-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event/ (props changed)
Propchange: myfaces/trinidad/branches/1.2.12.5.0-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 17 16:41:39 2011
@@ -4,4 +4,4 @@
/myfaces/trinidad/branches/1.2.9.1-branch:697924,699406,699496
/myfaces/trinidad/branches/TRINIDAD-1402:745675
/myfaces/trinidad/branches/jwaldman_StyleMap:754977-770778
-/myfaces/trinidad/trunk:894885,915962,962582,1002826,1031716
+/myfaces/trinidad/trunk:894885,915962,962582,1002826,1031716,1076418
Modified: myfaces/trinidad/branches/1.2.12.5.0-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-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java?rev=1082585&r1=1082584&r2=1082585&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.5.0-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java (original)
+++ myfaces/trinidad/branches/1.2.12.5.0-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java Thu Mar 17 16:41:39 2011
@@ -248,15 +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
+ // 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;
}
@@ -1465,6 +1465,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())
{
Propchange: myfaces/trinidad/branches/1.2.12.5.0-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 17 16:41:39 2011
@@ -3,4 +3,4 @@
/myfaces/trinidad/branches/1.2.12.2-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:895708
/myfaces/trinidad/branches/1.2.9.1-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:699406,699496
/myfaces/trinidad/branches/TRINIDAD-1402/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:745675
-/myfaces/trinidad/trunk/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:894885,915962,962582,1002826,1031716
+/myfaces/trinidad/trunk/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:894885,915962,962582,1002826,1031716,1076418
Propchange: myfaces/trinidad/branches/1.2.12.5.0-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 17 16:41:39 2011
@@ -3,4 +3,4 @@
/myfaces/trinidad/branches/1.2.12.2-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:895708
/myfaces/trinidad/branches/1.2.9.1-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:699406,699496
/myfaces/trinidad/branches/TRINIDAD-1402/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:745675
-/myfaces/trinidad/trunk/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:894885,915962,962582,1002826,1031716
+/myfaces/trinidad/trunk/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:894885,915962,962582,1002826,1031716,1076418