[richfaces-svn-commits] JBoss Rich Faces SVN: r14654 - branches/community/3.3.X/ui/tabPanel/src/main/java/org/richfaces/component.

[richfaces-svn-commits at lists.jboss.org]

Author: Alex.Kolonitsky
Date: 2009-06-18 06:19:43 -0400 (Thu, 18 Jun 2009)
New Revision: 14654

Modified:
   branches/community/3.3.X/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java
Log:
TabPanel: value evaluated at phase1
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-06-17 17:02:20 UTC (rev 14653)
+++ branches/community/3.3.X/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java	2009-06-18 10:19:43 UTC (rev 14654)
@@ -52,7 +52,7 @@
 
     protected Iterator getSwitchedFacetsAndChildren() {
     	
-        final Object renderedValue = getRenderedValue();
+        final Object renderedValue = this.restoredRenderedValue;
 
     	return new IteratorChain(new FilterIterator(getRenderedTabs(), new Predicate() {
 
@@ -138,21 +138,21 @@
     private transient Object restoredRenderedValue;
     
     public void processDecodes(FacesContext context) {
-	if (context == null) {
-	    throw new NullPointerException("FacesContext is null!");
-	}
-
-	if (!isRendered()) {
-	    return ;
-	}
-
-	//RF-1047 - retry to obtain restoredRenderedValue. Seam conversations are absent on 1st phase thus 
-	//value is absent also
-	if (restoredRenderedValue == null) {
-	    this.restoredRenderedValue = getRenderedValue();
-	}
-
-	super.processDecodes(context);
+    	if (context == null) {
+    	    throw new NullPointerException("FacesContext is null!");
+    	}
+    
+    	if (!isRendered()) {
+    	    return ;
+    	}
+    
+    	//RF-1047 - retry to obtain restoredRenderedValue. Seam conversations are absent on 1st phase thus 
+    	//value is absent also
+    	if (restoredRenderedValue == null) {
+    	    this.restoredRenderedValue = getRenderedValue();
+    	}
+    
+    	super.processDecodes(context);
     }
     
     public Object saveState(FacesContext context) {