[richfaces-svn-commits] JBoss Rich Faces SVN: r13987 - trunk/ui/core/src/main/java/org/ajax4jsf/component.

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

Author: alexsmirnov
Date: 2009-05-01 19:10:30 -0400 (Fri, 01 May 2009)
New Revision: 13987

Modified:
   trunk/ui/core/src/main/java/org/ajax4jsf/component/UIInclude.java
Log:
https://jira.jboss.org/jira/browse/RF-6746

Modified: trunk/ui/core/src/main/java/org/ajax4jsf/component/UIInclude.java
===================================================================
--- trunk/ui/core/src/main/java/org/ajax4jsf/component/UIInclude.java	2009-05-01 22:29:01 UTC (rev 13986)
+++ trunk/ui/core/src/main/java/org/ajax4jsf/component/UIInclude.java	2009-05-01 23:10:30 UTC (rev 13987)
@@ -21,6 +21,8 @@
 
 package org.ajax4jsf.component;
 
+import java.io.IOException;
+
 import javax.el.ELContext;
 import javax.el.ELException;
 import javax.el.ValueExpression;
@@ -206,6 +208,13 @@
 		restoreNavigation(context, holder);
 	}
 
+	@Override
+	public void encodeAll(FacesContext context) throws IOException {
+		// Fix for https://jira.jboss.org/jira/browse/RF-6746
+		ViewIdHolder holder = setupNavigation(context);
+		super.encodeAll(context);
+		restoreNavigation(context, holder);
+	}
 	/*
 	 * (non-Javadoc)
 	 *