Merge remote-tracking branch 'origin/jetty-9.3.x'

2016-03-10 12:44:41 +11:00 · 2016-03-10 12:44:41 +11:00 · 0c14432db3
parent fa7dec8c08 fa8b1c9220
commit 0c14432db3
1 changed files with 1 additions and 3 deletions
--- 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)
                {