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

Merge branch 'cassandra-2.0' into cassandra-2.1 

Conflicts:
	CHANGES.txt
This commit is contained in:
Aleksey Yeschenko 2014-05-30 23:51:58 +03:00
parent 9141f7ba73 886d9fce46
commit 90477c3107
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -1,4 +1,6 @@
2.1.0
Merged from 2.0:
* Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
Merged from 1.2:
* Use LOCAL_ONE for non-superuser auth queries (CASSANDRA-7328)

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);
}