Need to unwrapped modules when creating dynamic wire. (FELIX-2858)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1078948 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java b/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
index 53ff1e7..453b080 100644
--- a/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
@@ -469,8 +469,8 @@
}
cycle.add(module);
- // Create a map of wires or proposed wired depending on whether
- // the module is resolved or not.
+ // Create parallel arrays for requirement and proposed candidate
+ // capability or actual capability if module is resolved or not.
List<Requirement> reqs = new ArrayList();
List<Capability> caps = new ArrayList();
boolean isDynamicImport = false;
@@ -1415,8 +1415,8 @@
Capability.PACKAGE_NAMESPACE,
new ArrayList(0),
attrs),
- blame.m_cap.getModule(),
- blame.m_cap));
+ getActualModule(blame.m_cap.getModule()),
+ getActualCapability(blame.m_cap)));
}
}
}