Author: kfujino
Date: Mon Dec 7 04:36:12 2015
New Revision: 1718247
URL: http://svn.apache.org/viewvc?rev=1718247&view=rev
Log:
Fix potential NPE in AbstractReplicatedMap.breakdown().
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1718247&r1=1718246&r2=1718247&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Mon Dec 7 04:36:12 2015
@@ -336,9 +336,9 @@ public abstract class AbstractReplicated
if (this.rpcChannel != null) {
this.rpcChannel.breakdown();
}
- try {broadcast(MapMessage.MSG_STOP,false); }catch ( Exception ignore){}
- //cleanup
if (this.channel != null) {
+ try {broadcast(MapMessage.MSG_STOP,false); }catch ( Exception
ignore){}
+ //cleanup
this.channel.removeChannelListener(this);
this.channel.removeMembershipListener(this);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
