commit e68548aa092bcb8cd978be1469fbbd4a188d3ccc
author Richard S. Hall <rickhall@apache.org> Fri Oct 30 16:01:30 2009 +0000
committer Richard S. Hall <rickhall@apache.org> Fri Oct 30 16:01:30 2009 +0000
tree df23fe740468d1a12638496393d49ebfadcee630
parent 5c08eec90df219b9cb519a7045fc45f29e5f79b4

Fixed a couple of bugs related to new fragment merging. (FELIX-1534)


git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@831360 13f79535-47bb-0310-9956-ffa450edef68

framework/src/main/java/org/apache/felix/framework/FelixResolverState.java

diff --git a/framework/src/main/java/org/apache/felix/framework/FelixResolverState.java b/framework/src/main/java/org/apache/felix/framework/FelixResolverState.java
index 058261e..666c652 100644
--- a/framework/src/main/java/org/apache/felix/framework/FelixResolverState.java
+++ b/framework/src/main/java/org/apache/felix/framework/FelixResolverState.java
@@ -155,7 +155,7 @@
                         IModule[] modules = (IModule[]) m_unresolvedPkgIndex.get(pkgName);
                         if (modules != null)
                         {
-                            modules = removeModuleFromArray(modules, fragment);
+                            modules = removeModuleFromArray(modules, host);
                             m_unresolvedPkgIndex.put(pkgName, modules);
                         }
                     }
@@ -245,7 +245,7 @@
                             IModule[] modules = (IModule[]) m_unresolvedPkgIndex.get(pkgName);
                             if (modules != null)
                             {
-                                modules = removeModuleFromArray(modules, fragment);
+                                modules = removeModuleFromArray(modules, host);
                                 m_unresolvedPkgIndex.put(pkgName, modules);
                             }
                         }