Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2015-02-24 15:16:33 +0000
committerThomas Watson2015-02-24 15:16:33 +0000
commitecaa06e243c8f42ba2bf93512b5d43f14fa1b354 (patch)
treec8907ec591b2d178388b5f24459554956ebe5119
parent3e168c7db68f1b8fd35d50a4cd12cd17ad941296 (diff)
downloadrt.equinox.framework-ecaa06e243c8f42ba2bf93512b5d43f14fa1b354.tar.gz
rt.equinox.framework-ecaa06e243c8f42ba2bf93512b5d43f14fa1b354.tar.xz
rt.equinox.framework-ecaa06e243c8f42ba2bf93512b5d43f14fa1b354.zip
Bug 460710 - Add trace for dynamic import
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java14
1 files changed, 9 insertions, 5 deletions
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java
index cf8e4cad2..2cd90873a 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java
@@ -571,18 +571,22 @@ final class ModuleResolver {
@Override
public List<Capability> findProviders(Requirement requirement) {
+ return findProviders0(requirement, requirement);
+ }
+
+ private List<Capability> findProviders0(Requirement origReq, Requirement lookupReq) {
if (DEBUG_PROVIDERS) {
Debug.println(new StringBuilder("RESOLVER: Finding capabilities for requirement") //$NON-NLS-1$
.append(SEPARATOR).append(TAB) //
- .append(requirement) //
+ .append(origReq) //
.append(SEPARATOR).append(TAB).append(TAB) //
.append("of resource") //$NON-NLS-1$
.append(SEPARATOR).append(TAB).append(TAB).append(TAB) //
- .append(requirement.getResource()) //
+ .append(origReq.getResource()) //
.toString());
}
- List<ModuleCapability> candidates = moduleDatabase.findCapabilities(requirement);
- List<Capability> result = filterProviders(requirement, candidates);
+ List<ModuleCapability> candidates = moduleDatabase.findCapabilities(lookupReq);
+ List<Capability> result = filterProviders(origReq, candidates);
if (DEBUG_PROVIDERS) {
StringBuilder builder = new StringBuilder("RESOLVER: Capabilities being returned to the resolver"); //$NON-NLS-1$
int i = 0;
@@ -1178,7 +1182,7 @@ final class ModuleResolver {
}
private Map<Resource, List<Wire>> resolveDynamic() throws ResolutionException {
- List<Capability> dynamicMatches = filterProviders(dynamicReq.getOriginal(), moduleDatabase.findCapabilities(dynamicReq));
+ List<Capability> dynamicMatches = findProviders0(dynamicReq.getOriginal(), dynamicReq);
return new ResolverImpl(new Logger(0)).resolve(this, dynamicReq.getRevision(), dynamicReq.getOriginal(), dynamicMatches);
}

Back to the top