Author: markt
Date: Tue May 18 17:16:44 2010
New Revision: 945773
URL: http://svn.apache.org/viewvc?rev=945773&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48717
When a node joins a cluster and it receives all the current sessions, ensure
the sessionCreated event is fired if the Manager is configured to replicate
session events
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=945773&r1=945772&r2=945773&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue May 18 17:16:44 2010
@@ -81,15 +81,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48717
- When a node joins a cluster and it receives all the current sessions, ensure
- the sessionCreated event is fired if the Manager is configured to replicate
- session events
- http://svn.apache.org/viewvc?rev=928482&view=rev
- (apply to both cluster implementations)
- +1: markt, kkolinko, kfujino
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48840
If CDPATH is set, cd may result in output to stdout.
Swallow the output. This is safe since the script outputs the value used for
Modified:
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java?rev=945773&r1=945772&r2=945773&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
(original)
+++
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
Tue May 18 17:16:44 2010
@@ -789,6 +789,9 @@ public class DeltaManager extends Manage
session.getIdInternal()));
}
add(session);
+ if (notifySessionListenersOnReplication) {
+ session.tellNew();
+ }
}
} catch (ClassNotFoundException e) {
log.error(sm.getString("deltaManager.loading.cnfe", e), e);
Modified:
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java?rev=945773&r1=945772&r2=945773&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java
Tue May 18 17:16:44 2010
@@ -678,6 +678,9 @@ public class DeltaManager extends Cluste
if (log.isWarnEnabled())
log.warn(sm.getString("deltaManager.loading.existing.session",session.getIdInternal()));
}
add(session);
+ if (notifySessionListenersOnReplication) {
+ session.tellNew();
+ }
}
} catch (ClassNotFoundException e) {
log.error(sm.getString("deltaManager.loading.cnfe", e), e);
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=945773&r1=945772&r2=945773&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Tue May 18
17:16:44 2010
@@ -117,6 +117,11 @@
<subsection name="Cluster">
<changelog>
<fix>
+ <bug>48717</bug>: When a node joins a cluster and it receives all the
+ current sessions, ensure the sessionCreated event is fired if the
+ Manager is configured to replicate session events. (markt)
+ </fix>
+ <fix>
<bug>49170</bug>: Do not send duplicated session. (kfujino)
</fix>
</changelog>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
