Author: rickhall
Date: Tue Nov 3 21:26:03 2009
New Revision: 832566
URL: http://svn.apache.org/viewvc?rev=832566&view=rev
Log:
Refactoring of ICapability resulted in the reporting of duplicate exports
for bundles exporting the same package more than once. We need to compare
to the capability, not the module now. (FELIX-1838)
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
URL:
http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java?rev=832566&r1=832565&r2=832566&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
(original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
Tue Nov 3 21:26:03 2009
@@ -3095,7 +3095,7 @@
// Search through the current providers to find the
target module.
for (int i = 0; (resolvedCaps != null) && (i <
resolvedCaps.size()); i++)
{
- if (((ICapability)
resolvedCaps.get(i)).getModule() == modules[modIdx])
+ if ((ICapability) resolvedCaps.get(i) ==
caps[capIdx])
{
list.add(new ExportedPackageImpl(
this, bundle, modules[modIdx],
(Capability) caps[capIdx]));