Author: alexsmirnov Date: 2009-09-28 00:36:20 -0400 (Mon, 28 Sep 2009) New Revision: 15674 Modified: branches/community/3.3.X/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java Log: https://jira.jboss.org/jira/browse/RF-7353 Modified: branches/community/3.3.X/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java =================================================================== --- branches/community/3.3.X/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java 2009-09-27 23:21:24 UTC (rev 15673) +++ branches/community/3.3.X/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java 2009-09-28 04:36:20 UTC (rev 15674) @@ -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() {