You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2009/10/30 17:01:30 UTC
svn commit: r831360 -
/felix/trunk/framework/src/main/java/org/apache/felix/framework/FelixResolverState.java
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);
}
}