| commit | 6a523e91528e5079c8c4407b2e61adb1a3004e2c | [log] [tgz] |
|---|---|---|
| author | Carsten Ziegeler <cziegeler@apache.org> | Fri Apr 15 06:26:53 2011 +0000 |
| committer | Carsten Ziegeler <cziegeler@apache.org> | Fri Apr 15 06:26:53 2011 +0000 |
| tree | e048cc4d1f718350b95c11e81833b7e6b0bbe260 | |
| parent | 1abbab9bb902700298807fc9f377fb33f2afee4d [diff] |
FELIX-2915 : Potential deadlock on shutdown git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1092598 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/eventadmin/impl/changelog.txt b/eventadmin/impl/changelog.txt index e767e63..2eaaf11 100644 --- a/eventadmin/impl/changelog.txt +++ b/eventadmin/impl/changelog.txt
@@ -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 ----------------------------
diff --git a/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/dispatch/DefaultThreadPool.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/dispatch/DefaultThreadPool.java index 9a9d2fb..7e7ed55 100644 --- a/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/dispatch/DefaultThreadPool.java +++ b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/dispatch/DefaultThreadPool.java
@@ -89,14 +89,6 @@ { shutdownNow(); - try - { - awaitTerminationAfterShutdown(); - } - catch (final InterruptedException ie) - { - // ignore this - } } /**