svn commit: r1589857 - /felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Candidates.java

[ri...@apache.org]

Author: rickhall
Date: Thu Apr 24 19:58:08 2014
New Revision: 1589857

URL: http://svn.apache.org/r1589857
Log:
Apply patch FELIX-4495 to stop ignoring candidates from already resolved fragments.

Modified:
    felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Candidates.java

Modified: felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Candidates.java
URL: http://svn.apache.org/viewvc/felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Candidates.java?rev=1589857&r1=1589856&r2=1589857&view=diff
==============================================================================
--- felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Candidates.java (original)
+++ felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Candidates.java Thu Apr 24 19:58:08 2014
@@ -276,6 +276,12 @@ class Candidates
             // 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)