svn commit: r1041919 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java

[ri...@apache.org]

Author: rickhall
Date: Fri Dec  3 17:22:13 2010
New Revision: 1041919

URL: http://svn.apache.org/viewvc?rev=1041919&view=rev
Log:
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)

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

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java?rev=1041919&r1=1041918&r2=1041919&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java Fri Dec  3 17:22:13 2010
@@ -866,7 +866,7 @@ public class ResolverImpl implements Res
                     {
                         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);