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

Author: ivassile Date: 2013-12-09 21:51:21 -0500 (Mon, 09 Dec 2013) New Revision: 23275 Modified: branches/enterprise/3.3.1.SP4/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java Log: Integrating richfaces/branches/enterprise/3.3.1.SP3_BZ-851635 Modified: branches/enterprise/3.3.1.SP4/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java =================================================================== --- branches/enterprise/3.3.1.SP4/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java 2013-12-10 02:45:29 UTC (rev 23274) +++ branches/enterprise/3.3.1.SP4/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java 2013-12-10 02:51:21 UTC (rev 23275) @@ -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() {