Author: kfujino
Date: Wed Dec 16 04:50:52 2015
New Revision: 1720291
URL: http://svn.apache.org/viewvc?rev=1720291&view=rev
Log:
In order to avoid that the heartbeat thread and the background thread to run
Channel.heartbeat simultaneously, if heartbeatBackgroundEnabled of
SimpleTcpCluster set to true, ensure that the heartbeat thread does not start.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/trunk/webapps/docs/changelog.xml
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=1720291&r1=1720290&r2=1720291&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Wed Dec
16 04:50:52 2015
@@ -567,6 +567,7 @@ public class SimpleTcpCluster extends Li
channel.addInterceptor(new MessageDispatch15Interceptor());
channel.addInterceptor(new TcpFailureDetector());
}
+ if (heartbeatBackgroundEnabled) channel.setHeartbeat(false);
}
/**
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1720291&r1=1720290&r2=1720291&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Dec 16 04:50:52 2015
@@ -191,6 +191,13 @@
Fix potential integer overflow in <code>DeltaSession</code>.
Reported by coverity scan. (fschumacher)
</fix>
+ <fix>
+ In order to avoid that the heartbeat thread and the background thread
to
+ run <code>Channel.heartbeat</code> simultaneously, if
+ <code>heartbeatBackgroundEnabled</code> of
<code>SimpleTcpCluster</code>
+ set to <code>true</code>, ensure that the heartbeat thread does not
+ start. (kfujino)
+ </fix>
</changelog>
</subsection>
<subsection name="WebSocket">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
