Return-Path: 
 <commits-return-76201-apmail-cassandra-commits-archive=cassandra.apache.org@cassandra.apache.org>
X-Original-To: apmail-cassandra-commits-archive@www.apache.org
Delivered-To: apmail-cassandra-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id B662A104A0
	for <apmail-cassandra-commits-archive@www.apache.org>;
 Wed, 19 Jun 2013 15:24:25 +0000 (UTC)
Received: (qmail 40169 invoked by uid 500); 19 Jun 2013 15:24:25 -0000
Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org
Received: (qmail 40075 invoked by uid 500); 19 Jun 2013 15:24:24 -0000
Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cassandra.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cassandra.apache.org>
List-Post: <mailto:commits@cassandra.apache.org>
List-Id: <commits.cassandra.apache.org>
Reply-To: dev@cassandra.apache.org
Delivered-To: mailing list commits@cassandra.apache.org
Received: (qmail 40044 invoked by uid 99); 19 Jun 2013 15:24:24 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Jun 2013 15:24:24 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id DFD5224703; Wed, 19 Jun 2013 15:24:23 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: jbellis@apache.org
To: commits@cassandra.apache.org
Date: Wed, 19 Jun 2013 15:24:23 -0000
Message-Id: <ab947fc07af047119022d62069bdcef1@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/3] git commit: we can actually give a ring for system tables that
 are not LocalStrategy

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 <jbellis@apache.org>
Authored: Wed Jun 19 00:40:20 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
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>();