You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2018/10/03 08:33:51 UTC
ignite git commit: GG-14206
Repository: ignite
Updated Branches:
refs/heads/ignite-gg-14206 ba13ed956 -> 1a7a9c717
GG-14206
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1a7a9c71
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1a7a9c71
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1a7a9c71
Branch: refs/heads/ignite-gg-14206
Commit: 1a7a9c717a162c37aa5afb2651f8c3217b71fb10
Parents: ba13ed9
Author: sboikov <sb...@apache.org>
Authored: Wed Oct 3 11:33:28 2018 +0300
Committer: sboikov <sb...@apache.org>
Committed: Wed Oct 3 11:33:28 2018 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/atomic/GridDhtAtomicCache.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1a7a9c71/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 8edefa2..c7b6677 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -1793,7 +1793,8 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
// This call will convert entry processor invocation results to cache object instances.
// Must be done outside topology read lock to avoid deadlocks.
- res.returnValue().marshalResult(ctx);
+ if (res.returnValue() != null)
+ res.returnValue().marshalResult(ctx);
break;
}