Merge remote-tracking branch 'origin/master' into jetty-9.1

2 files changed, 16 insertions, 8 deletions

diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/StandardStarter.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/StandardStarter.java
index 4915626264..bb4861035b 100644
--- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/StandardStarter.java
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/StandardStarter.java
@@ -25,18 +25,22 @@ import org.eclipse.jetty.server.handler.ContextHandler;
 
 public class StandardStarter implements AppLifeCycle.Binding
 {
+    @Override
     public String[] getBindingTargets()
     {
         return new String[]
         { "starting" };
     }
 
+    @Override
     public void processBinding(Node node, App app) throws Exception
     {
         ContextHandler handler = app.getContextHandler();
-        if (!handler.isStarted())
-        {
-            handler.start();
-        }
+        
+        // start the handler
+        handler.start();
+        
+        // After starting let the context manage state
+        app.getDeploymentManager().getContexts().manage(handler);
     }
 }
diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/StandardStopper.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/StandardStopper.java
index c92f4530cb..dae13e8611 100644
--- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/StandardStopper.java
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/StandardStopper.java
@@ -25,18 +25,22 @@ import org.eclipse.jetty.server.handler.ContextHandler;
 
 public class StandardStopper implements AppLifeCycle.Binding
 {
+    @Override
     public String[] getBindingTargets()
     {
         return new String[]
         { "stopping" };
     }
 
+    @Override
     public void processBinding(Node node, App app) throws Exception
     {
         ContextHandler handler = app.getContextHandler();
-        if (!handler.isStopped())
-        {
-            handler.stop();
-        }
+        
+        // Before stopping, take back management from the context
+        app.getDeploymentManager().getContexts().unmanage(handler);
+        
+        // Stop it
+        handler.stop();
     }
 }