summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2009-11-26 10:15:01 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2009-11-26 10:15:01 +0000
commit992473a22ba0bee130a39e88643e5080a8a61276 (patch)
treef8972575059628c8279d77cba36005ad44f9c896
parent7d035f2da414c81b6a7c34b4f2d946303e59dcee (diff)
Try to avoid the current modification exceptions that hapen sometimes on shutdown. We don't need Jetty to have its own shutdown thread as the Tuscany code should always being shutting down the jetty server
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@884485 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--sca-java-2.x/trunk/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/sca-java-2.x/trunk/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java b/sca-java-2.x/trunk/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
index b966e38a29..e746767338 100644
--- a/sca-java-2.x/trunk/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
+++ b/sca-java-2.x/trunk/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
@@ -123,6 +123,8 @@ public class JettyServer implements ServletHost, LifeCycleListener {
keyStoreType = System.getProperty("javax.net.ssl.keyStoreType", KeyStore.getDefaultType());
trustStoreType = System.getProperty("javax.net.ssl.trustStoreType", KeyStore.getDefaultType());
+
+ System.setProperty("JETTY_NO_SHUTDOWN_HOOK", "true");
return null;
}
});