From c8c2044e40454530bbb14ffd07bfbef44f60ae16 Mon Sep 17 00:00:00 2001 From: Jonathan Ellis Date: Fri, 22 Mar 2013 19:52:52 -0500 Subject: [PATCH] prevent NPE when there is nothing to do --- .../org/apache/cassandra/db/compaction/CompactionManager.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java index 335f9038f3..867227f206 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java @@ -184,6 +184,9 @@ public class CompactionManager implements CompactionManagerMBean private void performAllSSTableOperation(final ColumnFamilyStore cfs, final AllSSTablesOperation operation) throws InterruptedException, ExecutionException { final Collection sstables = cfs.markAllCompacting(); + if (sstables == null) + return; + Callable runnable = new Callable() { public Object call() throws IOException