You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2015/07/13 17:18:45 UTC
svn commit: r1690722 -
/felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java
Author: gnodet
Date: Mon Jul 13 15:18:45 2015
New Revision: 1690722
URL: http://svn.apache.org/r1690722
Log:
[FELIX-4942] Do not use an intermediary list inside calculateExportedPackages
Modified:
felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java
Modified: felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java?rev=1690722&r1=1690721&r2=1690722&view=diff
==============================================================================
--- felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java (original)
+++ felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java Mon Jul 13 15:18:45 2015
@@ -1486,7 +1486,7 @@ public class ResolverImpl implements Res
List<Capability> caps = (wiring != null)
? wiring.getResourceCapabilities(null)
: resource.getCapabilities(null);
- Map<String, Capability> exports = new HashMap<String, Capability>(caps.size());
+ Map<String, Blame> exports = packages.m_exportedPkgs;
for (Capability cap : caps)
{
if (cap.getNamespace().equals(PackageNamespace.PACKAGE_NAMESPACE))
@@ -1497,7 +1497,7 @@ public class ResolverImpl implements Res
}
exports.put(
(String) cap.getAttributes().get(PackageNamespace.PACKAGE_NAMESPACE),
- cap);
+ new Blame(cap, null));
}
}
// Remove substitutable exports that were imported.
@@ -1522,13 +1522,6 @@ public class ResolverImpl implements Res
}
}
}
-
- // Add all non-substituted exports to the resources's package space.
- for (Entry<String, Capability> entry : exports.entrySet())
- {
- packages.m_exportedPkgs.put(
- entry.getKey(), new Blame(entry.getValue(), null));
- }
}
resourcePkgMap.put(resource, packages);