Repository: incubator-ignite Updated Branches: refs/heads/ignite-834 9df497f92 -> a460b2e79
#ignite-834: Small change Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a460b2e7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a460b2e7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a460b2e7 Branch: refs/heads/ignite-834 Commit: a460b2e79fe4974ba9824ab46b83b4379be46a07 Parents: 9df497f Author: ivasilinets <ivasilin...@gridgain.com> Authored: Tue May 5 15:46:55 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Tue May 5 15:46:55 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheAdapter.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a460b2e7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 876d66d..b29cabd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -3600,7 +3600,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V int size = 0; for (ComputeJobResult res : results) { - if (res.getException() == null) + if (res.getException() == null && res != null) size += res.<Integer>getData(); } @@ -5583,9 +5583,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V @Nullable @Override public final Object execute() { waitAffinityReadyFuture(); - localExecute(); - - return null; + return localExecute(); } /**
