Updated Branches: refs/heads/trunk 3a3f612f8 -> 1af5865ed
fix merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1af5865e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1af5865e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1af5865e Branch: refs/heads/trunk Commit: 1af5865edc448a1ae1117f2254285ebc79ae6a68 Parents: 3a3f612 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Apr 22 09:52:32 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Apr 22 09:52:32 2013 -0500 ---------------------------------------------------------------------- .../apache/cassandra/service/StorageService.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1af5865e/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index b0d62dc..ae82cd6 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -3835,7 +3835,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE List<DecoratedKey> keys = new ArrayList<DecoratedKey>(); for (Table keyspace : Table.nonSystem()) { - for (Range<Token> range : getPrimaryRangesForEndpoint(keyspace.name, FBUtilities.getBroadcastAddress())) + for (Range<Token> range : getPrimaryRangesForEndpoint(keyspace.getName(), FBUtilities.getBroadcastAddress())) keys.addAll(keySamples(keyspace.getColumnFamilyStores(), range)); }
