Rollback unneeded change. (FELIX-2479)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@966727 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java b/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
index 3edea27..4daecd9 100644
--- a/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
@@ -599,7 +599,7 @@
}
// First, add all exported packages to our package space.
- calculateExportedPackages(module, modulePkgMap, candidateMap);
+ calculateExportedPackages(module, modulePkgMap);
Packages modulePkgs = modulePkgMap.get(module);
// Second, add all imported packages to our candidate space.
@@ -607,7 +607,7 @@
{
Requirement req = reqs.get(i);
Capability cap = caps.get(i);
- calculateExportedPackages(cap.getModule(), modulePkgMap, candidateMap);
+ calculateExportedPackages(cap.getModule(), modulePkgMap);
mergeCandidatePackages(module, req, cap, modulePkgMap, candidateMap);
addCapabilityDependency(cap, req, capDepSet);
}
@@ -674,7 +674,7 @@
else if (candCap.getNamespace().equals(Capability.MODULE_NAMESPACE))
{
// TODO: FELIX3 - THIS NEXT LINE IS A HACK. IMPROVE HOW/WHEN WE CALCULATE EXPORTS.
- calculateExportedPackages(candCap.getModule(), modulePkgMap, candidateMap);
+ calculateExportedPackages(candCap.getModule(), modulePkgMap);
// Get the candidate's package space to determine which packages
// will be visible to the current module.
@@ -1110,8 +1110,7 @@
}
private static void calculateExportedPackages(
- Module module, Map<Module, Packages> modulePkgMap,
- Map<Requirement, Set<Capability>> candidateMap)
+ Module module, Map<Module, Packages> modulePkgMap)
{
Packages packages = modulePkgMap.get(module);
if (packages != null)