[richfaces-svn-commits] JBoss Rich Faces SVN: r15680 - tags/3.3.2.GA/ui/tabPanel/src/main/java/org/richfaces/component.

Author: alexsmirnov Date: 2009-09-28 14:27:34 -0400 (Mon, 28 Sep 2009) New Revision: 15680 Modified: tags/3.3.2.GA/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java Log: merge https://jira.jboss.org/jira/browse/RF-7353 from branch Modified: tags/3.3.2.GA/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java =================================================================== --- tags/3.3.2.GA/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java 2009-09-28 16:00:47 UTC (rev 15679) +++ tags/3.3.2.GA/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java 2009-09-28 18:27:34 UTC (rev 15680) @@ -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() {