natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix NPE in StreamTransferTask.createMessageForRetry() 

patch by Josh McKenzie; reviewed by Aleksey Yeschenko for CASSANDRA-7323
This commit is contained in:
Josh McKenzie 2014-05-30 23:49:09 +03:00 committed by Aleksey Yeschenko
parent 8480fa7be1
commit 886d9fce46
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
2.0.9
* Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
* Add conditional CREATE/DROP USER support (CASSANDRA-7264)
* Swap local and global default read repair chances (CASSANDRA-7320)
* Add missing iso8601 patterns for date strings (CASSANDRA-6973)

5
src/java/org/apache/cassandra/streaming/StreamTransferTask.java
View File

@ -99,11 +99,12 @@ public class StreamTransferTask extends StreamTask
return new ArrayList<>(files.values());
}
public OutgoingFileMessage createMessageForRetry(int sequenceNumber)
public synchronized OutgoingFileMessage createMessageForRetry(int sequenceNumber)
{
// remove previous time out task to be rescheduled later
ScheduledFuture future = timeoutTasks.get(sequenceNumber);
future.cancel(false);
if (future != null)
future.cancel(false);
return files.get(sequenceNumber);
}