[richfaces-svn-commits] JBoss Rich Faces SVN: r23221 - branches/enterprise/3.3.1.SP3_BZ-851635/ui/tabPanel/src/main/java/org/richfaces/component.

Author: ivassile Date: 2012-08-24 13:13:24 -0400 (Fri, 24 Aug 2012) New Revision: 23221 Modified: branches/enterprise/3.3.1.SP3_BZ-851635/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java Log: One-off patch BZ-851635 Modified: branches/enterprise/3.3.1.SP3_BZ-851635/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java =================================================================== --- branches/enterprise/3.3.1.SP3_BZ-851635/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java 2012-08-24 16:33:20 UTC (rev 23220) +++ branches/enterprise/3.3.1.SP3_BZ-851635/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java 2012-08-24 17:13:24 UTC (rev 23221) @@ -52,7 +52,7 @@ protected Iterator getSwitchedFacetsAndChildren() { - final Object renderedValue = this.restoredRenderedValue; + final Object renderedValue = null != this.restoredRenderedValue?this.restoredRenderedValue:getRenderedValue(); return new IteratorChain(new FilterIterator(getRenderedTabs(), new Predicate() { @@ -167,8 +167,8 @@ Object[] states = (Object[]) state; super.restoreState(context, states[0]); this.renderedValue = states[1]; - //TODO remove that - this.restoredRenderedValue = getRenderedValue(); + // https://jira.jboss.org/jira/browse/RF-7353 - getRenderedValue() can call wrong bean instance. + this.restoredRenderedValue = this.renderedValue;//getRenderedValue(); } private static final Predicate RENDERED_TAB_PREDICATE = new Predicate() {