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 2008/10/15 22:31:37 UTC
svn commit: r705026 -
/felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java
Author: rickhall
Date: Wed Oct 15 13:31:36 2008
New Revision: 705026
URL: http://svn.apache.org/viewvc?rev=705026&view=rev
Log:
Modified resolver to correctly mark fragment modules as resolved. (FELIX-777)
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java?rev=705026&r1=705025&r2=705026&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java Wed Oct 15 13:31:36 2008
@@ -1060,14 +1060,6 @@
getBundleSymbolicName(targetFragment),
new IModule[] { targetFragment });
}
-for (Iterator iter = fragmentMap.entrySet().iterator(); iter.hasNext(); )
-{
- Map.Entry entry = (Map.Entry) iter.next();
- String symName = (String) entry.getKey();
- IModule[] fragments = (IModule[]) entry.getValue();
- m_logger.log(Logger.LOG_DEBUG, "(FRAGMENT) WIRE: "
- + rootModule + " -> " + symName + " -> " + fragments[0]);
-}
// This variable maps an unresolved module to a list of candidate
// sets, where there is one candidate set for each requirement that
@@ -1118,9 +1110,13 @@
for (Iterator iter = fragmentMap.entrySet().iterator(); iter.hasNext(); )
{
Map.Entry entry = (Map.Entry) iter.next();
+ String symName = (String) entry.getKey();
IModule[] fragments = (IModule[]) entry.getValue();
// TODO: FRAGMENT - For now, just attach first candidate.
list.add(fragments[0]);
+ setResolved(fragments[0], true);
+m_logger.log(Logger.LOG_DEBUG, "(FRAGMENT) WIRE: "
+ + rootModule + " -> " + symName + " -> " + fragments[0]);
}
try
{