commit ea20df528927675f7e204c674bc9961a1c25a9e4
author Richard S. Hall <rickhall@apache.org> Wed Jan 19 17:35:34 2011 +0000
committer Richard S. Hall <rickhall@apache.org> Wed Jan 19 17:35:34 2011 +0000
tree b883867525ed6350e2f9833d17f51a4c60365214
parent 87fd1ceb2a1b7cd4589e2c3244c5c7dfbf26d6b7

Remove redundant check.


git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1060880 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 f7ccdb1..1750efd 100644
--- a/framework/src/main/java/org/apache/felix/framework/Felix.java
+++ b/framework/src/main/java/org/apache/felix/framework/Felix.java
@@ -4687,8 +4687,7 @@
             // or if any thread has the global lock, unless the current thread
             // holds the global lock or the bundle lock already.
             while (!bundle.isLockable() ||
-                ((bundle.getLockingThread() != Thread.currentThread())
-                    && (m_globalLockThread != null)
+                ((m_globalLockThread != null)
                     && (m_globalLockThread != Thread.currentThread())))
             {
                 // Check to make sure the bundle is in a desired state.