From: kfujino <kfujino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 26 May 2010 11:58:55 +0000 (+0000)
Subject: Fix for BZ49343.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=e0338772c31fc078e4bc28d0cee778a2be0d5414;p=tomcat7.0

Fix for BZ49343.
When ChannelException is thrown, remove listener from channel.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@948402 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
index 9c853f6f0..05e2e71cb 100644
--- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
+++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
@@ -227,6 +227,10 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements
             broadcast(MapMessage.MSG_START, true);
         } catch (ChannelException x) {
             log.warn("Unable to send map start message.");
+            // remove listener from channel
+            this.channel.removeChannelListener(this.rpcChannel);
+            this.channel.removeChannelListener(this);
+            this.channel.removeMembershipListener(this);
             throw new RuntimeException("Unable to start replicated map.",x);
         }
     }