Repository: incubator-ignite Updated Branches: refs/heads/ignite-80 11da6cd32 -> 329777c57
#IGNITE-80 Debug Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/329777c5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/329777c5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/329777c5 Branch: refs/heads/ignite-80 Commit: 329777c57efd290b9b655332e73261663385b5b4 Parents: 11da6cd Author: Alexey Goncharuk <[email protected]> Authored: Tue Apr 14 18:04:36 2015 -0700 Committer: Alexey Goncharuk <[email protected]> Committed: Tue Apr 14 18:04:36 2015 -0700 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheMvccManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/329777c5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java index 6574f6a..d6d7c4b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java @@ -239,7 +239,9 @@ public class GridCacheMvccManager extends GridCacheSharedManagerAdapter { */ @SuppressWarnings("unchecked") public Collection<GridCacheFuture<?>> activeFutures() { - return F.concat(false, F.flatCollections(futs.values()), (Collection)atomicFuts.values()); + Collection<GridCacheFuture<?>> atomics = (Collection)atomicFuts.values(); + + return F.concat(false, F.flatCollections(futs.values()), atomics); } /**
