From fa8b1c92208b3dbd373c8b888c3c6c408011208c Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Thu, 10 Mar 2016 12:42:50 +1100 Subject: [PATCH] Revert "Issue #414 ContainerLifeCycle should not stop failed component on remove" This reverts commit 34c8ded756fb482a30754c44dbda3426bbf630f2. The test is a race and failed components should be stopped when removed so listeners can be called. --- .../org/eclipse/jetty/util/component/ContainerLifeCycle.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/component/ContainerLifeCycle.java b/jetty-util/src/main/java/org/eclipse/jetty/util/component/ContainerLifeCycle.java index 2e1311821fa..2457a9043ec 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/component/ContainerLifeCycle.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/component/ContainerLifeCycle.java @@ -538,9 +538,7 @@ public class ContainerLifeCycle extends AbstractLifeCycle implements Container, { try { - LifeCycle lc=(LifeCycle)bean._bean; - if (lc.isRunning()) - stop(lc); + stop((LifeCycle)bean._bean); } catch(RuntimeException | Error e) {