svnno****@sourc*****
svnno****@sourc*****
2008年 4月 22日 (火) 17:53:05 JST
Revision: 884
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=884
Author: shinsuke
Date: 2008-04-22 17:53:05 +0900 (Tue, 22 Apr 2008)
Log Message:
-----------
tomcat cluster support(session replication).
Modified Paths:
--------------
pal-portal/trunk/build.properties
Added Paths:
-----------
pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/container/
pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/container/session/
pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionMonitorImpl.java
pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionsManagerImpl.java
-------------- next part --------------
Modified: pal-portal/trunk/build.properties
===================================================================
--- pal-portal/trunk/build.properties 2008-04-18 07:42:31 UTC (rev 883)
+++ pal-portal/trunk/build.properties 2008-04-22 08:53:05 UTC (rev 884)
@@ -160,6 +160,8 @@
portal.patch.files=\
components/prefs/src/java/org/apache/jetspeed/prefs/impl/PreferencesImpl.java,\
components/capability/src/java/org/apache/jetspeed/capabilities/impl/JetspeedCapabilities.java,\
+components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionMonitorImpl.java,\
+components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionsManagerImpl.java,\
components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java,\
components/portal/src/java/org/apache/jetspeed/login/LoginErrorServlet.java,\
components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_ja.properties,\
Added: pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionMonitorImpl.java
===================================================================
--- pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionMonitorImpl.java (rev 0)
+++ pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionMonitorImpl.java 2008-04-22 08:53:05 UTC (rev 884)
@@ -0,0 +1,13 @@
+Index: components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionMonitorImpl.java
+===================================================================
+--- components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionMonitorImpl.java (リビジョン 628183)
++++ components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionMonitorImpl.java (作業コピー)
+@@ -108,7 +108,7 @@
+ */
+ public void valueUnbound(HttpSessionBindingEvent event)
+ {
+- if ( session != null )
++ if ( session != null && session.getAttribute(SESSION_KEY) == null)
+ {
+ PortalSessionsManager manager = getManager();
+ if (manager != null)
Property changes on: pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionMonitorImpl.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionsManagerImpl.java
===================================================================
--- pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionsManagerImpl.java (rev 0)
+++ pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionsManagerImpl.java 2008-04-22 08:53:05 UTC (rev 884)
@@ -0,0 +1,14 @@
+Index: components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionsManagerImpl.java
+===================================================================
+--- components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionsManagerImpl.java (リビジョン 628183)
++++ components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionsManagerImpl.java (作業コピー)
+@@ -194,6 +194,9 @@
+ // now retrieve the just created psr again
+ psr = (PortalSessionRegistry)portalSessionsRegistry.get(portalSession.getId());
+ }
++ if (psr == null) {
++ return;
++ }
+ PortletApplicationSessionMonitor pasm = (PortletApplicationSessionMonitor)psr.sessionMonitors.get(contextPath);
+ if ( pasm != null )
+ {
Property changes on: pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionsManagerImpl.java
___________________________________________________________________
Name: svn:eol-style
+ native