Author: kfujino
Date: Mon Feb 4 04:49:31 2019
New Revision: 1852868
URL: http://svn.apache.org/viewvc?rev=1852868&view=rev
Log:
Remove unnecessary shutdown for executor.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=1852868&r1=1852867&r2=1852868&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
Mon Feb 4 04:49:31 2019
@@ -320,7 +320,6 @@ public class McastServiceImpl extends Me
startLevel = (startLevel & (~level));
//we're shutting down, send a shutdown message and close the socket
if ( startLevel == 0 ) {
- executor.shutdownNow();
//send a stop message
member.setCommand(Member.SHUTDOWN_PAYLOAD);
send(false);
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java?rev=1852868&r1=1852867&r2=1852868&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
Mon Feb 4 04:49:31 2019
@@ -112,7 +112,6 @@ public class StaticMembershipProvider ex
}
startLevel = (startLevel & (~level));
if ( startLevel == 0 ) {
- executor.shutdownNow();
running = false;
if (thread != null) {
thread.interrupt();
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1852868&r1=1852867&r2=1852868&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Feb 4 04:49:31 2019
@@ -252,6 +252,9 @@
<fix>
Never expire the local member from a Membership. (remm)
</fix>
+ <fix>
+ Remove unnecessary shutdown for executor. (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
