svn commit: r1061525 - /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java

[jb...@apache.org]

Author: jbellis
Date: Thu Jan 20 21:31:26 2011
New Revision: 1061525

URL: http://svn.apache.org/viewvc?rev=1061525&view=rev
Log:
s/currentNode/currentOwner/

Modified:
    cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java

Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java?rev=1061525&r1=1061524&r2=1061525&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java Thu Jan 20 21:31:26 2011
@@ -622,22 +622,22 @@ public class StorageService implements I
             logger_.info("Node " + endpoint + " state jump to normal");
 
         // we don't want to update if this node is responsible for the token and it has a later startup time than endpoint.
-        InetAddress currentNode = tokenMetadata_.getEndpoint(token);
-        if (currentNode == null)
+        InetAddress currentOwner = tokenMetadata_.getEndpoint(token);
+        if (currentOwner == null)
         {
             logger_.debug("New node " + endpoint + " at token " + token);
             tokenMetadata_.updateNormalToken(token, endpoint);
             if (!isClientMode)
                 SystemTable.updateToken(endpoint, token);
         }
-        else if (endpoint.equals(currentNode))
+        else if (endpoint.equals(currentOwner))
         {
             // nothing to do
         }
-        else if (Gossiper.instance.compareEndpointStartup(endpoint, currentNode) > 0)
+        else if (Gossiper.instance.compareEndpointStartup(endpoint, currentOwner) > 0)
         {
             logger_.info(String.format("Nodes %s and %s have the same token %s.  %s is the new owner",
-                                       endpoint, currentNode, token, endpoint));
+                                       endpoint, currentOwner, token, endpoint));
             tokenMetadata_.updateNormalToken(token, endpoint);
             if (!isClientMode)
                 SystemTable.updateToken(endpoint, token);
@@ -645,7 +645,7 @@ public class StorageService implements I
         else
         {
             logger_.info(String.format("Nodes %s and %s have the same token %s.  Ignoring %s",
-                                       endpoint, currentNode, token, endpoint));
+                                       endpoint, currentOwner, token, endpoint));
         }
 
         if (pieces.length > 2)