commit 47626fe9369138cf7fb7f35a8217c3e776952fad
author Marcel Offermans <marrs@apache.org> Sat Mar 28 17:08:44 2009 +0000
committer Marcel Offermans <marrs@apache.org> Sat Mar 28 17:08:44 2009 +0000
tree 407dc97fd567e0bc1b6a39c684614fda2ddd1417
parent 3ecf8bc6a030f50cfe96e3cc6aade583064e57bb

Before actually leaving the stop() method, makes sure that the background thread running Jetty has actually stopped. Not doing so caused dereferencing of invalid objects (service references, ..).

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@759510 13f79535-47bb-0310-9956-ffa450edef68

http.jetty/src/main/java/org/apache/felix/http/jetty/Activator.java

diff --git a/http.jetty/src/main/java/org/apache/felix/http/jetty/Activator.java b/http.jetty/src/main/java/org/apache/felix/http/jetty/Activator.java
index 6d14453..91bf091 100644
--- a/http.jetty/src/main/java/org/apache/felix/http/jetty/Activator.java
+++ b/http.jetty/src/main/java/org/apache/felix/http/jetty/Activator.java
@@ -190,6 +190,12 @@
         
         m_running = false;
         m_thread.interrupt();
+        try {
+            m_thread.join(3000);
+        }
+        catch (InterruptedException e) {
+            // not much we can do here
+        }
         
         m_logTracker.close();
     }