Fix ant eclipse-warnings in 2.2 Patch by Sam Tunnicliffe; reviewed by Tyler Hobbs for CASSANDRA-15258
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f6a1248 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f6a1248 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f6a1248 Branch: refs/heads/cassandra-3.9 Commit: 5f6a124853e55db9953e4e2fc717f9e9fe76d1d7 Parents: b9fc6a5 Author: Sam Tunnicliffe <s...@beobal.com> Authored: Wed Aug 24 13:02:44 2016 +0100 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Fri Aug 26 10:43:55 2016 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f6a1248/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java index 0835a28..644d1f5 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@ -901,7 +901,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean previousFlushFailure); logFlush(); Flush flush = new Flush(false); - ListenableFutureTask<?> flushTask = ListenableFutureTask.create(flush, null); + ListenableFutureTask<Void> flushTask = ListenableFutureTask.create(flush, null); flushExecutor.submit(flushTask); ListenableFutureTask<ReplayPosition> task = ListenableFutureTask.create(flush.postFlush); postFlushExecutor.submit(task); @@ -910,6 +910,9 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean ListenableFuture<ReplayPosition> future = // If either of the two tasks errors out, resulting future must also error out. // Combine the two futures and only return post-flush result after both have completed. + // Note that flushTask will always yield null, but Futures.allAsList is + // order preserving, which is why the transform function returns the result + // from item 1 in it's input list (i.e. what was yielded by task). Futures.transform(Futures.allAsList(flushTask, task), new Function<List<Object>, ReplayPosition>() {
