You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@felix.apache.org by ri...@apache.org on 2011/01/19 18:35:34 UTC

svn commit: r1060880 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java

Author: rickhall
Date: Wed Jan 19 17:35:34 2011
New Revision: 1060880

URL: http://svn.apache.org/viewvc?rev=1060880&view=rev
Log:
Remove redundant check.

Modified:
    felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java?rev=1060880&r1=1060879&r2=1060880&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java Wed Jan 19 17:35:34 2011
@@ -4687,8 +4687,7 @@ public class Felix extends BundleImpl im
             // 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.