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 2011/07/21 17:26:54 UTC
svn commit: r1149222 -
/felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
Author: rickhall
Date: Thu Jul 21 15:26:53 2011
New Revision: 1149222
URL: http://svn.apache.org/viewvc?rev=1149222&view=rev
Log:
Wires for dynamic imports should use the declared requirement object,
not a synthesized one. Also, we can simplify how we populate the wire
map for a dynamic import. (FELIX-2950)
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java?rev=1149222&r1=1149221&r2=1149222&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java Thu Jul 21 15:26:53 2011
@@ -554,9 +554,7 @@ public class ResolverImpl implements Res
return null;
}
- // Loop through the importer's dynamic requirements to determine if
- // there is a matching one for the package from which we want to
- // load a class.
+ // Determine if any providers of the package exist.
Map<String, Object> attrs = new HashMap(1);
attrs.put(BundleRevision.PACKAGE_NAMESPACE, pkgName);
BundleRequirementImpl req = new BundleRequirementImpl(
@@ -566,7 +564,7 @@ public class ResolverImpl implements Res
attrs);
SortedSet<BundleCapability> candidates = state.getCandidates(req, false);
- // First find a dynamic requirement that matches the capabilities.
+ // Try to find a dynamic requirement that matches the capabilities.
BundleRequirementImpl dynReq = null;
for (int dynIdx = 0;
(candidates.size() > 0) && (dynReq == null) && (dynIdx < dynamics.size());
@@ -639,11 +637,10 @@ public class ResolverImpl implements Res
// Use wires to get actual requirements and satisfying capabilities.
for (BundleWire wire : revision.getWiring().getRequiredWires(null))
{
- // Wrap the requirement as a hosted requirement
- // if it comes from a fragment, since we will need
- // to know the host. We also need to wrap if the
- // requirement is a dynamic import, since that
- // requirement will be shared with any other
+ // Wrap the requirement as a hosted requirement if it comes
+ // from a fragment, since we will need to know the host. We
+ // also need to wrap if the requirement is a dynamic import,
+ // since that requirement will be shared with any other
// matching dynamic imports.
BundleRequirement r = wire.getRequirement();
if (!r.getRevision().equals(wire.getRequirerWiring().getRevision())
@@ -654,9 +651,8 @@ public class ResolverImpl implements Res
wire.getRequirerWiring().getRevision(),
(BundleRequirementImpl) r);
}
- // Wrap the capability as a hosted capability
- // if it comes from a fragment, since we will need
- // to know the host.
+ // Wrap the capability as a hosted capability if it comes
+ // from a fragment, since we will need to know the host.
BundleCapability c = wire.getCapability();
if (!c.getRevision().equals(wire.getProviderWiring().getRevision()))
{
@@ -1608,40 +1604,45 @@ public class ResolverImpl implements Res
List<ResolverWire> packageWires = new ArrayList<ResolverWire>();
- Packages pkgs = revisionPkgMap.get(revision);
- for (Entry<String, List<Blame>> entry : pkgs.m_importedPkgs.entrySet())
- {
- for (Blame blame : entry.getValue())
+ BundleRequirement dynReq = null;
+ BundleCapability dynCand = null;
+ for (BundleRequirement req
+ : Util.getDynamicRequirements(revision.getWiring().getRequirements(null)))
+ {
+ // Get the candidates for the current dynamic requirement.
+ SortedSet<BundleCapability> candCaps =
+ allCandidates.getCandidates((BundleRequirementImpl) req);
+ // Optional requirements may not have any candidates.
+ if ((candCaps == null) || candCaps.isEmpty())
{
- // Ignore revisions that import themselves.
- if (!revision.equals(blame.m_cap.getRevision())
- && blame.m_cap.getAttributes().get(BundleRevision.PACKAGE_NAMESPACE)
- .equals(pkgName))
- {
- if (blame.m_cap.getRevision().getWiring() == null)
- {
- populateWireMap(blame.m_cap.getRevision(), revisionPkgMap, wireMap,
- allCandidates);
- }
+ continue;
+ }
- Packages candPkgs = revisionPkgMap.get(blame.m_cap.getRevision());
- Map<String, Object> attrs = new HashMap(1);
- attrs.put(BundleRevision.PACKAGE_NAMESPACE, pkgName);
- packageWires.add(
- new ResolverWireImpl(
- revision,
- // We need an unique requirement here or else subsequent
- // dynamic imports for the same dynamic requirement will
- // conflict with previous ones.
- new BundleRequirementImpl(
- revision,
- BundleRevision.PACKAGE_NAMESPACE,
- Collections.EMPTY_MAP,
- attrs),
- getActualBundleRevision(blame.m_cap.getRevision()),
- getActualCapability(blame.m_cap)));
- }
+ // Record the dynamic requirement.
+ dynReq = req;
+ dynCand = candCaps.first();
+
+ // Can only dynamically import one at a time, so break
+ // out of the loop after the first.
+ break;
+ }
+
+ if (dynReq != null)
+ {
+ if (dynCand.getRevision().getWiring() == null)
+ {
+ populateWireMap(dynCand.getRevision(), revisionPkgMap, wireMap,
+ allCandidates);
}
+
+ Map<String, Object> attrs = new HashMap(1);
+ attrs.put(BundleRevision.PACKAGE_NAMESPACE, pkgName);
+ packageWires.add(
+ new ResolverWireImpl(
+ revision,
+ dynReq,
+ getActualBundleRevision(dynCand.getRevision()),
+ getActualCapability(dynCand)));
}
wireMap.put(revision, packageWires);