svn commit: r1151025 - /cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java

[slebresne]

Author: slebresne
Date: Tue Jul 26 08:57:17 2011
New Revision: 1151025

URL: http://svn.apache.org/viewvc?rev=1151025&view=rev
Log:
Fix bad merge

Modified:
    
cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java

Modified: 
cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java?rev=1151025&r1=1151024&r2=1151025&view=diff
==============================================================================
--- 
cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java 
(original)
+++ 
cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java 
Tue Jul 26 08:57:17 2011
@@ -805,7 +805,8 @@ public class AntiEntropyService
                 ColumnFamilyStore cfstore = 
Table.open(tablename).getColumnFamilyStore(cfname);
                 try
                 {
-                    Collection<SSTableReader> sstables = cfstore.getSSTables();
+                    // We acquire references for transferSSTables
+                    Collection<SSTableReader> sstables = 
cfstore.markCurrentSSTablesReferenced();
                     Callback callback = new Callback();
                     // send ranges to the remote node
                     StreamOutSession outsession = 
StreamOutSession.create(tablename, remote, callback);