commit 955c921167a1b53ebdc5a7e5c19f60b4ff287b84
author Guillaume Nodet <gnodet@apache.org> Wed Mar 14 15:21:34 2012 +0000
committer Guillaume Nodet <gnodet@apache.org> Wed Mar 14 15:21:34 2012 +0000
tree 1c2f4da3ef15fb9df308fefb45cdc61a627732b0
parent 321f3805ee00c009229797c3fca1c8042447e091

[FELIX-3393] Possible deadlock with reentrant calls

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

framework/src/main/java/org/apache/felix/framework/Felix.java

diff --git a/framework/src/main/java/org/apache/felix/framework/Felix.java b/framework/src/main/java/org/apache/felix/framework/Felix.java
index d4272ac..46a1162 100644
--- a/framework/src/main/java/org/apache/felix/framework/Felix.java
+++ b/framework/src/main/java/org/apache/felix/framework/Felix.java
@@ -4847,7 +4847,8 @@
             // holds the global lock or the bundle lock already.
             while (!bundle.isLockable() ||
                 ((m_globalLockThread != null)
-                    && (m_globalLockThread != Thread.currentThread())))
+                    && (m_globalLockThread != Thread.currentThread())
+                    && (bundle.getLockingThread() != Thread.currentThread())))
             {
                 // Check to make sure the bundle is in a desired state.
                 // If so, keep waiting. If not, throw an exception.