commit c38ce1f39858f60a7e0346d623684d515f3595bc
author Guillaume Nodet <gnodet@apache.org> Mon Jul 13 15:16:56 2015 +0000
committer Guillaume Nodet <gnodet@apache.org> Mon Jul 13 15:16:56 2015 +0000
tree 1a0511112883508daa93518791f1caa077d36efd
parent 80b684ff356cad159df0e468855d82687499b9c8

[FELIX-4942] Remove unused parameter in populate(Dynamic)WireMap

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1690703 13f79535-47bb-0310-9956-ffa450edef68

resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java

diff --git a/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java b/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java
index 3bd6616..24281ab 100644
--- a/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java
+++ b/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java
@@ -395,7 +395,7 @@
                             wireMap =
                                 populateWireMap(
                                     rc, allCandidates.getWrappedHost(target),
-                                    resourcePkgMap, wireMap, allCandidates);
+                                    wireMap, allCandidates);
                         }
                     }
                 }
@@ -575,7 +575,7 @@
                             allCandidates = session.getMultipleCardCandidates();
                         }
                         wireMap = populateDynamicWireMap(rc,
-                            host, dynamicReq, resourcePkgMap, wireMap, allCandidates);
+                            host, dynamicReq, wireMap, allCandidates);
                     }
                 }
                 finally
@@ -1722,7 +1722,7 @@
     }
 
     private static Map<Resource, List<Wire>> populateWireMap(
-        ResolveContext rc, Resource resource, Map<Resource, Packages> resourcePkgMap,
+        ResolveContext rc, Resource resource,
         Map<Resource, List<Wire>> wireMap, Candidates allCandidates)
     {
         Resource unwrappedResource = getDeclaredResource(resource);
@@ -1750,7 +1750,7 @@
                         {
                             // Populate wires for the candidate
                             populateWireMap(rc, cand.getResource(),
-                                    resourcePkgMap, wireMap, allCandidates);
+                                    wireMap, allCandidates);
 
                             Resource provider;
                             if (req.getNamespace().equals(IdentityNamespace.IDENTITY_NAMESPACE)) {
@@ -1880,7 +1880,6 @@
 
     private static Map<Resource, List<Wire>> populateDynamicWireMap(
         ResolveContext rc, Resource resource, Requirement dynReq,
-        Map<Resource, Packages> resourcePkgMap,
         Map<Resource, List<Wire>> wireMap, Candidates allCandidates)
     {
         wireMap.put(resource, Collections.<Wire>emptyList());
@@ -1893,7 +1892,7 @@
 
         if (!rc.getWirings().containsKey(dynCand.getResource()))
         {
-            populateWireMap(rc, dynCand.getResource(), resourcePkgMap,
+            populateWireMap(rc, dynCand.getResource(),
                 wireMap, allCandidates);
         }