ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yzhda...@apache.org
Subject [1/5] incubator-ignite git commit: # sprint-1 minor
Date Mon, 26 Jan 2015 15:58:19 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-94 36f1e077b -> 0e3f19b86


# sprint-1 minor


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c60edcc6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c60edcc6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c60edcc6

Branch: refs/heads/ignite-94
Commit: c60edcc669eebac522f1baa73c5d3c7661dd9fd4
Parents: 15d6ebb
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Jan 26 17:19:08 2015 +0400
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Jan 26 17:19:08 2015 +0400

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/GridCacheAdapter.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c60edcc6/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 5726fef..4e44e14 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
@@ -2289,7 +2289,9 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
                 IgniteFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>>
fut =
                     tx.invokeAsync(ctx, invokeMap, args);
 
-                return fut.get().value();
+                Map<K, EntryProcessorResult<T>> res = fut.get().value();
+
+                return res != null ? res : Collections.<K, EntryProcessorResult<T>>emptyMap();
             }
         });
     }


Mime
View raw message