You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/02/28 17:37:49 UTC

git commit: Revert "update hasSameReplication to use the List passed to it"

Updated Branches:
  refs/heads/cassandra-1.1.0 0d40edb40 -> 40617c8be


Revert "update hasSameReplication to use the List passed to it"


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

Branch: refs/heads/cassandra-1.1.0
Commit: 40617c8be6ea85287f1c75d07c87e8315aa1ed4c
Parents: 0d40edb
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Feb 28 10:37:32 2012 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Feb 28 10:37:32 2012 -0600

----------------------------------------------------------------------
 .../apache/cassandra/service/StorageService.java   |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/40617c8b/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 1022631..4ea8ed1 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2668,11 +2668,10 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe
     {
         if (list.isEmpty())
             return false;
-        
         for (int i = 0; i < list.size() -1; i++)
         {
-            KSMetaData ksm1 = Schema.instance.getKSMetaData(list.get(i));
-            KSMetaData ksm2 = Schema.instance.getKSMetaData(list.get(i + 1));
+            KSMetaData ksm1 = Schema.instance.getKSMetaData(Schema.instance.getNonSystemTables().get(i));
+            KSMetaData ksm2 = Schema.instance.getKSMetaData(Schema.instance.getNonSystemTables().get(i + 1));
             if (!ksm1.strategyClass.equals(ksm2.strategyClass) ||
                     !Iterators.elementsEqual(ksm1.strategyOptions.entrySet().iterator(),
                                              ksm2.strategyOptions.entrySet().iterator()))