From adffaces-commits-return-1982-apmail-incubator-adffaces-commits-archive=incubator.apache.org@incubator.apache.org Mon Feb 05 19:57:44 2007 Return-Path: Delivered-To: apmail-incubator-adffaces-commits-archive@locus.apache.org Received: (qmail 11632 invoked from network); 5 Feb 2007 19:57:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Feb 2007 19:57:44 -0000 Received: (qmail 19038 invoked by uid 500); 5 Feb 2007 19:57:50 -0000 Delivered-To: apmail-incubator-adffaces-commits-archive@incubator.apache.org Received: (qmail 19026 invoked by uid 500); 5 Feb 2007 19:57:50 -0000 Mailing-List: contact adffaces-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: adffaces-dev@incubator.apache.org Delivered-To: mailing list adffaces-commits@incubator.apache.org Received: (qmail 19016 invoked by uid 99); 5 Feb 2007 19:57:50 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Feb 2007 11:57:50 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Feb 2007 11:57:43 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 38FBE1A981D; Mon, 5 Feb 2007 11:57:23 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r503846 - /incubator/adffaces/branches/faces-1_2-070201/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java Date: Mon, 05 Feb 2007 19:57:23 -0000 To: adffaces-commits@incubator.apache.org From: awiner@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070205195723.38FBE1A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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]);