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/06/28 16:34:35 UTC

svn commit: r1140641 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java

Author: rickhall
Date: Tue Jun 28 14:34:35 2011
New Revision: 1140641

URL: http://svn.apache.org/viewvc?rev=1140641&view=rev
Log:
Need to release lock for nested resolves. (FELIX-2986)

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

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java?rev=1140641&r1=1140640&r2=1140641&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java Tue Jun 28 14:34:35 2011
@@ -461,6 +461,7 @@ class StatefulResolver
             // the case if a resolver hook does something bad.
             if (m_isResolving)
             {
+                m_felix.releaseGlobalLock();
                 throw new IllegalStateException("Nested resolve operations not allowed.");
             }
             m_isResolving = true;