svn commit: r1149015 - in /cassandra/branches/cassandra-0.7: CHANGES.txt src/java/org/apache/cassandra/gms/EndpointState.java src/java/org/apache/cassandra/service/StorageService.java

[jb...@apache.org]

Author: jbellis
Date: Thu Jul 21 03:23:14 2011
New Revision: 1149015

URL: http://svn.apache.org/viewvc?rev=1149015&view=rev
Log:
fix hint replay
patch by brandonwilliams and jbellis for CASSANDRA-2928

Modified:
    cassandra/branches/cassandra-0.7/CHANGES.txt
    cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/EndpointState.java
    cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java

Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1149015&r1=1149014&r2=1149015&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Thu Jul 21 03:23:14 2011
@@ -4,6 +4,7 @@
  * support spaces in path to log4j configuration (CASSANDRA-2383)
  * avoid including inferred types in CF update (CASSANDRA-2809)
  * fix re-using index CF sstable names after drop/recreate (CASSANDRA-2872)
+ * fix hint replay (CASSANDRA-2928)
 
 
 0.7.7

Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/EndpointState.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/EndpointState.java?rev=1149015&r1=1149014&r2=1149015&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/EndpointState.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/EndpointState.java Thu Jul 21 03:23:14 2011
@@ -131,12 +131,12 @@ public class EndpointState
         isAGossiper_ = value;        
     }
 
-    public void setHasToken(boolean value)
+    void setHasToken(boolean value)
     {
         hasToken_ = value;
     }
 
-    public boolean hasToken()
+    boolean hasToken()
     {
         return hasToken_;
     }

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=1149015&r1=1149014&r2=1149015&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 Jul 21 03:23:14 2011
@@ -1127,7 +1127,7 @@ public class StorageService implements I
 
     public void onAlive(InetAddress endpoint, EndpointState state)
     {
-        if (!isClientMode && state.hasToken())
+        if (!isClientMode && StorageService.instance.getTokenMetadata().isMember(endpoint))
             deliverHints(endpoint);
     }