diff options
Diffstat (limited to 'bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/Candidates.java')
-rwxr-xr-x | bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/Candidates.java | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/Candidates.java b/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/Candidates.java index af597d487..f2ef54f52 100755 --- a/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/Candidates.java +++ b/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/Candidates.java @@ -184,17 +184,15 @@ class Candidates addCandidates(result.candidates); result.candidates = null; result.remaining = null; - if (!Util.isFragment(resource)) + Collection<Resource> relatedResources = rc.findRelatedResources(resource); + m_session.setRelatedResources(resource, relatedResources); + for (Resource relatedResource : relatedResources) { - Collection<Resource> ondemandFragments = rc.findRelatedResources(resource); - for (Resource fragment : ondemandFragments) + if (m_session.isValidRelatedResource(relatedResource)) { - if (m_session.isValidOnDemandResource(fragment)) - { - // This resource is a valid on demand resource; - // populate it now, consider it optional - toPopulate.addFirst(fragment); - } + // This resource is a valid related resource; + // populate it now, consider it optional + toPopulate.addFirst(relatedResource); } } continue; |