Fix after incorrect merge.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/32ff1666 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/32ff1666 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/32ff1666 Branch: refs/heads/ignite-5267-1 Commit: 32ff1666fe2b5f141d8c93f6aeffc195f6bd80a1 Parents: 6869f26 Author: sboikov <[email protected]> Authored: Fri Jun 16 09:03:45 2017 +0300 Committer: sboikov <[email protected]> Committed: Fri Jun 16 09:03:45 2017 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheProcessor.java | 2 +- .../processors/cache/CacheStopAndDestroySelfTest.java | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/32ff1666/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 82d4e78..8f59c1d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -2076,7 +2076,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { prepareCacheStop(cctx.name(), destroy); - if (cctx.group().hasCaches()) + if (!cctx.group().hasCaches()) stopCacheGroup(cctx.group().groupId()); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/32ff1666/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java index 3e59bf1..f67e247 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java @@ -469,8 +469,6 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testClientClose() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-5511";); - startGridsMultiThreaded(gridCount()); IgniteCache<String, String> cache0 = grid(0).getOrCreateCache(getClientConfig()); @@ -522,8 +520,6 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testClientCloseWithTry() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-5511";); - startGridsMultiThreaded(gridCount()); String curVal = null; @@ -563,8 +559,6 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testNearClose() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-5511";); - startGridsMultiThreaded(gridCount()); IgniteCache<String, String> cache0 = grid(0).getOrCreateCache(getNearConfig()); @@ -638,8 +632,6 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testNearCloseWithTry() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-5511";); - startGridsMultiThreaded(gridCount()); String curVal = null;
