felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickh...@apache.org
Subject svn commit: r831360 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/FelixResolverState.java
Date Fri, 30 Oct 2009 16:01:30 GMT
Author: rickhall
Date: Fri Oct 30 16:01:30 2009
New Revision: 831360

URL: http://svn.apache.org/viewvc?rev=831360&view=rev
Log:
Fixed a couple of bugs related to new fragment merging. (FELIX-1534)

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

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/FelixResolverState.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/FelixResolverState.java?rev=831360&r1=831359&r2=831360&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/FelixResolverState.java
(original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/FelixResolverState.java
Fri Oct 30 16:01:30 2009
@@ -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);
                             }
                         }



Mime
View raw message