From fb8bf30c6d1b6f893a77a74b9e8b4223e5497dd4 Mon Sep 17 00:00:00 2001 From: David Capwell Date: Wed, 25 May 2022 11:39:41 -0700 Subject: [PATCH] jvm-dtest upgrade failures due to 3.x Ping not allowing serialize patch by David Capwell; reviewed by Jon Meredith for CASSANDRA-17660 --- .../org/apache/cassandra/net/PingMessage.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/java/org/apache/cassandra/net/PingMessage.java b/src/java/org/apache/cassandra/net/PingMessage.java index 8eaf23ed93..d3a4322a30 100644 --- a/src/java/org/apache/cassandra/net/PingMessage.java +++ b/src/java/org/apache/cassandra/net/PingMessage.java @@ -38,20 +38,28 @@ public class PingMessage { public static IVersionedSerializer serializer = new PingMessageSerializer(); + private final int connectionType; + + public PingMessage(int connectionType) + { + this.connectionType = connectionType; + } + public static class PingMessageSerializer implements IVersionedSerializer { - public void serialize(PingMessage t, DataOutputPlus out, int version) + @Override + public void serialize(PingMessage t, DataOutputPlus out, int version) throws IOException { - throw new UnsupportedOperationException(); + out.writeByte(t.connectionType); } + @Override public PingMessage deserialize(DataInputPlus in, int version) throws IOException { - // throw away the one byte of the payload - in.readByte(); - return new PingMessage(); + return new PingMessage(in.readByte()); } + @Override public long serializedSize(PingMessage t, int version) { return 1;