# 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/5fd9ded9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5fd9ded9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5fd9ded9 Branch: refs/heads/ignite-598 Commit: 5fd9ded9336d3dd8cc0da3e88f548de8fb57c12c Parents: 5b6700f Author: sboikov <sboi...@gridgain.com> Authored: Tue Mar 31 12:53:34 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Mar 31 12:53:34 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 6 ++++-- .../cache/GridCacheAbstractFullApiSelfTest.java | 10 +++++----- .../GridCacheReturnValueTransferSelfTest.java | 18 ++---------------- 3 files changed, 11 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5fd9ded9/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 db1fd12..00ab5719 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 @@ -4155,6 +4155,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, if (!ctx.isSwapOrOffheapEnabled() && ctx.kernalContext().discovery().size() == 1) return localIteratorHonorExpirePolicy(); + final GridCacheProjectionImpl<K, V> prj = ctx.projectionPerCall(); + CacheQueryFuture<Map.Entry<K, V>> fut = queries().createScanQuery(null) .keepAll(false) .execute(); @@ -4165,7 +4167,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } @Override protected void remove(Cache.Entry<K, V> item) { - ctx.gate().enter(); + GridCacheProjectionImpl<K, V> prev = ctx.gate().enter(prj); try { removex(item.getKey()); @@ -4174,7 +4176,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, throw CU.convertToCacheException(e); } finally { - ctx.gate().leave(); + ctx.gate().leave(prev); } } }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5fd9ded9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index 1a8bdcd..d5c279b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -4310,19 +4310,19 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract Cache.Entry<String, Integer> entry = it.next(); - String removedKey = entry.getKey(); + String rmvKey = entry.getKey(); - assertTrue(map.containsKey(removedKey)); + assertTrue(map.containsKey(rmvKey)); it.remove(); - assertNull(cacheSkipStore.get(removedKey)); + assertNull(cacheSkipStore.get(rmvKey)); - assertTrue(map.containsKey(removedKey)); + assertTrue(map.containsKey(rmvKey)); } /** - * + * @return Cache start mode. */ protected CacheStartMode cacheStartType() { String mode = System.getProperty("cache.start.mode"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5fd9ded9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java index 4761e21..0dd23a7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java @@ -71,21 +71,7 @@ public class GridCacheReturnValueTransferSelfTest extends GridCommonAbstractTest /** * @throws Exception If failed. - */ - public void testTransformAtomicPrimaryNoBackups() throws Exception { - checkTransform(ATOMIC, PRIMARY, 0); - } - - /** - * @throws Exception If failed. - */ - public void testTransformAtomicClockNoBackups() throws Exception { - checkTransform(ATOMIC, CLOCK, 0); - } - - /** - * @throws Exception If failed. - * TODO gg-8273 enable when fixed + * TODO IGNITE-581 enable when fixed */ public void _testTransformTransactionalNoBackups() throws Exception { checkTransform(TRANSACTIONAL, PRIMARY, 0); @@ -93,7 +79,7 @@ public class GridCacheReturnValueTransferSelfTest extends GridCommonAbstractTest /** * @throws Exception If failed. - * TODO gg-8273 enable when fixed + * TODO IGNITE-581 enable when fixed */ public void _testTransformTransactionalOneBackup() throws Exception { checkTransform(TRANSACTIONAL, PRIMARY, 1);
