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 2008/02/28 01:25:14 UTC

svn commit: r631787 - /portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java

Author: taylor
Date: Wed Feb 27 16:25:08 2008
New Revision: 631787

URL: http://svn.apache.org/viewvc?rev=631787&view=rev
Log:
rollback of 768, this broke configure mode in the portal and desktop

Modified:
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java?rev=631787&r1=631786&r2=631787&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java Wed Feb 27 16:25:08 2008
@@ -300,13 +300,7 @@
     
     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;
+        return !requestPipeline.equals(sessionPipeline);
     }
 
     /**



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org