gg-11810
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/203f28f7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/203f28f7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/203f28f7 Branch: refs/heads/ignite-gg-11810 Commit: 203f28f7803c590628079be97544b7005a4af6df Parents: 3091863 Author: sboikov <sboi...@gridgain.com> Authored: Tue Jan 17 11:40:48 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Jan 17 11:40:48 2017 +0300 ---------------------------------------------------------------------- .../distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java | 3 ++- .../distributed/dht/atomic/GridNearAtomicUpdateResponse.java | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/203f28f7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java index 20d6e90..5fa1daa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java @@ -163,7 +163,8 @@ class GridDhtAtomicSingleUpdateFuture extends GridDhtAtomicAbstractUpdateFuture /** {@inheritDoc} */ @Override protected void addFailedKeys(GridNearAtomicUpdateResponse updateRes, Throwable err) { - updateRes.addFailedKey(key, err); + if (key != null) + updateRes.addFailedKey(key, err); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/203f28f7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java index 2e38733..b5b11db 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java @@ -341,6 +341,9 @@ public class GridNearAtomicUpdateResponse extends GridCacheMessage implements Gr * @param e Error cause. */ public synchronized void addFailedKey(KeyCacheObject key, Throwable e) { + assert key != null; + assert e != null; + if (failedKeys == null) failedKeys = new ConcurrentLinkedQueue<>();