Author: pero
Date: Wed Nov 11 07:38:48 2009
New Revision: 834790
URL: http://svn.apache.org/viewvc?rev=834790&view=rev
Log:
Fix CrossContext replication support
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=834790&r1=834789&r2=834790&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov 11 07:38:48 2009
@@ -190,11 +190,6 @@
+1: fhanik, kkolinko, rjung
-1:
-* Fix ReplicationValve CrossContext support
- http://svn.apache.org/viewvc?rev=831718&view=rev
- +1: pero, rjung, funkman
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48097
Alternative patch that adds a new PrivilegedAction. The test case provided
passes with this patch
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=834790&r1=834789&r2=834790&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
Wed Nov 11 07:38:48 2009
@@ -370,6 +370,17 @@
return (this.isValid);
}
+ /**
+ * End the access and register to ReplicationValve (crossContext support)
+ */
+ public void endAccess() {
+ super.endAccess() ;
+ if(manager instanceof DeltaManager) {
+ ((DeltaManager)manager).registerSessionAtReplicationValve(this);
+ }
+ }
+
+
// ------------------------------------------------- Session Public Methods
/**
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=834790&r1=834789&r2=834790&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Nov 11 07:38:48 2009
@@ -367,6 +367,9 @@
<subsection name="Cluster">
<changelog>
<fix>
+ DeltaSession needs endAccess that CrossContext replication work. (pero)
+ </fix>
+ <fix>
DeltaManager needs to replicate changed attributes even if session
gets invalidated. Otherwise session listeners will not see the right
data on the secondary nodes. (rjung)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
