commit b3210002a956ba0c5451f495659828d370ebd171
author Richard S. Hall <rickhall@apache.org> Fri Dec 19 16:44:26 2008 +0000
committer Richard S. Hall <rickhall@apache.org> Fri Dec 19 16:44:26 2008 +0000
tree 9bfd3552ebec10cf5605b66145d1d535d00684d9
parent e2f64af338a6a18179e2d7b5b57f8b74bfea31e1

Fix incorrect condition while waiting to acquire locks.


git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@728063 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 adbbc8a..bf8abe7 100644
--- a/framework/src/main/java/org/apache/felix/framework/Felix.java
+++ b/framework/src/main/java/org/apache/felix/framework/Felix.java
@@ -4194,7 +4194,7 @@
             // Wait if any thread has the global lock, unless the current thread
             // holds the global lock.
             while ((m_globalLockCount > 0)
-                && m_lockingThreadMap.containsKey(Thread.currentThread()))
+                && !m_lockingThreadMap.containsKey(Thread.currentThread()))
             {
                 try
                 {
@@ -4238,7 +4238,7 @@
             // Wait if any thread has the global lock, unless the current thread
             // holds the global lock.
             while ((m_globalLockCount > 0)
-                && m_lockingThreadMap.containsKey(Thread.currentThread()))
+                && !m_lockingThreadMap.containsKey(Thread.currentThread()))
             {
                 try
                 {