Return-Path: 
 <commits-return-13784-apmail-cassandra-commits-archive=cassandra.apache.org@cassandra.apache.org>
Delivered-To: apmail-cassandra-commits-archive@www.apache.org
Received: (qmail 81781 invoked from network); 18 May 2010 21:53:43 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 18 May 2010 21:53:43 -0000
Received: (qmail 94322 invoked by uid 500); 18 May 2010 21:53:43 -0000
Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org
Received: (qmail 94304 invoked by uid 500); 18 May 2010 21:53:43 -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 94296 invoked by uid 99); 18 May 2010 21:53:43 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 May 2010 21:53:43 +0000
X-ASF-Spam-Status: No, hits=-1427.0 required=10.0
	tests=ALL_TRUSTED,AWL
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 May 2010 21:53:42 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 2AEDE23888DD; Tue, 18 May 2010 21:53:22 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r945912 -
 /cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterShardStrategy.java
Date: Tue, 18 May 2010 21:53:22 -0000
To: commits@cassandra.apache.org
From: jbellis@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100518215322.2AEDE23888DD@eris.apache.org>

Author: jbellis
Date: Tue May 18 21:53:21 2010
New Revision: 945912

URL: http://svn.apache.org/viewvc?rev=945912&view=rev
Log:
simplify out doneDataCenterIter variable
patch by jbellis; reviewed by Jeremy Hanna for CASSANDRA-1103

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterShardStrategy.java

Modified: cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterShardStrategy.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterShardStrategy.java?rev=945912&r1=945911&r2=945912&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterShardStrategy.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterShardStrategy.java Tue May 18 21:53:21 2010
@@ -135,11 +135,11 @@ public class DatacenterShardStrategy ext
             int replicas = getReplicationFactor(dc, table);
             List<Token> tokens = dcTokens.get(dc);
             boolean bOtherRack = false;
-            boolean doneDataCenterItr;
             // Add the node at the index by default
             Iterator<Token> iter = TokenMetadata.ringIterator(tokens, searchToken);
-            InetAddress primaryHost = metadata.getEndpoint(iter.next());
-            endpoints.add(primaryHost);
+            InetAddress initialDCHost = metadata.getEndpoint(iter.next());
+            assert initialDCHost != null;
+            endpoints.add(initialDCHost);
 
             while (endpoints.size() < replicas && iter.hasNext())
             {
@@ -150,22 +150,18 @@ public class DatacenterShardStrategy ext
                     endpoints.add(endPointOfInterest);
                     continue;
                 }
-                else
-                {
-                    doneDataCenterItr = true;
-                }
 
                 // Now try to find one on a different rack
                 if (!bOtherRack)
                 {
-                    if (!snitch.getRack(primaryHost).equals(snitch.getRack(endPointOfInterest)))
+                    if (!snitch.getRack(initialDCHost).equals(snitch.getRack(endPointOfInterest)))
                     {
                         endpoints.add(metadata.getEndpoint(t));
                         bOtherRack = true;
                     }
                 }
                 // If both already found exit loop.
-                if (doneDataCenterItr && bOtherRack)
+                if (bOtherRack)
                     break;
             }