#ignite-758: Fix NPE.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1550bf86 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1550bf86 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1550bf86 Branch: refs/heads/ignite-646 Commit: 1550bf86e4e0ed6075109d8481cdfa21ace85c21 Parents: c4b8708 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Apr 20 09:26:58 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Apr 20 09:26:58 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/processors/cache/GridCacheAdapter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1550bf86/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 085fc40..a9201d1 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 @@ -3675,7 +3675,8 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V private Iterator<Cache.Entry<K, V>> localIteratorHonorExpirePolicy(final CacheOperationContext opCtx) { return F.iterator(iterator(), new IgniteClosure<Cache.Entry<K, V>, Cache.Entry<K, V>>() { - private IgniteCacheExpiryPolicy expiryPlc = ctx.cache().expiryPolicy(opCtx.expiry()); + private IgniteCacheExpiryPolicy expiryPlc = + ctx.cache().expiryPolicy(opCtx != null ? opCtx.expiry() : null); @Override public Cache.Entry<K, V> apply(Cache.Entry<K, V> lazyEntry) { CacheOperationContext prev = ctx.gate().enter(opCtx);
