Author: cziegeler
Date: Fri Apr 15 06:26:53 2011
New Revision: 1092598
URL: http://svn.apache.org/viewvc?rev=1092598&view=rev
Log:
FELIX-2915 : Potential deadlock on shutdown
Modified:
felix/trunk/eventadmin/impl/changelog.txt
felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/dispatch/DefaultThreadPool.java
Modified: felix/trunk/eventadmin/impl/changelog.txt
URL:
http://svn.apache.org/viewvc/felix/trunk/eventadmin/impl/changelog.txt?rev=1092598&r1=1092597&r2=1092598&view=diff
==============================================================================
--- felix/trunk/eventadmin/impl/changelog.txt (original)
+++ felix/trunk/eventadmin/impl/changelog.txt Fri Apr 15 06:26:53 2011
@@ -1,3 +1,10 @@
+Changes from 1.2.10 to 1.2.12
+-----------------------------
+
+** Bug
+ * [FELIX-2915] - Potential deadlock on shutdown
+
+
Changes from 1.2.8 to 1.2.10
----------------------------
Modified:
felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/dispatch/DefaultThreadPool.java
URL:
http://svn.apache.org/viewvc/felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/dispatch/DefaultThreadPool.java?rev=1092598&r1=1092597&r2=1092598&view=diff
==============================================================================
---
felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/dispatch/DefaultThreadPool.java
(original)
+++
felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/dispatch/DefaultThreadPool.java
Fri Apr 15 06:26:53 2011
@@ -89,14 +89,6 @@ public class DefaultThreadPool
{
shutdownNow();
- try
- {
- awaitTerminationAfterShutdown();
- }
- catch (final InterruptedException ie)
- {
- // ignore this
- }
}
/**
