cleaning up how the watch is stopped

fabric8io · Sep 7, 2022 · 64905e1 · 64905e1
1 parent 9686f6b
commit 64905e1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/...src/main/java/io/fabric8/kubernetes/client/informers/impl/DefaultSharedIndexInformer.java b/...src/main/java/io/fabric8/kubernetes/client/informers/impl/DefaultSharedIndexInformer.java
@@ -164,7 +164,7 @@ public CompletableFuture<Void> start() {
     return reflector.start().whenComplete((v, t) -> {
       // stop called while run is called could be ineffective, check for it afterwards
       synchronized (this) {
-        if (stopped) {
+        if (stopped && reflector.isRunning()) {
           stop();
         }
       }

diff --git a/...tes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/Reflector.java b/...tes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/Reflector.java
@@ -29,10 +29,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Optional;
 import java.util.Set;
-import java.util.concurrent.CancellationException;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
 import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
@@ -76,18 +75,15 @@ public void stop() {
   }
 
   private synchronized void stopWatcher() {
-    if (watchFuture != null) {
-      watchFuture.cancel(true);
-      try {
-        Watch w = watchFuture.getNow(null);
+    Optional.ofNullable(watchFuture).ifPresent(theFuture -> {
+      watchFuture = null;
+      theFuture.cancel(true);
+      theFuture.whenComplete((w, t) -> {
         if (w != null) {
           stopWatch(w);
         }
-      } catch (CompletionException | CancellationException e) {
-        // do nothing
-      }
-      watchFuture = null;
-    }
+      });
+    });
   }
 
   /**