From dbb36a476bc502708ee7443e41bba570bfd5633a Mon Sep 17 00:00:00 2001 From: Stefania Alborghetti Date: Tue, 5 May 2015 11:18:23 -0500 Subject: [PATCH] Avoid NPE when generating scrub error message Patch by Stefania Alborghetti; reviewed by Tyler Hobbs for CASSANDRA-9290 --- src/java/org/apache/cassandra/db/compaction/Scrubber.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/org/apache/cassandra/db/compaction/Scrubber.java b/src/java/org/apache/cassandra/db/compaction/Scrubber.java index 1752b21ef1..f04df27b56 100644 --- a/src/java/org/apache/cassandra/db/compaction/Scrubber.java +++ b/src/java/org/apache/cassandra/db/compaction/Scrubber.java @@ -187,7 +187,7 @@ public class Scrubber implements Closeable if (key == null) throw new IOError(new IOException("Unable to read row key from data file")); - if (!key.key.equals(currentIndexKey)) + if (currentIndexKey != null && !key.key.equals(currentIndexKey)) { throw new IOError(new IOException(String.format("Key from data file (%s) does not match key from index file (%s)", ByteBufferUtil.bytesToHex(key.key), ByteBufferUtil.bytesToHex(currentIndexKey))));