Author: kfujino
Date: Wed Jul 25 08:09:59 2018
New Revision: 1836609
URL: http://svn.apache.org/viewvc?rev=1836609&view=rev
Log:
Correct the stop order of the Channel components.
It stops in the reverse order to that at startup.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=1836609&r1=1836608&r2=1836609&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
Wed Jul 25 08:09:59 2018
@@ -221,25 +221,24 @@ public class ChannelCoordinator extends
if (svc == 0 ) return;//nothing to stop
boolean valid = false;
- if ( Channel.SND_RX_SEQ==(svc & Channel.SND_RX_SEQ) ) {
- clusterReceiver.stop();
- clusterReceiver.setMessageListener(null);
- valid = true;
- }
- if ( Channel.SND_TX_SEQ==(svc & Channel.SND_TX_SEQ) ) {
- clusterSender.stop();
+ if ( Channel.MBR_TX_SEQ==(svc & Channel.MBR_TX_SEQ) ) {
+ membershipService.stop(MembershipService.MBR_TX);
valid = true;
}
-
if ( Channel.MBR_RX_SEQ==(svc & Channel.MBR_RX_SEQ) ) {
membershipService.stop(MembershipService.MBR_RX);
membershipService.setMembershipListener(null);
valid = true;
}
- if ( Channel.MBR_TX_SEQ==(svc & Channel.MBR_TX_SEQ) ) {
+ if ( Channel.SND_TX_SEQ==(svc & Channel.SND_TX_SEQ) ) {
+ clusterSender.stop();
+ valid = true;
+ }
+ if ( Channel.SND_RX_SEQ==(svc & Channel.SND_RX_SEQ) ) {
+ clusterReceiver.stop();
+ clusterReceiver.setMessageListener(null);
valid = true;
- membershipService.stop(MembershipService.MBR_TX);
}
if ( !valid) {
throw new
IllegalArgumentException(sm.getString("channelCoordinator.invalid.startLevel"));
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1836609&r1=1836608&r2=1836609&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Jul 25 08:09:59 2018
@@ -132,6 +132,10 @@
Ensures that the specified <code>rxBufSize</code> is correctly set to
receiver buffer size. (kfujino)
</fix>
+ <fix>
+ Correct the stop order of the Channel components. It stops in the
+ reverse order to that at startup. (kfujino)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
