Author: taylor
Date: Sat Jul 12 22:07:29 2014
New Revision: 1610067
URL: http://svn.apache.org/r1610067
Log:
JS2-1299: couldn't get this work perfectly as it was breaking action pipeline.
Instead providing alternative request parameter to clear state.
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/PageHistoryValve.java
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/PageHistoryValve.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/PageHistoryValve.java?rev=1610067&r1=1610066&r2=1610067&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/PageHistoryValve.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/PageHistoryValve.java
Sat Jul 12 22:07:29 2014
@@ -21,13 +21,12 @@ import org.apache.jetspeed.pipeline.Pipe
import org.apache.jetspeed.pipeline.valve.AbstractValve;
import org.apache.jetspeed.pipeline.valve.ValveContext;
import org.apache.jetspeed.request.RequestContext;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* <p>
- * Valve basically mantains the page navigation history by maintaining a
previous page id in the session.
+ * Valve basically maintains the page navigation history by maintaining a
previous page id in the session.
* Required by JS2-806
* </p>
*
@@ -78,12 +77,16 @@ public class PageHistoryValve extends Ab
}
else
{
-
if (prevPageId.equalsIgnoreCase(curPageId))
{
- if (log.isDebugEnabled())
- {
- log.debug("Previous page id is same as current
page id, not clearing page state");
+ if
(request.getRequestParameter(REQUEST_CLEAR_PORTLETS_MODE_AND_WINDOWSTATE_KEY)
!= null) {
+
request.setSessionAttribute(SESSION_PREVIOUS_PAGEID_KEY, curPageId);
+
request.setAttribute(REQUEST_CLEAR_PORTLETS_MODE_AND_WINDOWSTATE_KEY,
Boolean.TRUE);
+ }
+ else {
+ if (log.isDebugEnabled()) {
+ log.debug("Previous page id is same as current
page id, not clearing page state");
+ }
}
}
else
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
