From f954019465d6060359dedf43ea1aeb91c2496ba0 Mon Sep 17 00:00:00 2001 From: Zakhi Verech Date: Tue, 19 Jan 2016 16:59:31 +0200 Subject: [PATCH] Close the WarmUpSession pool when the LifecycleManager is closed --- .../com/netflix/governator/lifecycle/LifecycleManager.java | 6 ++++++ .../netflix/governator/lifecycle/warmup/WarmUpSession.java | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/governator-legacy/src/main/java/com/netflix/governator/lifecycle/LifecycleManager.java b/governator-legacy/src/main/java/com/netflix/governator/lifecycle/LifecycleManager.java index 06367560..24f949b9 100644 --- a/governator-legacy/src/main/java/com/netflix/governator/lifecycle/LifecycleManager.java +++ b/governator-legacy/src/main/java/com/netflix/governator/lifecycle/LifecycleManager.java @@ -231,6 +231,12 @@ public synchronized void close() try { stopInstances(); + + WarmUpSession session = postStartWarmUpSession.get(); + if (session != null) + { + session.close(); + } } catch ( Exception e ) { diff --git a/governator-legacy/src/main/java/com/netflix/governator/lifecycle/warmup/WarmUpSession.java b/governator-legacy/src/main/java/com/netflix/governator/lifecycle/warmup/WarmUpSession.java index 98def943..7d49c0ec 100644 --- a/governator-legacy/src/main/java/com/netflix/governator/lifecycle/warmup/WarmUpSession.java +++ b/governator-legacy/src/main/java/com/netflix/governator/lifecycle/warmup/WarmUpSession.java @@ -102,4 +102,10 @@ protected void compute() } }; } + + + public void close() + { + forkJoinPool.shutdownNow(); + } }