diff options
author | Greg Wilkins | 2013-08-16 01:40:23 +0000 |
---|---|---|
committer | Greg Wilkins | 2013-08-16 01:40:23 +0000 |
commit | 2761abb6589d69b95df671c8838852fec238e049 (patch) | |
tree | dbc1028c4c93be09357afa4d7329b47280fcd6e7 /jetty-deploy | |
parent | e34ba252a28b243a201f014f4eb1f7f2fbb8a337 (diff) | |
download | org.eclipse.jetty.project-2761abb6589d69b95df671c8838852fec238e049.tar.gz org.eclipse.jetty.project-2761abb6589d69b95df671c8838852fec238e049.tar.xz org.eclipse.jetty.project-2761abb6589d69b95df671c8838852fec238e049.zip |
415194 Deployer gives management of context to context collection
Diffstat (limited to 'jetty-deploy')
-rw-r--r-- | jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/StandardStarter.java | 12 | ||||
-rw-r--r-- | jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/StandardStopper.java | 12 |
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(); } } |