# ignite-629-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/67bb43aa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/67bb43aa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/67bb43aa Branch: refs/heads/gg-9998 Commit: 67bb43aaf1a233393e5d88bdc60161b454c0939a Parents: a4f580e Author: sboikov <sboi...@gridgain.com> Authored: Tue Mar 31 13:36:21 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Mar 31 13:36:21 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 3 --- .../processors/cache/GridCacheConcurrentMap.java | 18 ++++++++++++++++-- .../processors/cache/IgniteCacheProxy.java | 2 -- 3 files changed, 16 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67bb43aa/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 c3a1225..8c6bfd6 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 @@ -402,7 +402,6 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, GridCacheProjectionImpl<K, V> prj = new GridCacheProjectionImpl<>(this, ctx, - null, false, null, false, @@ -427,7 +426,6 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, return new GridCacheProjectionImpl<>( (CacheProjection<K1, V1>)this, (GridCacheContext<K1, V1>)ctx, - null, false, null, true, @@ -445,7 +443,6 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, return new GridCacheProjectionImpl<>( this, ctx, - null, false, null, false, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67bb43aa/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 51df644..ba6a7f4 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 @@ -1744,7 +1744,12 @@ public class GridCacheConcurrentMap { curVal = null; try { - ((IgniteKernal)ctx.grid()).getCache(ctx.name()).remove(e.key()); + CacheProjection prj = ctx.projectionPerCall(); + + if (prj != null) + prj.removex(e.key()); + else + ((IgniteKernal)ctx.grid()).getCache(ctx.name()).removex(e.key()); } catch (IgniteCheckedException ex) { throw new IgniteException(ex); @@ -2021,7 +2026,16 @@ public class GridCacheConcurrentMap { /** {@inheritDoc} */ @Override public void remove() { - it.remove(); + GridCacheProjectionImpl<K, V> oldPrj = ctx.projectionPerCall(); + + ctx.projectionPerCall(prjPerCall); + + try { + it.remove(); + } + finally { + ctx.projectionPerCall(oldPrj); + } } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67bb43aa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index 364b1c3..dfc3ef4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@ -1414,8 +1414,6 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V GridCacheProjectionImpl<K, V> prj0 = new GridCacheProjectionImpl<>( (prj != null ? prj : delegate), ctx, - null, - prj != null ? prj.subjectId() : null, true, prj != null ? prj.subjectId() : null, prj != null && prj.isKeepPortable(),
