svn commit: r898819 - in /incubator/cassandra/branches/cassandra-0.5: CHANGES.txt src/java/org/apache/cassandra/io/Streaming.java

[jbellis]

Author: jbellis
Date: Wed Jan 13 16:06:36 2010
New Revision: 898819

URL: http://svn.apache.org/viewvc?rev=898819&view=rev
Log:
avoid attempting to delete temporary bootstrap files twice.  patch by jbellis; 
tested by Brandon Williams for CASSANDRA-681

Modified:
    incubator/cassandra/branches/cassandra-0.5/CHANGES.txt
    
incubator/cassandra/branches/cassandra-0.5/src/java/org/apache/cassandra/io/Streaming.java

Modified: incubator/cassandra/branches/cassandra-0.5/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.5/CHANGES.txt?rev=898819&r1=898818&r2=898819&view=diff
==============================================================================
--- incubator/cassandra/branches/cassandra-0.5/CHANGES.txt (original)
+++ incubator/cassandra/branches/cassandra-0.5/CHANGES.txt Wed Jan 13 16:06:36 
2010
@@ -1,3 +1,7 @@
+0.5.0 final
+ * avoid attempting to delete temporary bootstrap files twice (CASSANDRA-681)
+
+
 0.5.0 RC3
  * commit the correct version of the patch for CASSANDRA-663
 

Modified: 
incubator/cassandra/branches/cassandra-0.5/src/java/org/apache/cassandra/io/Streaming.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.5/src/java/org/apache/cassandra/io/Streaming.java?rev=898819&r1=898818&r2=898819&view=diff
==============================================================================
--- 
incubator/cassandra/branches/cassandra-0.5/src/java/org/apache/cassandra/io/Streaming.java
 (original)
+++ 
incubator/cassandra/branches/cassandra-0.5/src/java/org/apache/cassandra/io/Streaming.java
 Wed Jan 13 16:06:36 2010
@@ -118,10 +118,7 @@
         {
             logger.info("Waiting for transfer to " + target + " to complete");
             StreamManager.instance(target).waitForStreamCompletion();
-            for (SSTableReader sstable : sstables)
-            {
-                sstable.markCompacted();
-            }
+            // (StreamManager will delete the streamed file on completion.)
             logger.info("Done with transfer to " + target);
         }
     }