Author: jim
Date: Mon Aug 30 16:14:33 2010
New Revision: 990845
URL: http://svn.apache.org/viewvc?rev=990845&view=rev
Log:
Merge r982877 from trunk:
Submitted by: kfujino
Reviewed/backported by: jim
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=990845&r1=990844&r2=990845&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Mon Aug 30 16:14:33 2010
@@ -25,11 +25,6 @@ $Id$
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Add Null check when CHANGE_SESSION_ID message received.
- http://svn.apache.org/viewvc?rev=982877&view=rev
- +1: kfujino, markt, rjung, kkolinko, jim
- -1:
-
* Fix files missing from src bundles,
(as was mentioned in 5.5.30 Vote thread,
http://markmail.org/message/q2qk4nhzh67ggzk7)
http://people.apache.org/~kkolinko/patches/2010-08-30_tc55_fixSkippedFiles.patch
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=990845&r1=990844&r2=990845&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
Mon Aug 30 16:14:33 2010
@@ -1866,13 +1866,15 @@ public class DeltaManager extends Manage
protected void handleCHANGE_SESSION_ID(SessionMessage msg,Member sender)
throws IOException {
counterReceive_EVT_CHANGE_SESSION_ID++;
DeltaSession session = (DeltaSession) findSession(msg.getSessionID());
- String newSessionID = deserializeSessionId(msg.getSession());
- session.setPrimarySession(false);
- if(notifySessionListenersOnReplication) {
- session.setId(newSessionID);
- } else {
- session.setIdInternal(newSessionID);
- add(session);
+ if (session != null) {
+ String newSessionID = deserializeSessionId(msg.getSession());
+ session.setPrimarySession(false);
+ if (notifySessionListenersOnReplication) {
+ session.setId(newSessionID);
+ } else {
+ session.setIdInternal(newSessionID);
+ add(session);
+ }
}
}
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=990845&r1=990844&r2=990845&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
Mon Aug 30 16:14:33 2010
@@ -1591,13 +1591,15 @@ public class DeltaManager extends Cluste
protected void handleCHANGE_SESSION_ID(SessionMessage msg,Member sender)
throws IOException {
counterReceive_EVT_CHANGE_SESSION_ID++;
DeltaSession session = (DeltaSession) findSession(msg.getSessionID());
- String newSessionID = deserializeSessionId(msg.getSession());
- session.setPrimarySession(false);
- if(notifySessionListenersOnReplication) {
- session.setId(newSessionID);
- } else {
- session.setIdInternal(newSessionID);
- add(session);
+ if (session != null) {
+ String newSessionID = deserializeSessionId(msg.getSession());
+ session.setPrimarySession(false);
+ if (notifySessionListenersOnReplication) {
+ session.setId(newSessionID);
+ } else {
+ session.setIdInternal(newSessionID);
+ add(session);
+ }
}
}
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=990845&r1=990844&r2=990845&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Mon Aug 30
16:14:33 2010
@@ -72,7 +72,13 @@
</fix>
</changelog>
</subsection>
-</section>
+ <subsection name="Cluster">
+ <changelog>
+ <fix>
+ Add Null check when CHANGE_SESSION_ID message received. (kfujino)
+ </fix>
+ </changelog>
+ </subsection></section>
<section name="Tomcat 5.5.30 (jim)" rtext="released 2010-07-09">
<subsection name="General">
<changelog>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
