Author: kfujino Date: Fri Jul 23 02:34:51 2010 New Revision: 966937 URL: http://svn.apache.org/viewvc?rev=966937&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49343 When ChannelException is thrown, remove listener from channel.
Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=966937&r1=966936&r2=966937&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jul 23 02:34:51 2010 @@ -95,22 +95,6 @@ PATCHES PROPOSED TO BACKPORT: cause confusion. I'd prefer not to invent a new name, but mention the one that we already have when documenting virtualClasspath. -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49343 - When ChannelException is thrown, remove listener from channel. - http://svn.apache.org/viewvc?view=revision&revision=948402 - +1: kfujino, kkolinko, markt - -1: - kkolinko: - Maybe "this.channel.removeChannelListener(this.rpcChannel);" call - has to be replaced with "this.rpcChannel.breakdown();" - - Additional patch. - "this.channel.removeChannelListener(this.rpcChannel);" call is - replaced with "this.rpcChannel.breakdown();". - http://svn.apache.org/viewvc?view=revision&revision=950922 - +1: kfujino, kkolinko, markt - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49099 Provide a mechanism for including requests rejected by the CoyoteAdapter in the standard access log Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=966937&r1=966936&r2=966937&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java Fri Jul 23 02:34:51 2010 @@ -227,6 +227,10 @@ public abstract class AbstractReplicated broadcast(MapMessage.MSG_START, true); } catch (ChannelException x) { log.warn("Unable to send map start message."); + // remove listener from channel + this.rpcChannel.breakdown(); + this.channel.removeChannelListener(this); + this.channel.removeMembershipListener(this); throw new RuntimeException("Unable to start replicated map.",x); } } Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=966937&r1=966936&r2=966937&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Jul 23 02:34:51 2010 @@ -49,6 +49,14 @@ </fix> </changelog> </subsection> + <subsection name="Cluster"> + <changelog> + <fix> + <bug>49343</bug>: When ChannelException is thrown, remove listener from + channel. (kfujino) + </fix> + </changelog> + </subsection> <subsection name="Other"> <changelog> <fix> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org