You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by if...@apache.org on 2017/06/16 15:35:49 UTC
[2/3] cassandra git commit: Ninja: fix test failures after
CASSANDRA-13004.
Ninja: fix test failures after CASSANDRA-13004.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/90c5c8bf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90c5c8bf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90c5c8bf
Branch: refs/heads/trunk
Commit: 90c5c8bfecd69edb5f859e9ff2424930b1394b49
Parents: 5ea7f7c
Author: Alex Petrov <ol...@gmail.com>
Authored: Thu Jun 15 23:26:55 2017 +0200
Committer: Alex Petrov <ol...@gmail.com>
Committed: Fri Jun 16 17:29:24 2017 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/net/MessageIn.java | 2 +-
src/java/org/apache/cassandra/net/MessagingService.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/90c5c8bf/src/java/org/apache/cassandra/net/MessageIn.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/MessageIn.java b/src/java/org/apache/cassandra/net/MessageIn.java
index 0de9520..d06d515 100644
--- a/src/java/org/apache/cassandra/net/MessageIn.java
+++ b/src/java/org/apache/cassandra/net/MessageIn.java
@@ -105,7 +105,7 @@ public class MessageIn<T>
}
int payloadSize = in.readInt();
- IVersionedSerializer<T2> serializer = (IVersionedSerializer<T2>) MessagingService.verbSerializers.get(verb);
+ IVersionedSerializer<T2> serializer = (IVersionedSerializer<T2>) MessagingService.instance().verbSerializers.get(verb);
if (serializer instanceof MessagingService.CallbackDeterminedSerializer)
{
CallbackInfo callback = MessagingService.instance().getRegisteredCallback(id);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/90c5c8bf/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 032dc03..027e218 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -318,7 +318,7 @@ public final class MessagingService implements MessagingServiceMBean
* intermediary byte[] (See CASSANDRA-3716), we need to wire that up to the CallbackInfo object
* (see below).
*/
- public static final EnumMap<Verb, IVersionedSerializer<?>> verbSerializers = new EnumMap<Verb, IVersionedSerializer<?>>(Verb.class)
+ public final EnumMap<Verb, IVersionedSerializer<?>> verbSerializers = new EnumMap<Verb, IVersionedSerializer<?>>(Verb.class)
{{
put(Verb.REQUEST_RESPONSE, CallbackDeterminedSerializer.instance);
put(Verb.INTERNAL_RESPONSE, CallbackDeterminedSerializer.instance);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org