Author: thomas.heute(a)jboss.com Date: 2008-12-04 18:14:45 -0500 (Thu, 04 Dec 2008) New Revision: 12348 Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java Log: JBPORTAL-2248: Action URL retained by client Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java 2008-12-04 20:09:47 UTC (rev 12347) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java 2008-12-04 23:14:45 UTC (rev 12348) @@ -37,6 +37,7 @@ import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.command.response.PortletWindowActionResponse; import org.jboss.portal.portlet.NoSuchPortletException; +import org.jboss.portal.portlet.ParametersStateString; import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse; @@ -44,6 +45,8 @@ import java.io.ByteArrayInputStream; import java.io.StringReader; +import java.util.HashMap; +import java.util.Map; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -76,8 +79,13 @@ // WindowState windowState = renderResult.getWindowState(); - // - return new PortletWindowActionResponse(targetId, windowState, mode, renderResult.getNavigationalState()); + ParametersStateString state = (ParametersStateString)renderResult.getNavigationalState(); + + Map<String, String[]> parameters = new HashMap<String, String[]>(state.getParameters()); + + parameters.putAll(renderResult.getPublicNavigationalStateUpdates()); + + return new PortletWindowActionResponse(targetId, windowState, mode, ParametersStateString.create(parameters)); } else {