Updated Branches: refs/heads/trunk ad52ce4fa -> 5b6a2b11b
fix NPE patch by David Alves for CASSANDRA-1123 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5b6a2b11 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b6a2b11 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b6a2b11 Branch: refs/heads/trunk Commit: 5b6a2b11bc8a9499ac012d745869e3d814cc91ad Parents: ad52ce4 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Aug 29 18:09:57 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Aug 29 18:10:05 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/db/ColumnFamilyStore.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b6a2b11/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java index 8ef686b..ef0e55d 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@ -1192,7 +1192,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean readStats.addNano(System.nanoTime() - start); } - logger.debug("Read {} columns", result.getColumnCount()); + logger.debug("Read {} columns", result == null ? 0 : result.getColumnCount()); return result; }
