portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r773753 - in /portals/jetspeed-2/portal/trunk/components: jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/ jetspeed-portal/src/main/java/org/apache/jetspeed/profiler/impl/
Date Tue, 12 May 2009 01:14:31 GMT
Author: rwatler
Date: Tue May 12 01:14:30 2009
New Revision: 773753

URL: http://svn.apache.org/viewvc?rev=773753&view=rev
Log:
JS2-995: NPE in ProfilerValve under desktop mode
---------------------------------------------------
- backed out patch for this issue that disabled session ending cleanup of portal site state
- backed out forced portal site state reset on pipeline change, (old patch for JS2-768)

With these changes applied, I am unable to create a NPE in desktop mode or when switching
back and forth between desktop and normal modes.


Modified:
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java?rev=773753&r1=773752&r2=773753&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java
Tue May 12 01:14:30 2009
@@ -1248,6 +1248,9 @@
             }
         }
 
+        // clear session context state
+        clearSessionProfileLocators();
+
         // log binding event
         if (log.isDebugEnabled())
         {

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java?rev=773753&r1=773752&r2=773753&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java
Tue May 12 01:14:30 2009
@@ -208,8 +208,8 @@
                 // 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() || hasPipelineChanged(pipeline,
sessionContext.getPipeline()))                     
-                {                    
+                if ((sessionContext == null) || !sessionContext.isValid())
+                {
                     sessionContext = portalSite.newSessionContext();
                     sessionContext.setPipeline(pipeline);
                     request.setSessionAttribute(PORTAL_SITE_SESSION_CONTEXT_ATTR_KEY, sessionContext);
@@ -305,11 +305,6 @@
         }
     }
     
-    protected boolean hasPipelineChanged(String requestPipeline, String sessionPipeline)
-    {
-        return !requestPipeline.equals(sessionPipeline);
-    }    
-
     /**
      * Returns the <code>PageActionAccess</code> for the current user request.
      * @see PageActionAccess



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


Mime
View raw message