Apply patch FELIX-4495 to stop ignoring candidates from already resolved fragments.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1589857 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/resolver/src/main/java/org/apache/felix/resolver/Candidates.java b/resolver/src/main/java/org/apache/felix/resolver/Candidates.java
index a652ddc..257ba31 100644
--- a/resolver/src/main/java/org/apache/felix/resolver/Candidates.java
+++ b/resolver/src/main/java/org/apache/felix/resolver/Candidates.java
@@ -276,6 +276,12 @@
// not optional, then record and throw a resolve exception.
else if (candidates.isEmpty() && !Util.isOptional(req))
{
+ if (Util.isFragment(resource) && rc.getWirings().containsKey(resource))
+ {
+ // This is a fragment that is already resolved and there is no unresolved hosts to attach it to.
+ m_populateResultCache.put(resource, Boolean.TRUE);
+ return;
+ }
String msg = "Unable to resolve " + resource
+ ": missing requirement " + req;
if (rethrow != null)