natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid NPE when generating scrub error message 

Patch by Stefania Alborghetti; reviewed by Tyler Hobbs for
CASSANDRA-9290
This commit is contained in:
Stefania Alborghetti 2015-05-05 11:18:23 -05:00 committed by Tyler Hobbs
parent a11bc78656
commit dbb36a476b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/org/apache/cassandra/db/compaction/Scrubber.java
View File

@ -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))));