Author: awiner
Date: Mon Feb  5 11:57:22 2007
New Revision: 503846

URL: http://svn.apache.org/viewvc?view=rev&rev=503846
Log:
Merge SVN rev 503845 directly to 1.2 branch - ClassCastExceptions if transient 
children are directly added to the table

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=503846&r1=503845&r2=503846
==============================================================================
--- 
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
 Mon Feb  5 11:57:22 2007
@@ -817,6 +817,9 @@
   protected void restoreStampState(FacesContext context, UIComponent stamp,
                                    Object stampState)
   {
+    if (stampState == Transient.TRUE)
+      return;
+    
     Object[] state = (Object[]) stampState;
     StampState.restoreStampState(context, stamp, state[0]);
 


Reply via email to