Author: thomas.heute(a)jboss.com Date: 2008-06-23 07:56:21 -0400 (Mon, 23 Jun 2008) New Revision: 11108 Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/instance/InvokePortletInstanceCommandFactory.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/portlet/PortletRequestEncoder.java Log: Navigational state in held in session Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/instance/InvokePortletInstanceCommandFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/instance/InvokePortletInstanceCommandFactory.java 2008-06-23 11:53:31 UTC (rev 11107) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/instance/InvokePortletInstanceCommandFactory.java 2008-06-23 11:56:21 UTC (rev 11108) @@ -49,7 +49,7 @@ { return new InvokePortletInstanceActionCommand( instanceId, - portletURL.getNavigationalState(), + null, portletURL.getInteractionState(), null); } Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/portlet/PortletRequestEncoder.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/portlet/PortletRequestEncoder.java 2008-06-23 11:53:31 UTC (rev 11107) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/portlet/PortletRequestEncoder.java 2008-06-23 11:56:21 UTC (rev 11108) @@ -125,8 +125,6 @@ { if (interactionState instanceof ParametersStateString) { - // We don't encode navigational state in portlet URL we can interpret as we store the nav state in the portal session - /** if (navigationalState != null) { throw new IllegalArgumentException("Cannot handle case with both non opaque interaction and navigational state"); @@ -135,7 +133,6 @@ // Add the parameters Map<String, String[]> parameters = ((ParametersStateString)interactionState).getParameters(); configure(parameters); - */ } else {