You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ma...@apache.org on 2009/03/28 18:08:44 UTC
svn commit: r759510 -
/felix/trunk/http.jetty/src/main/java/org/apache/felix/http/jetty/Activator.java
Author: marrs
Date: Sat Mar 28 17:08:44 2009
New Revision: 759510
URL: http://svn.apache.org/viewvc?rev=759510&view=rev
Log:
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, ..).
Modified:
felix/trunk/http.jetty/src/main/java/org/apache/felix/http/jetty/Activator.java
Modified: felix/trunk/http.jetty/src/main/java/org/apache/felix/http/jetty/Activator.java
URL: http://svn.apache.org/viewvc/felix/trunk/http.jetty/src/main/java/org/apache/felix/http/jetty/Activator.java?rev=759510&r1=759509&r2=759510&view=diff
==============================================================================
--- felix/trunk/http.jetty/src/main/java/org/apache/felix/http/jetty/Activator.java (original)
+++ felix/trunk/http.jetty/src/main/java/org/apache/felix/http/jetty/Activator.java Sat Mar 28 17:08:44 2009
@@ -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();
}