Author: kfujino
Date: Tue Sep 7 05:15:27 2010
New Revision: 993214
URL: http://svn.apache.org/viewvc?rev=993214&view=rev
Log:
Add Null check when CHANGE_SESSION_ID message received.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.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=993214&r1=993213&r2=993214&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Sep 7 05:15:27 2010
@@ -153,11 +153,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kfujino, rjung
-1:
-* Add Null check when CHANGE_SESSION_ID message received.
- http://svn.apache.org/viewvc?rev=982877&view=rev
- +1: kfujino, kkolinko, rjung
- -1:
-
* Switch to using ecj.jar directly (smaller download, simpler build, same
result)
http://people.apache.org/~markt/patches/2010-08-23-ecj-tc6.patch
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=993214&r1=993213&r2=993214&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
Tue Sep 7 05:15:27 2010
@@ -1618,13 +1618,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/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=993214&r1=993213&r2=993214&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Sep 7 05:15:27 2010
@@ -62,6 +62,9 @@
<bug>49343</bug>: When ChannelException is thrown, remove listener
from
channel. (kfujino)
</fix>
+ <fix>
+ Add Null check when CHANGE_SESSION_ID message received. (kfujino)
+ </fix>
</changelog>
</subsection>
<subsection name="Webapps">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
