svn commit: r606010 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java

[rickhall]

Author: rickhall
Date: Thu Dec 20 11:54:37 2007
New Revision: 606010

URL: http://svn.apache.org/viewvc?rev=606010&view=rev
Log:
The TCK has changed to verify that bundles do not depend on themselves,
so we filter that case now. We might want to consider modifying the module
layer to not create wires from modules to themself.

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=606010&r1=606009&r2=606010&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 
Thu Dec 20 11:54:37 2007
@@ -3110,19 +3110,24 @@
             IModule[] depModules = ((ModuleImpl) 
expModules[expIdx]).getDependents();
             for (int depIdx = 0; (depModules != null) && (depIdx < 
depModules.length); depIdx++)
             {
-                // See if the dependent module has a wire for the specific
-                // package. If so, see if the provider module is from the
-                // exporter and record it if it is.
-                IWire wire = Util.getWire(depModules[depIdx], ep.getName());
-                if ((wire != null) && 
expModules[expIdx].equals(wire.getExporter()) &&
-                    wire.getRequirement().isSatisfied(
-                    new Capability(ICapability.PACKAGE_NAMESPACE, null, new 
R4Attribute[] {
-                        new R4Attribute(ICapability.PACKAGE_PROPERTY, 
ep.getName(), false),
-                        new R4Attribute(ICapability.VERSION_PROPERTY, 
ep.getVersion(), false)
-                    })))
+                // ExportedPackage.getImportingBundles() does not expect 
bundles
+                // to depend on themselves, so we will filter that case here.
+                if (!expModules[expIdx].equals(depModules[depIdx]))
                 {
-                    // Add the bundle to the list of importers.
-                    
list.add(getBundle(Util.getBundleIdFromModuleId(depModules[depIdx].getId())));
+                    // See if the dependent module has a wire for the specific
+                    // package. If so, see if the provider module is from the
+                    // exporter and record it if it is.
+                    IWire wire = Util.getWire(depModules[depIdx], 
ep.getName());
+                    if ((wire != null) && 
expModules[expIdx].equals(wire.getExporter()) &&
+                        wire.getRequirement().isSatisfied(
+                        new Capability(ICapability.PACKAGE_NAMESPACE, null, 
new R4Attribute[] {
+                            new R4Attribute(ICapability.PACKAGE_PROPERTY, 
ep.getName(), false),
+                            new R4Attribute(ICapability.VERSION_PROPERTY, 
ep.getVersion(), false)
+                        })))
+                    {
+                        // Add the bundle to the list of importers.
+                        
list.add(getBundle(Util.getBundleIdFromModuleId(depModules[depIdx].getId())));
+                    }
                 }
             }
         }