You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2015/09/02 07:23:21 UTC
[1/2] cassandra git commit: ninja-fix to make an EnumSet a static and
final field, not an instance field.
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 02e5478f0 -> 45dd5d178
ninja-fix to make an EnumSet a static and final field, not an instance field.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c457dce6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c457dce6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c457dce6
Branch: refs/heads/cassandra-2.2
Commit: c457dce647c1b1b16ab95a920ab12aa36a55cb7e
Parents: 2267d79
Author: Jason Brown <ja...@gmail.com>
Authored: Tue Sep 1 22:19:25 2015 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Tue Sep 1 22:19:25 2015 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/net/MessageDeliveryTask.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c457dce6/src/java/org/apache/cassandra/net/MessageDeliveryTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/MessageDeliveryTask.java b/src/java/org/apache/cassandra/net/MessageDeliveryTask.java
index 06caf94..a16f53f 100644
--- a/src/java/org/apache/cassandra/net/MessageDeliveryTask.java
+++ b/src/java/org/apache/cassandra/net/MessageDeliveryTask.java
@@ -78,7 +78,7 @@ public class MessageDeliveryTask implements Runnable
Gossiper.instance.setLastProcessedMessageAt(constructionTime);
}
- EnumSet<MessagingService.Verb> GOSSIP_VERBS = EnumSet.of(MessagingService.Verb.GOSSIP_DIGEST_ACK,
+ 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);
}
[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ja...@apache.org.
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/cassandra-2.2
Commit: 45dd5d178f0c817c2ef1908c8b8c1563a2bf3cf1
Parents: 02e5478 c457dce
Author: Jason Brown <ja...@gmail.com>
Authored: Tue Sep 1 22:23:04 2015 -0700
Committer: Jason Brown <ja...@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);
}