| commit | 6c41cd4736c9ad49d9196c94f5cbbc842d8c8e64 | [log] [tgz] |
|---|---|---|
| author | Richard S. Hall <rickhall@apache.org> | Fri Dec 03 17:22:13 2010 +0000 |
| committer | Richard S. Hall <rickhall@apache.org> | Fri Dec 03 17:22:13 2010 +0000 |
| tree | a14a2434466c924773fd67140fd12a39b1b68546 | |
| parent | e71b91f59fcd45ca605e33229f0ae058780c07c0 [diff] |
Check the module owning the capability, not the capability identity to determine if fragment imports conflict with each other. This is necessary to deal with cases where fragments import from a module exporting the same package more than once. (FELIX-2717) git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1041919 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 ca7365a..f671d89 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
@@ -866,7 +866,7 @@ { sourceBlame = blame; } - else if (!sourceBlame.m_cap.equals(blame.m_cap)) + else if (!sourceBlame.m_cap.getModule().equals(blame.m_cap.getModule())) { // Try to permutate the conflicting requirement. permutate(candidateMap, blame.m_reqs.get(0), m_importPermutations);