From b9053971ee9232b774c7175a6503f54947342266 Mon Sep 17 00:00:00 2001
From: David Capwell <dcapwell@apple.com>
Date: Tue, 28 Jul 2020 16:17:16 -0700
Subject: [PATCH] 3.x fails to start if commit log has range tombstones from a
 column which is also deleted

patch by David Capwell; reviewed by Blake Eggleston,Brandon Williams for CASSANDRA-15970
---
 src/java/org/apache/cassandra/utils/ByteBufferUtil.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/java/org/apache/cassandra/utils/ByteBufferUtil.java b/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
index 1779e67639..a9c037e8d9 100644
--- a/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
+++ b/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
@@ -432,6 +432,8 @@ public class ByteBufferUtil
             return ByteBufferUtil.bytes((InetAddress) obj);
         else if (obj instanceof String)
             return ByteBufferUtil.bytes((String) obj);
+        else if (obj instanceof ByteBuffer)
+            return (ByteBuffer) obj;
         else
             throw new IllegalArgumentException(String.format("Cannot convert value %s of type %s",
                                                              obj,