From f36a518208fae1ca3af914f4a74ef4987238c14a Mon Sep 17 00:00:00 2001 From: Alex Petrov Date: Fri, 1 Dec 2023 13:03:12 +0100 Subject: [PATCH] Fix test Failure: MixedModeFrom3LoggedBatchTest.testSimpleStrategy The problem was that read command is deserialising serialisedAt epoch as null by default and not as Empty, causing NPE. Patch by Alex Petrov; reviewed by Sam Tunnicliffe CASSANDRA-19066. --- src/java/org/apache/cassandra/db/ReadCommand.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java/org/apache/cassandra/db/ReadCommand.java b/src/java/org/apache/cassandra/db/ReadCommand.java index 0f78bf8150..bb2b856d12 100644 --- a/src/java/org/apache/cassandra/db/ReadCommand.java +++ b/src/java/org/apache/cassandra/db/ReadCommand.java @@ -1132,8 +1132,8 @@ public abstract class ReadCommand extends AbstractReadQuery int digestVersion = isDigest ? (int)in.readUnsignedVInt() : 0; TableId tableId = TableId.deserialize(in); - Epoch schemaVersion = null; - if (version >= MessagingService.VERSION_50) + Epoch schemaVersion = Epoch.EMPTY; + if (version >= MessagingService.VERSION_51) schemaVersion = Epoch.serializer.deserialize(in); TableMetadata tableMetadata; try