Repository: incubator-ignite Updated Branches: refs/heads/ignite-96 8ca85f012 -> 8af208fa3
ignite-96 minor Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8af208fa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8af208fa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8af208fa Branch: refs/heads/ignite-96 Commit: 8af208fa30427554369fa4cc7af135a2bc0684be Parents: 8ca85f0 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Sun Feb 8 02:29:33 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Sun Feb 8 02:29:33 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheConcurrentMap.java | 4 ++-- .../ignite/internal/processors/cache/GridCacheEntrySet.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8af208fa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java index 4c6a189..0e94d6e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java @@ -1732,7 +1732,7 @@ public class GridCacheConcurrentMap<K, V> { curVal = null; try { - ctx.cache().remove(e.key(), CU.<K, V>empty()); + ctx.grid().cache(ctx.name()).remove(e.key(), CU.<K, V>empty()); } catch (IgniteCheckedException ex) { throw new IgniteException(ex); @@ -1905,7 +1905,7 @@ public class GridCacheConcurrentMap<K, V> { */ boolean removeKey(K k) { try { - return ctx.cache().remove(k, CU.<K, V>empty()) != null; + return ctx.grid().cache(ctx.name()).remove(k, CU.<K, V>empty()); } catch (IgniteCheckedException e) { throw new IgniteException("Failed to remove cache entry for key: " + k, e); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8af208fa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntrySet.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntrySet.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntrySet.java index e0798cb..49863ec 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntrySet.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntrySet.java @@ -78,7 +78,7 @@ public class GridCacheEntrySet<K, V> extends AbstractSet<Cache.Entry<K, V>> { if (F.isAll(e, filter) && set.remove(e)) { try { - ctx.cache().remove(e.getKey(), e.getValue()); + ctx.grid().cache(ctx.name()).remove(e.getKey(), e.getValue()); } catch (IgniteCheckedException ex) { throw new IgniteException(ex);
