diff --git a/src/java/org/apache/cassandra/db/view/TableViews.java b/src/java/org/apache/cassandra/db/view/TableViews.java index 8e64ef3589..3725603e43 100644 --- a/src/java/org/apache/cassandra/db/view/TableViews.java +++ b/src/java/org/apache/cassandra/db/view/TableViews.java @@ -89,6 +89,9 @@ public class TableViews extends AbstractCollection public Iterable allViewsCfs() { + if (views.isEmpty()) + return Collections.emptyList(); + Keyspace keyspace = Keyspace.open(baseTableMetadata.keyspace); return Iterables.transform(views, view -> keyspace.getColumnFamilyStore(view.getDefinition().name())); }