Repository: ignite Updated Branches: refs/heads/ignite-2523-1 96cc54ce8 -> 5cffa794c
Fixed special handling of putIfAbsent case. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5cffa794 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5cffa794 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5cffa794 Branch: refs/heads/ignite-2523-1 Commit: 5cffa794c8931cd82bbdc0ec3a0337d4d70b6495 Parents: 96cc54c Author: thatcoach <[email protected]> Authored: Sun Apr 24 22:47:43 2016 +0300 Committer: thatcoach <[email protected]> Committed: Sun Apr 24 22:47:43 2016 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheContext.java | 43 ++++++++++---------- 1 file changed, 22 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5cffa794/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java index 88d6e04..55151b0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java @@ -17,26 +17,6 @@ package org.apache.ignite.internal.processors.cache; -import java.io.Externalizable; -import java.io.IOException; -import java.io.InvalidObjectException; -import java.io.ObjectInput; -import java.io.ObjectOutput; -import java.io.ObjectStreamException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.UUID; -import java.util.concurrent.Callable; -import java.util.concurrent.CountDownLatch; -import javax.cache.Cache; -import javax.cache.configuration.Factory; -import javax.cache.expiry.EternalExpiryPolicy; -import javax.cache.expiry.ExpiryPolicy; -import javax.cache.processor.EntryProcessorResult; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.cache.CacheInterceptor; @@ -105,6 +85,27 @@ import org.apache.ignite.plugin.security.SecurityException; import org.apache.ignite.plugin.security.SecurityPermission; import org.jetbrains.annotations.Nullable; +import javax.cache.Cache; +import javax.cache.configuration.Factory; +import javax.cache.expiry.EternalExpiryPolicy; +import javax.cache.expiry.ExpiryPolicy; +import javax.cache.processor.EntryProcessorResult; +import java.io.Externalizable; +import java.io.IOException; +import java.io.InvalidObjectException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.io.ObjectStreamException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.Callable; +import java.util.concurrent.CountDownLatch; + import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED; @@ -1096,7 +1097,7 @@ public class GridCacheContext<K, V> implements Externalizable { return false; for (CacheEntryPredicate p0 : p) { - if ((p0 instanceof CacheEntrySerializablePredicate) && + if ((p0 instanceof CacheEntryPredicateNoValue) || (p0 instanceof CacheEntrySerializablePredicate) && ((CacheEntrySerializablePredicate)p0).predicate() instanceof CacheEntryPredicateNoValue) return true; }
