Updated Branches:
  refs/heads/cassandra-1.2 b1d7405fd -> 7861f1731
  refs/heads/trunk 5556414c3 -> cfc163df0


we can actually give a ring for system tables that are not LocalStrategy


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7861f173
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7861f173
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7861f173

Branch: refs/heads/cassandra-1.2
Commit: 7861f1731feb18f8bd0e87963e53c89a2dac45ed
Parents: b1d7405
Author: Jonathan Ellis <[email protected]>
Authored: Wed Jun 19 00:40:20 2013 -0500
Committer: Jonathan Ellis <[email protected]>
Committed: Wed Jun 19 00:40:20 2013 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/StorageService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7861f173/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 49db272..e73aa2e 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1080,7 +1080,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
      */
     public List<TokenRange> describeRing(String keyspace) throws 
InvalidRequestException
     {
-        if (keyspace == null || 
!Schema.instance.getNonSystemTables().contains(keyspace))
+        if (keyspace == null || Table.open(keyspace).getReplicationStrategy() 
instanceof LocalStrategy)
             throw new InvalidRequestException("There is no ring for the 
keyspace: " + keyspace);
 
         List<TokenRange> ranges = new ArrayList<TokenRange>();

Reply via email to