# minor format
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f2aa6ab5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f2aa6ab5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f2aa6ab5 Branch: refs/heads/ignite-1087 Commit: f2aa6ab5a5e049e10bfec06142b3f734d0709996 Parents: b87f138 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Tue Jul 7 10:35:03 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Tue Jul 7 10:35:03 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/CacheObjectImpl.java | 1 - .../distributed/dht/GridPartitionedGetFuture.java | 13 ++++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2aa6ab5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java index ad033a7..96603f9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java @@ -77,7 +77,6 @@ public class CacheObjectImpl extends CacheObjectAdapter { catch (IgniteCheckedException e) { throw new IgniteException("Failed to unmarshall object.", e); } - } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2aa6ab5/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 2f41e63..79d5e75 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 @@ -224,7 +224,7 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M * @param res Result. */ public void onResult(UUID nodeId, GridNearGetResponse res) { - for (IgniteInternalFuture<Map<K, V>> fut : futures()) + for (IgniteInternalFuture<Map<K, V>> fut : futures()) { if (isMini(fut)) { MiniFuture f = (MiniFuture)fut; @@ -234,6 +234,7 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M f.onResult(res); } } + } } /** {@inheritDoc} */ @@ -702,8 +703,14 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M } }); } - else - onDone(createResultMap(res.entries())); + else { + try { + onDone(createResultMap(res.entries())); + } + catch (Exception e) { + onDone(e); + } + } } /** {@inheritDoc} */
