svn commit: r464647 - /incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java

[ri...@apache.org]

Author: rickhall
Date: Mon Oct 16 13:03:49 2006
New Revision: 464647

URL: http://svn.apache.org/viewvc?view=rev&rev=464647
Log:
Fixed a bug that would cause an unresolvable bundle to be marked as resolved
in certain recursive situations.

Modified:
    incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java

Modified: incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java?view=diff&rev=464647&r1=464646&r2=464647
==============================================================================
--- incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java (original)
+++ incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java Mon Oct 16 13:03:49 2006
@@ -820,6 +820,12 @@
             // resolve exception unless the import is optional.
             if ((candidates.length == 0) && !imports[impIdx].isOptional())
             {
+                // Since we are not able to resolve the module, we must
+                // remove the module from the resolve map so that subsequent
+                // resolves do not think that the module is resolvable due
+                // to the cycle check at the beginning of this method.
+                resolverMap.remove(module);
+                
                 // If we have received an exception while trying to populate
                 // the resolver map, rethrow that exception since it might
                 // be useful. NOTE: This is not necessarily the "only"