incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From awi...@apache.org
Subject svn commit: r504230 - /incubator/adffaces/branches/faces-1_2-070201/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java
Date Tue, 06 Feb 2007 18:12:32 GMT
Author: awiner
Date: Tue Feb  6 10:12:31 2007
New Revision: 504230

URL: http://svn.apache.org/viewvc?view=rev&rev=504230
Log:
Merge revision r503953 from trunk: Fix a possible NPE when calling resetStampState() on a
table that hasn't been processed yet.  And switch an Oracle bug number to a description of
the bug

Modified:
    incubator/adffaces/branches/faces-1_2-070201/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java

Modified: incubator/adffaces/branches/faces-1_2-070201/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-070201/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java?view=diff&rev=504230&r1=504229&r2=504230
==============================================================================
--- incubator/adffaces/branches/faces-1_2-070201/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java
(original)
+++ incubator/adffaces/branches/faces-1_2-070201/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java
Tue Feb  6 10:12:31 2007
@@ -186,8 +186,11 @@
     InternalState iState = _getInternalState(true);
     // TODO: this is over kill. for eg, It clears out any toggled showDetails.
     Object initKey = _getCurrencyKeyForInitialStampState();
-    // do not clear the initial stamp state: bug 4862103:
-    iState._stampState.clear(initKey);
+    // do not clear the initial stamp state: a subtle bug could
+    // result where the initial state of each component is gone, so we
+    // fail to roll back to the initial default values
+    if (iState._stampState != null)
+      iState._stampState.clear(initKey);
   }
 
   @Override



Mime
View raw message