Repository: geode Updated Branches: refs/heads/feature/GEODE-2811 24d69907d -> 7931c01e5
spotless Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/7931c01e Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/7931c01e Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/7931c01e Branch: refs/heads/feature/GEODE-2811 Commit: 7931c01e5c851f0bab9b4d370e4c360ccc41ea71 Parents: 24d6990 Author: Darrel Schneider <[email protected]> Authored: Fri Apr 21 17:15:42 2017 -0700 Committer: Darrel Schneider <[email protected]> Committed: Fri Apr 21 17:15:42 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/geode/internal/cache/GemFireCacheImpl.java | 2 ++ .../main/java/org/apache/geode/internal/cache/lru/HeapEvictor.java | 1 + .../java/org/apache/geode/internal/cache/GemFireCacheImplTest.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/7931c01e/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 aee0ce8..4a08242 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 @@ -2105,10 +2105,12 @@ public class GemFireCacheImpl return this.offHeapEvictor; } } + /** Used by test to inject an evictor */ void setOffHeapEvictor(OffHeapEvictor evictor) { this.offHeapEvictor = evictor; } + /** Used by test to inject an evictor */ void setHeapEvictor(HeapEvictor evictor) { this.heapEvictor = evictor; http://git-wip-us.apache.org/repos/asf/geode/blob/7931c01e/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapEvictor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapEvictor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapEvictor.java index 899d5b7..a82381f 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapEvictor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapEvictor.java @@ -450,6 +450,7 @@ public class HeapEvictor implements ResourceListener<MemoryEvent> { getEvictorThreadPool().shutdownNow(); isRunning.set(false); } + public boolean isRunning() { return isRunning.get(); } http://git-wip-us.apache.org/repos/asf/geode/blob/7931c01e/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java index ef6e09d..a24fc5a 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java @@ -62,7 +62,7 @@ public class GemFireCacheImplTest { gfc.close(); } } - + @Test public void checkEvictorsClosed() { InternalDistributedSystem ds = Fakes.distributedSystem();
