Return-Path: 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 31CDC1064D for ; Tue, 26 Nov 2013 20:28:26 +0000 (UTC) Received: (qmail 3468 invoked by uid 500); 26 Nov 2013 20:28:26 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 3438 invoked by uid 500); 26 Nov 2013 20:28:26 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 3428 invoked by uid 99); 26 Nov 2013 20:28:25 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Nov 2013 20:28:25 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B9F28918EE2; Tue, 26 Nov 2013 20:28:25 +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: Tue, 26 Nov 2013 20:28:25 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/6] git commit: fix build Updated Branches: refs/heads/cassandra-1.2 8145c8356 -> cc8a05ab6 refs/heads/cassandra-2.0 504f66dc1 -> e68d466eb refs/heads/trunk 1bfd062fd -> c384d31b8 fix build Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cc8a05ab Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc8a05ab Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cc8a05ab Branch: refs/heads/cassandra-1.2 Commit: cc8a05ab6ac22f019e60ec79c11338d4c77d49c3 Parents: 8145c83 Author: Jonathan Ellis Authored: Tue Nov 26 14:27:52 2013 -0600 Committer: Jonathan Ellis Committed: Tue Nov 26 14:27:52 2013 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/Table.java | 3 --- 1 file changed, 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc8a05ab/src/java/org/apache/cassandra/db/Table.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/Table.java b/src/java/org/apache/cassandra/db/Table.java index a851eee..e6df982 100644 --- a/src/java/org/apache/cassandra/db/Table.java +++ b/src/java/org/apache/cassandra/db/Table.java @@ -275,9 +275,6 @@ public class Table public void createReplicationStrategy(KSMetaData ksm) { - if (replicationStrategy != null) - StorageService.instance.getTokenMetadata().unregister(replicationStrategy); - replicationStrategy = AbstractReplicationStrategy.createReplicationStrategy(ksm.name, ksm.strategyClass, StorageService.instance.getTokenMetadata(),