Author: kfujino
Date: Thu Feb 2 08:00:40 2017
New Revision: 1781354
URL: http://svn.apache.org/viewvc?rev=1781354&view=rev
Log:
Ensure that NoRpcChannelReply messages are not received on RpcCallback.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java?rev=1781354&r1=1781353&r2=1781354&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java
Thu Feb 2 08:00:40 2017
@@ -112,7 +112,8 @@ public class RpcChannel implements Chann
if ( rmsg.reply ) {
RpcCollector collector = responseMap.get(key);
if (collector == null) {
- callback.leftOver(rmsg.message, sender);
+ if (!(rmsg instanceof RpcMessage.NoRpcChannelReply))
+ callback.leftOver(rmsg.message, sender);
} else {
synchronized (collector) {
//make sure it hasn't been removed
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1781354&r1=1781353&r2=1781354&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Thu Feb 2 08:00:40 2017
@@ -126,6 +126,10 @@
When a PING message that beyond the time-out period has been received,
make sure that valid member is added to the map membership. (kfujino)
</fix>
+ <fix>
+ Ensure that <code>NoRpcChannelReply</code> messages are not received on
+ <code>RpcCallback</code>. (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
