Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: src/java/org/apache/cassandra/net/MessageDeliveryTask.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/45dd5d17 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/45dd5d17 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/45dd5d17 Branch: refs/heads/trunk Commit: 45dd5d178f0c817c2ef1908c8b8c1563a2bf3cf1 Parents: 02e5478 c457dce Author: Jason Brown <jasedbr...@gmail.com> Authored: Tue Sep 1 22:23:04 2015 -0700 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Tue Sep 1 22:23:04 2015 -0700 ---------------------------------------------------------------------- src/java/org/apache/cassandra/net/MessageDeliveryTask.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/45dd5d17/src/java/org/apache/cassandra/net/MessageDeliveryTask.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/net/MessageDeliveryTask.java index 7f30797,a16f53f..0ff0319 --- a/src/java/org/apache/cassandra/net/MessageDeliveryTask.java +++ b/src/java/org/apache/cassandra/net/MessageDeliveryTask.java @@@ -85,17 -78,7 +85,17 @@@ public class MessageDeliveryTask implem Gossiper.instance.setLastProcessedMessageAt(constructionTime); } + private void handleFailure(Throwable t) + { + if (message.doCallbackOnFailure()) + { + MessageOut response = new MessageOut(MessagingService.Verb.INTERNAL_RESPONSE) + .withParameter(MessagingService.FAILURE_RESPONSE_PARAM, MessagingService.ONE_BYTE); + MessagingService.instance().sendReply(response, id, message.from); + } + } + - EnumSet<MessagingService.Verb> GOSSIP_VERBS = EnumSet.of(MessagingService.Verb.GOSSIP_DIGEST_ACK, - MessagingService.Verb.GOSSIP_DIGEST_ACK2, - MessagingService.Verb.GOSSIP_DIGEST_SYN); + private static final EnumSet<MessagingService.Verb> GOSSIP_VERBS = EnumSet.of(MessagingService.Verb.GOSSIP_DIGEST_ACK, - MessagingService.Verb.GOSSIP_DIGEST_ACK2, - MessagingService.Verb.GOSSIP_DIGEST_SYN); ++ MessagingService.Verb.GOSSIP_DIGEST_ACK2, ++ MessagingService.Verb.GOSSIP_DIGEST_SYN); }