cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [2/3] git commit: fix assert for counters (CASSANDRA-6175)
Date Wed, 09 Oct 2013 21:55:45 GMT
fix assert for counters (CASSANDRA-6175)


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/95ac0de7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95ac0de7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/95ac0de7

Branch: refs/heads/trunk
Commit: 95ac0de7a7aafb9e9661ce87f04b4302e6c5e3be
Parents: 9644f09
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Wed Oct 9 16:55:25 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Wed Oct 9 16:55:33 2013 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/net/MessagingService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/95ac0de7/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java
index bda7038..b66c8a4 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -548,7 +548,7 @@ public final class MessagingService implements MessagingServiceMBean
 
     public int addCallback(IAsyncCallback cb, MessageOut<? extends IMutation> message,
InetAddress to, long timeout, ConsistencyLevel consistencyLevel)
     {
-        assert message.verb == Verb.MUTATION;
+        assert message.verb == Verb.MUTATION || message.verb == Verb.COUNTER_MUTATION;
         int messageId = nextId();
         CallbackInfo previous = callbacks.put(messageId, new WriteCallbackInfo(to, cb, message,
callbackDeserializers.get(message.verb), consistencyLevel), timeout);
         assert previous == null;


Mime
View raw message