Author: kfujino
Date: Fri Aug 6 05:56:21 2010
New Revision: 982877
URL: http://svn.apache.org/viewvc?rev=982877&view=rev
Log:
Add Null check when CHANGE_SESSION_ID message received.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=982877&r1=982876&r2=982877&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Fri Aug
6 05:56:21 2010
@@ -1436,13 +1436,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/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=982877&r1=982876&r2=982877&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Aug 6 05:56:21 2010
@@ -63,6 +63,9 @@
If you send session to only same domain, use DomainFilterInterceptor.
(kfujino)
</fix>
+ <fix>
+ Add Null check when CHANGE_SESSION_ID message received. (kfujino)
+ </fix>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
