You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2007/08/24 19:43:29 UTC
svn commit: r569464 - in /portals/jetspeed-2/branches/JETSPEED-2.1.3:
components/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java
jetspeed-api/src/java/org/apache/jetspeed/PortalReservedParameters.java
Author: taylor
Date: Fri Aug 24 10:43:28 2007
New Revision: 569464
URL: http://svn.apache.org/viewvc?rev=569464&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-768
Modified:
portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java
portals/jetspeed-2/branches/JETSPEED-2.1.3/jetspeed-api/src/java/org/apache/jetspeed/PortalReservedParameters.java
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java?rev=569464&r1=569463&r2=569464&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java Fri Aug 24 10:43:28 2007
@@ -205,7 +205,7 @@
// replaced with a newly created session context
PortalSiteSessionContext sessionContext = (PortalSiteSessionContext)request.getSessionAttribute(PORTAL_SITE_SESSION_CONTEXT_ATTR_KEY);
String pipeline = request.getPipeline().getName();
- if ((sessionContext == null) || !sessionContext.isValid() || !pipeline.equals(sessionContext.getPipeline()))
+ if ((sessionContext == null) || !sessionContext.isValid() || hasPipelineChanged(pipeline, sessionContext.getPipeline()))
{
sessionContext = portalSite.newSessionContext();
sessionContext.setPipeline(pipeline);
@@ -296,6 +296,17 @@
log.error("Exception in request pipeline: " + e.getMessage(), e);
throw new PipelineException(e.toString(), e);
}
+ }
+
+ protected boolean hasPipelineChanged(String requestPipeline, String sessionPipeline)
+ {
+ if (!requestPipeline.equals(sessionPipeline))
+ {
+ if (requestPipeline.equals(PortalReservedParameters.JETSPEED_CONFIG_PIPELINE_NAME)
+ || sessionPipeline.equals(PortalReservedParameters.JETSPEED_CONFIG_PIPELINE_NAME))
+ return true;
+ }
+ return false;
}
/**
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/jetspeed-api/src/java/org/apache/jetspeed/PortalReservedParameters.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/jetspeed-api/src/java/org/apache/jetspeed/PortalReservedParameters.java?rev=569464&r1=569463&r2=569464&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/jetspeed-api/src/java/org/apache/jetspeed/PortalReservedParameters.java (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/jetspeed-api/src/java/org/apache/jetspeed/PortalReservedParameters.java Fri Aug 24 10:43:28 2007
@@ -37,6 +37,7 @@
public final static String DESKTOP_CONFIG_PIPELINE = "dtconfig-pipeline";
public final static String CONFIG_PIPELINE_NAME = "ConfigurePipeline";
public final static String DESKTOP_CONFIG_PIPELINE_NAME = "DesktopConfigurePipeline";
+ public final static String JETSPEED_CONFIG_PIPELINE_NAME = "JetspeedPipeline";
// Session and Request attribute keys
public static final String PAGE_ATTRIBUTE = "org.apache.jetspeed.Page";
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org