399967 Destroyables destroyed on undeploy and shutdown hook

3 files changed, 5 insertions, 16 deletions

diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/StandardUndeployer.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/StandardUndeployer.java
index 2048d52855..be26ae78f5 100644
--- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/StandardUndeployer.java
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/StandardUndeployer.java
@@ -32,12 +32,14 @@ public class StandardUndeployer implements AppLifeCycle.Binding
 {
     private static final Logger LOG = Log.getLogger(StandardUndeployer.class);
 
+    @Override
     public String[] getBindingTargets()
     {
         return new String[]
         { "undeploying" };
     }
 
+    @Override
     public void processBinding(Node node, App app) throws Exception
     {
         ContextHandler handler = app.getContextHandler();
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 2fd1f7a0a2..cda43cb6c9 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
@@ -452,7 +452,6 @@ public class ContainerLifeCycle extends AbstractLifeCycle implements Container,
     {
         if (_beans.remove(bean))
         {
-            boolean managed=bean.isManaged();
             unmanage(bean);
 
             for (Container.Listener l:_listeners)
@@ -474,18 +473,6 @@ public class ContainerLifeCycle extends AbstractLifeCycle implements Container,
                 }
             }
             
-            if (managed && bean._bean instanceof Destroyable)
-            {
-                try
-                {
-                    ((Destroyable)bean._bean).destroy();
-                }
-                catch(Exception e)
-                {
-                    LOG.warn(e);
-                }
-            }
-            
             return true;
         }
         return false;
diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/component/ContainerLifeCycleTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/component/ContainerLifeCycleTest.java
index 40192ae362..880b988649 100644
--- a/jetty-util/src/test/java/org/eclipse/jetty/util/component/ContainerLifeCycleTest.java
+++ b/jetty-util/src/test/java/org/eclipse/jetty/util/component/ContainerLifeCycleTest.java
@@ -118,17 +118,17 @@ public class ContainerLifeCycleTest
         a0.destroy();
         Assert.assertEquals(3,started.get());
         Assert.assertEquals(2,stopped.get());
-        Assert.assertEquals(2,destroyed.get());
+        Assert.assertEquals(1,destroyed.get());
 
         a1.stop();
         Assert.assertEquals(3,started.get());
         Assert.assertEquals(3,stopped.get());
-        Assert.assertEquals(2,destroyed.get());
+        Assert.assertEquals(1,destroyed.get());
 
         a1.destroy();
         Assert.assertEquals(3,started.get());
         Assert.assertEquals(3,stopped.get());
-        Assert.assertEquals(3,destroyed.get());
+        Assert.assertEquals(2,destroyed.get());
 
     }