Repository: incubator-ignite Updated Branches: refs/heads/sprint-1 11f992015 -> 92e2bc0e1
fixed compound future Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/92e2bc0e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/92e2bc0e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/92e2bc0e Branch: refs/heads/sprint-1 Commit: 92e2bc0e1ff529945a4abafef19dc7c630ad7682 Parents: 11f9920 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Sun Feb 15 20:11:03 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Sun Feb 15 20:11:03 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/util/future/GridCompoundFuture.java | 2 ++ .../internal/util/future/GridCompoundIdentityFuture.java | 10 ---------- 2 files changed, 2 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92e2bc0e/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java index f8ffcff..0750259 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java @@ -103,6 +103,8 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> { this.rdc = rdc; addAll(futs); + + markInitialized(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92e2bc0e/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundIdentityFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundIdentityFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundIdentityFuture.java index b5e3294..89d6920 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundIdentityFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundIdentityFuture.java @@ -51,16 +51,6 @@ public class GridCompoundIdentityFuture<T> extends GridCompoundFuture<T, T> { super(ctx, rdc); } - /** - * @param ctx Context. - * @param rdc Reducer to add. - * @param futs Futures to add. - */ - public GridCompoundIdentityFuture(GridKernalContext ctx, @Nullable IgniteReducer<T, T> rdc, - @Nullable Iterable<IgniteInternalFuture<T>> futs) { - super(ctx, rdc, futs); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(GridCompoundIdentityFuture.class, this, super.toString());
