Author: taylor
Date: Fri May 1 21:34:37 2015
New Revision: 1677237
URL: http://svn.apache.org/r1677237
Log:
JS2-1323: ActionResponse.setRenderParameter crashes ActionUrl, but only when
using SessionNavigationalState, not SessionFull*NavigationalState
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateCodec.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/SessionFullExtendedNavigationalState.java
portals/jetspeed-2/portal/trunk/pom.xml
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateCodec.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateCodec.java?rev=1677237&r1=1677236&r2=1677237&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateCodec.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateCodec.java
Fri May 1 21:34:37 2015
@@ -16,21 +16,20 @@
*/
package org.apache.jetspeed.container.state.impl;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.portlet.PortletMode;
-import javax.portlet.WindowState;
-
import org.apache.commons.codec.binary.Base64;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.PortalContext;
-import org.apache.jetspeed.container.url.PortalURL;
import org.apache.jetspeed.container.PortletWindow;
+import org.apache.jetspeed.container.url.PortalURL;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.portlet.PortletMode;
+import javax.portlet.WindowState;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Map;
/**
* JetspeedNavigationalStateCodec
@@ -346,7 +345,7 @@ public class JetspeedNavigationalStateCo
{
String windowId = iter.next();
PortletWindowRequestNavigationalState requestState =
states.getPortletWindowNavigationalState(windowId);
- if (!navParamsStateFull || !renderParamsStateFull ||
requestState.isTargetted())
+ if (!navParamsStateFull || requestState.isTargetted())
//(!navParamsStateFull || !renderParamsStateFull || requestState.isTargetted())
{
if (!(targetWindowId != null &&
windowId.equals(targetWindowId)))
{
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/SessionFullExtendedNavigationalState.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/SessionFullExtendedNavigationalState.java?rev=1677237&r1=1677236&r2=1677237&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/SessionFullExtendedNavigationalState.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/SessionFullExtendedNavigationalState.java
Fri May 1 21:34:37 2015
@@ -78,7 +78,7 @@ public class SessionFullExtendedNavigati
}
}
- // push the informaion up to SessionNavigationalState, so that we can
handle it appropriately there
+ // push the information up to SessionNavigationalState, so that we can
handle it appropriately there
setClearPortletsModeAndWindowStateEnabled(resetPagePortlets);
//Inform the super
return super.sync(context);
Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=1677237&r1=1677236&r2=1677237&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Fri May 1 21:34:37 2015
@@ -1446,11 +1446,6 @@
</dependency>
<dependency>
<groupId>org.apache.portals.bridges</groupId>
- <artifactId>portals-bridges-frameworks</artifactId>
- <version>${org.apache.portals.bridges.frameworks.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges-groovy</artifactId>
<version>${org.apache.portals.bridges.groovy.version}</version>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
