From f971fe7a08a2a5ba660c1394b11ab47ab6c891ab Mon Sep 17 00:00:00 2001 From: Zhang Yuan Date: Thu, 31 Aug 2017 21:47:04 +0800 Subject: [PATCH] # ignite-5994 --- .../org/apache/ignite/internal/processors/cache/GridCacheAdapter.java | 4 ++-- .../processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java | 4 ++-- .../internal/processors/cache/local/atomic/GridLocalAtomicCache.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) 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 8e346ba54a..2a082be538 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 @@ -2535,10 +2535,10 @@ public abstract class GridCacheAdapter implements IgniteInternalCache() : resMap.values().iterator().next(); } - return null; + return new CacheInvokeResult<>(); } }); } 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 1467bfac5b..40387f9014 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 @@ -893,7 +893,7 @@ public class GridDhtAtomicCache extends GridDhtCacheAdapter { if (resMap != null) { assert resMap.isEmpty() || resMap.size() == 1 : resMap.size(); - EntryProcessorResult res = resMap.isEmpty() ? null : resMap.values().iterator().next(); + EntryProcessorResult res = resMap.isEmpty() ? new CacheInvokeResult() : resMap.values().iterator().next(); if (res instanceof CacheInvokeResult) { CacheInvokeResult invokeRes = (CacheInvokeResult)res; @@ -906,7 +906,7 @@ public class GridDhtAtomicCache extends GridDhtCacheAdapter { return res; } - return null; + return new CacheInvokeResult<>(); } }); } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java index 4eacfb8012..0d8b4bf968 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java @@ -616,10 +616,10 @@ public class GridLocalAtomicCache extends GridLocalCache { if (resMap != null) { assert resMap.isEmpty() || resMap.size() == 1 : resMap.size(); - return resMap.isEmpty() ? null : resMap.values().iterator().next(); + return resMap.isEmpty() ? new CacheInvokeResult() : resMap.values().iterator().next(); } - return null; + return new CacheInvokeResult<>(); } }); } -- 2.14.1