You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kf...@apache.org on 2013/07/22 11:22:02 UTC

svn commit: r1505637 - /tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java

Author: kfujino
Date: Mon Jul 22 09:22:01 2013
New Revision: 1505637

URL: http://svn.apache.org/r1505637
Log:
Avoid NPE. If the channel fails to start, localMember is null.

Modified:
    tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java

Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=1505637&r1=1505636&r2=1505637&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Mon Jul 22 09:22:01 2013
@@ -875,6 +875,7 @@ public class SimpleTcpCluster extends Li
     }
 
     private void unregisterMember(Member member) {
+        if (member == null) return;
         ObjectName oname = memberOnameMap.remove(member);
         if (oname != null) {
             unregister(oname);



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org