You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2010/12/28 22:52:35 UTC

svn commit: r1053455 - /cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/TokenMetadata.java

Author: brandonwilliams
Date: Tue Dec 28 21:52:35 2010
New Revision: 1053455

URL: http://svn.apache.org/viewvc?rev=1053455&view=rev
Log:
newmap -> priorMap

Modified:
    cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/TokenMetadata.java

Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/TokenMetadata.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/TokenMetadata.java?rev=1053455&r1=1053454&r2=1053455&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/TokenMetadata.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/TokenMetadata.java Tue Dec 28 21:52:35 2010
@@ -325,9 +325,9 @@ public class TokenMetadata
         if (map == null)
         {
             map = HashMultimap.create();
-            Multimap<Range, InetAddress> newmap = pendingRanges.putIfAbsent(table, map);
-            if (newmap != null)
-                map = newmap;
+            Multimap<Range, InetAddress> priorMap = pendingRanges.putIfAbsent(table, map);
+            if (priorMap != null)
+                map = priorMap;
         }
         return map;
     }