formatting
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/3c27307c Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3c27307c Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3c27307c Branch: refs/heads/feature/GEM-983 Commit: 3c27307c3c1e91fbad46541fe05929a629f79ed2 Parents: 2cb9aa0 Author: Darrel Schneider <[email protected]> Authored: Thu Nov 3 15:10:48 2016 -0700 Committer: Darrel Schneider <[email protected]> Committed: Thu Nov 3 15:10:48 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/geode/internal/cache/GemFireCacheImpl.java | 6 ++++-- .../geode/internal/cache/partitioned/ShutdownAllDUnitTest.java | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c27307c/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java index a04ce17..c76bf2b 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java @@ -1759,7 +1759,8 @@ public class GemFireCacheImpl try { this.shutDownAllFinished.await(); } catch (InterruptedException e) { - logger.debug("Shutdown all interrupted while waiting for another thread to do the shutDownAll"); + logger.debug( + "Shutdown all interrupted while waiting for another thread to do the shutDownAll"); Thread.currentThread().interrupt(); } return; @@ -1802,7 +1803,8 @@ public class GemFireCacheImpl try { es.awaitTermination(Integer.MAX_VALUE, TimeUnit.SECONDS); } catch (InterruptedException e) { - logger.debug("Shutdown all interrupted while waiting for PRs to be shutdown gracefully."); + logger + .debug("Shutdown all interrupted while waiting for PRs to be shutdown gracefully."); } } else { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c27307c/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java index 304604e..52d1327 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java @@ -196,8 +196,10 @@ public class ShutdownAllDUnitTest extends JUnit4CacheTestCase { private static final AtomicBoolean calledCreateCache = new AtomicBoolean(); private static final AtomicBoolean calledCloseCache = new AtomicBoolean(); private static CacheLifecycleListener cll; + @Test - public void testShutdownAllInterruptsCacheCreation() throws ExecutionException, InterruptedException, TimeoutException { + public void testShutdownAllInterruptsCacheCreation() + throws ExecutionException, InterruptedException, TimeoutException { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm2 = host.getVM(2); @@ -211,6 +213,7 @@ public class ShutdownAllDUnitTest extends JUnit4CacheTestCase { calledCreateCache.set(true); Awaitility.await().atMost(90, TimeUnit.SECONDS).until(() -> cache.isCacheAtShutdownAll()); } + @Override public void cacheClosed(GemFireCacheImpl cache) { calledCloseCache.set(true); @@ -240,6 +243,7 @@ public class ShutdownAllDUnitTest extends JUnit4CacheTestCase { }); } } + @Test public void testShutdownAllOneServerAndRecover() throws Throwable { Host host = Host.getHost(0);
