# ignite-579 formatting
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/198a00eb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/198a00eb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/198a00eb Branch: refs/heads/ignite-497 Commit: 198a00eb20c747d523aeb5bf4e50d9b657539cbd Parents: c066272 Author: sboikov <sboi...@gridgain.com> Authored: Thu Mar 26 10:14:24 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Mar 26 10:14:24 2015 +0300 ---------------------------------------------------------------------- .../dht/GridPartitionedGetFuture.java | 18 ++++++++++-------- .../distributed/near/GridNearGetFuture.java | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/198a00eb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java index bb6d9e8..9b23dd2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java @@ -614,18 +614,20 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M updTopVer, e); - cctx.affinity().affinityReadyFuture(updTopVer).listen(new CI1<IgniteInternalFuture<AffinityTopologyVersion>>() { - @Override public void apply(IgniteInternalFuture<AffinityTopologyVersion> fut) { - if (timeout.finish()) { - cctx.kernalContext().timeout().removeTimeoutObject(timeout); + cctx.affinity().affinityReadyFuture(updTopVer).listen( + new CI1<IgniteInternalFuture<AffinityTopologyVersion>>() { + @Override public void apply(IgniteInternalFuture<AffinityTopologyVersion> fut) { + if (timeout.finish()) { + cctx.kernalContext().timeout().removeTimeoutObject(timeout); - // Remap. - map(keys.keySet(), F.t(node, keys), updTopVer); + // Remap. + map(keys.keySet(), F.t(node, keys), updTopVer); - onDone(Collections.<K, V>emptyMap()); + onDone(Collections.<K, V>emptyMap()); + } } } - }); + ); cctx.kernalContext().timeout().addTimeoutObject(timeout); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/198a00eb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java index 0fe304d..a0e0fb4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java @@ -732,18 +732,20 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma updTopVer, e); - cctx.affinity().affinityReadyFuture(updTopVer).listen(new CI1<IgniteInternalFuture<AffinityTopologyVersion>>() { - @Override public void apply(IgniteInternalFuture<AffinityTopologyVersion> fut) { - if (timeout.finish()) { - cctx.kernalContext().timeout().removeTimeoutObject(timeout); + cctx.affinity().affinityReadyFuture(updTopVer).listen( + new CI1<IgniteInternalFuture<AffinityTopologyVersion>>() { + @Override public void apply(IgniteInternalFuture<AffinityTopologyVersion> fut) { + if (timeout.finish()) { + cctx.kernalContext().timeout().removeTimeoutObject(timeout); - // Remap. - map(keys.keySet(), F.t(node, keys), updTopVer); + // Remap. + map(keys.keySet(), F.t(node, keys), updTopVer); - onDone(Collections.<K, V>emptyMap()); + onDone(Collections.<K, V>emptyMap()); + } } } - }); + ); cctx.kernalContext().timeout().addTimeoutObject(timeout); } @@ -807,7 +809,5 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma @Override public String toString() { return S.toString(MiniFuture.class, this); } - } - }