commit bbd09ef40b1f677634b918cb218f7faae43ad65c
author mivanac <mario.ivanac@est.tech> Sat Oct 19 17:01:26 2019 +0200
committer mivanac <mario.ivanac@est.tech> Tue Oct 22 01:44:32 2019 +0200
tree b3e63f4f26207356fa4861d2876946fd697d29fb
parent e225ffcd5dc8f15ae59b46dc24baefcc253801f2

GEODE-7319: Solution for flaky test

geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java

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 @@
     return ccnSingleton;
   }
 
+  @VisibleForTesting
+  public static void resetInstance() {
+    ccnSingleton = null;
+  }
+
   /**
    * Registers a new client updater that wants to receive updates with this server.
    *

geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionTest.java

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 @@
     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 @@
     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 @@
     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,