This is an automated email from the ASF dual-hosted git repository. mivanac pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push: new bbd09ef GEODE-7319: Solution for flaky test new c4df938 Merge pull request #4188 from Nordix/feature/GEODE-7319 bbd09ef is described below commit bbd09ef40b1f677634b918cb218f7faae43ad65c Author: mivanac <mario.iva...@est.tech> AuthorDate: Sat Oct 19 17:01:26 2019 +0200 GEODE-7319: Solution for flaky test --- .../geode/internal/cache/tier/sockets/CacheClientNotifier.java | 5 +++++ .../test/java/org/apache/geode/internal/cache/BucketRegionTest.java | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java index 7395ea7..40abfa2 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java @@ -162,6 +162,11 @@ public class CacheClientNotifier { return ccnSingleton; } + @VisibleForTesting + public static void resetInstance() { + ccnSingleton = null; + } + /** * Registers a new client updater that wants to receive updates with this server. * diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionTest.java index 2042557..4293c3e 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionTest.java @@ -456,6 +456,8 @@ public class BucketRegionTest { doReturn(false).when(partitionedRegion).isInitialized(); doReturn(true).when(partitionedRegion).shouldDispatchListenerEvent(); + CacheClientNotifier.resetInstance(); + bucketRegion.invokeDestroyCallbacks(EnumListenerEvent.AFTER_DESTROY, event, false, false); verify(partitionedRegion, never()).invokeDestroyCallbacks(EnumListenerEvent.AFTER_DESTROY, @@ -503,6 +505,8 @@ public class BucketRegionTest { doReturn(false).when(partitionedRegion).isInitialized(); doReturn(true).when(partitionedRegion).shouldDispatchListenerEvent(); + CacheClientNotifier.resetInstance(); + bucketRegion.invokeInvalidateCallbacks(EnumListenerEvent.AFTER_INVALIDATE, event, false); verify(partitionedRegion, never()).invokeInvalidateCallbacks(EnumListenerEvent.AFTER_INVALIDATE, @@ -550,6 +554,8 @@ public class BucketRegionTest { doReturn(false).when(partitionedRegion).isInitialized(); doReturn(true).when(partitionedRegion).shouldDispatchListenerEvent(); + CacheClientNotifier.resetInstance(); + bucketRegion.invokePutCallbacks(EnumListenerEvent.AFTER_CREATE, event, false, false); verify(partitionedRegion, never()).invokePutCallbacks(EnumListenerEvent.AFTER_CREATE, event,