svn commit: r966727 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java

[ri...@apache.org]

Author: rickhall
Date: Thu Jul 22 16:17:50 2010
New Revision: 966727

URL: http://svn.apache.org/viewvc?rev=966727&view=rev
Log:
Rollback unneeded change. (FELIX-2479)

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=966727&r1=966726&r2=966727&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 22 16:17:50 2010
@@ -599,7 +599,7 @@ public class ResolverImpl implements Res
         }
 
         // 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 @@ public class ResolverImpl implements Res
         {
             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 @@ public class ResolverImpl implements Res
         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 @@ public class ResolverImpl implements Res
     }
 
     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)