ignite-656: NPE is fixed
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c7697098 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c7697098 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c7697098 Branch: refs/heads/ignite-sprint-4 Commit: c769709865d88762b914284b4557b7ba2fc0c4ff Parents: daf30ae Author: Denis Magda <dma...@gridgain.com> Authored: Thu Apr 16 11:34:32 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Thu Apr 16 11:34:32 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/distributed/dht/GridDhtLockFuture.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c7697098/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java index 8a654b5..f247c0c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java @@ -957,7 +957,9 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo final GridCacheVersion ver = version(); for (GridDhtCacheEntry entry : entries) { - if (!entry.hasValue() && !tx.entry(entry.txKey()).skipStore()) + IgniteTxEntry txEntry = tx != null ? tx.entry(entry.txKey()) : null; + + if (!entry.hasValue() && (txEntry == null || !txEntry.skipStore())) loadMap.put(entry.key(), entry); }
