felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickh...@apache.org
Subject svn commit: r751767 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/Resolver.java
Date Mon, 09 Mar 2009 17:12:39 GMT
Author: rickhall
Date: Mon Mar  9 17:12:38 2009
New Revision: 751767

URL: http://svn.apache.org/viewvc?rev=751767&view=rev
Log:
An unresolvable module should have its candidates removed from the candidates
map to avoid faulty wirings to it. (FELIX-978)

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

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/Resolver.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/Resolver.java?rev=751767&r1=751766&r2=751767&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/Resolver.java
(original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/Resolver.java
Mon Mar  9 17:12:38 2009
@@ -515,6 +515,11 @@
                 // resolve exception unless the import is optional.
                 if ((candidates.length == 0) && !reqs[reqIdx].isOptional())
                 {
+                    // Since the target module cannot resolve, remove its
+                    // candidates set list from the candidates map, since
+                    // it is invalid.
+                    candidatesMap.remove(targetModule);
+
                     // If we have received an exception while trying to populate
                     // the candidates map, rethrow that exception since it might
                     // be useful. NOTE: This is not necessarily the "only"



Mime
View raw message