diff options
author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-07-30 12:08:06 +0000 |
---|---|---|
committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-07-30 12:08:06 +0000 |
commit | 965b71a0699c8200292082151354e81aca3be99e (patch) | |
tree | 162ce8b7420b518703722165646622ec95327fb6 /java/sca/modules/host-jetty/src | |
parent | 41d4b280f76636f223def6a1b14d80ad7c78bcca (diff) |
Remove the Jetty server shutdown hook when the server is stopped
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@799246 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/modules/host-jetty/src')
-rw-r--r-- | java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java b/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java index ddfa253f55..0170037e62 100644 --- a/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java +++ b/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java @@ -152,7 +152,9 @@ public class JettyServer implements ServletHost { Set<Entry<Integer, Port>> entries = new HashSet<Entry<Integer, Port>>(ports.entrySet()); for (Entry<Integer, Port> entry: entries) { Port port = entry.getValue(); - port.getServer().stop(); + Server server = port.getServer(); + server.stop(); + server.setStopAtShutdown(false); ports.remove(entry.getKey()); } } catch (Exception e) { @@ -442,7 +444,9 @@ public class JettyServer implements ServletHost { // Stop the port if there are no servlet mappings on it anymore if (mappings.size() == 0) { try { - port.getServer().stop(); + Server server = port.getServer(); + server.stop(); + server.setStopAtShutdown(false); } catch (Exception e) { throw new IllegalStateException(e); } |