diff --git a/src/java/org/apache/cassandra/service/accord/serializers/CommandSerializers.java b/src/java/org/apache/cassandra/service/accord/serializers/CommandSerializers.java index 497fa11a29..d25d5cffa2 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/CommandSerializers.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/CommandSerializers.java @@ -57,6 +57,7 @@ public class CommandSerializers public static final TimestampSerializer timestamp = new TimestampSerializer<>(Timestamp::fromBits); public static final IVersionedSerializer nullableTimestamp = NullableSerializer.wrap(timestamp); public static final TimestampSerializer ballot = new TimestampSerializer<>(Ballot::fromBits); + public static final IVersionedSerializer nullableBallot = NullableSerializer.wrap(ballot); public static final EnumSerializer kind = new EnumSerializer<>(Txn.Kind.class); public static class TimestampSerializer implements IVersionedSerializer diff --git a/src/java/org/apache/cassandra/service/accord/serializers/RecoverySerializers.java b/src/java/org/apache/cassandra/service/accord/serializers/RecoverySerializers.java index b4111320d0..5d3a5a93da 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/RecoverySerializers.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/RecoverySerializers.java @@ -81,7 +81,7 @@ public class RecoverySerializers { void serializeNack(RecoverNack recoverNack, DataOutputPlus out, int version) throws IOException { - CommandSerializers.ballot.serialize(recoverNack.supersededBy, out, version); + CommandSerializers.nullableBallot.serialize(recoverNack.supersededBy, out, version); } void serializeOk(RecoverOk recoverOk, DataOutputPlus out, int version) throws IOException @@ -124,7 +124,7 @@ public class RecoverySerializers { boolean isOk = in.readBoolean(); if (!isOk) - return deserializeNack(CommandSerializers.ballot.deserialize(in, version), in, version); + return deserializeNack(CommandSerializers.nullableBallot.deserialize(in, version), in, version); return deserializeOk(CommandSerializers.txnId.deserialize(in, version), CommandSerializers.status.deserialize(in, version), @@ -143,7 +143,7 @@ public class RecoverySerializers long serializedNackSize(RecoverNack recoverNack, int version) { - return CommandSerializers.ballot.serializedSize(recoverNack.supersededBy, version); + return CommandSerializers.nullableBallot.serializedSize(recoverNack.supersededBy, version); } long serializedOkSize(RecoverOk recoverOk, int version)