Merge pull request #419 from Netflix/dannyt/avoid-executor-service-au…

…toclose Ignore AutoClosable interface on ExecutorService
Netflix · Mar 20, 2023 · 961df38 · 961df38
2 parents 238f28f + 2c1663f
commit 961df38
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...rnator-core/src/main/java/com/netflix/governator/internal/PreDestroyLifecycleFeature.java b/...rnator-core/src/main/java/com/netflix/governator/internal/PreDestroyLifecycleFeature.java
@@ -8,6 +8,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.ExecutorService;
 
 import javax.annotation.PreDestroy;
 
@@ -53,7 +54,7 @@ private  class PreDestroyVisitor implements TypeVisitor, Supplier<List<Lifecycle
         @Override
         public boolean visit(final Class<?> clazz) {
             boolean continueVisit = !clazz.isInterface();
-            if (continueVisit && AutoCloseable.class.isAssignableFrom(clazz)) {
+            if (continueVisit && AutoCloseable.class.isAssignableFrom(clazz) && !ExecutorService.class.isAssignableFrom(clazz)) {
                 AutoCloseableLifecycleAction closeableAction = new AutoCloseableLifecycleAction(
                         clazz.asSubclass(AutoCloseable.class));
                 LOG.debug("adding action {}", closeableAction);