This is an automated email from the ASF dual-hosted git repository.
dcapwell pushed a commit to branch cassandra-2.2
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-2.2 by this push:
new b905397 3.x fails to start if commit log has range tombstones from a
column which is also deleted
b905397 is described below
commit b9053971ee9232b774c7175a6503f54947342266
Author: David Capwell <dcapw...@apple.com>
AuthorDate: Tue Jul 28 16:17:16 2020 -0700
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 1779e67..a9c037e 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,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
