Author: kfujino
Date: Mon Dec 7 04:37:28 2015
New Revision: 1718248
URL: http://svn.apache.org/viewvc?rev=1718248&view=rev
Log:
Fix potential NPE in AbstractReplicatedMap.breakdown().
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1718248&r1=1718247&r2=1718248&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Mon Dec 7 04:37:28 2015
@@ -337,9 +337,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);
}
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1718248&r1=1718247&r2=1718248&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Mon Dec 7 04:37:28 2015
@@ -54,6 +54,14 @@
</add>
</changelog>
</subsection>
+ <subsection name="Tribes">
+ <changelog>
+ <fix>
+ Fix potential NPE in <code>AbstractReplicatedMap.breakdown()</code>.
+ (kfujino)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 8.0.30 (markt)" rtext="2015-12-06">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
