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:16:56 UTC
svn commit: r1690703 -
/felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java
Author: gnodet
Date: Mon Jul 13 15:16:56 2015
New Revision: 1690703
URL: http://svn.apache.org/r1690703
Log:
[FELIX-4942] Remove unused parameter in populate(Dynamic)WireMap
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=1690703&r1=1690702&r2=1690703&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:16:56 2015
@@ -395,7 +395,7 @@ public class ResolverImpl implements Res
wireMap =
populateWireMap(
rc, allCandidates.getWrappedHost(target),
- resourcePkgMap, wireMap, allCandidates);
+ wireMap, allCandidates);
}
}
}
@@ -575,7 +575,7 @@ public class ResolverImpl implements Res
allCandidates = session.getMultipleCardCandidates();
}
wireMap = populateDynamicWireMap(rc,
- host, dynamicReq, resourcePkgMap, wireMap, allCandidates);
+ host, dynamicReq, wireMap, allCandidates);
}
}
finally
@@ -1722,7 +1722,7 @@ public class ResolverImpl implements Res
}
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 @@ public class ResolverImpl implements Res
{
// 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 @@ public class ResolverImpl implements Res
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 @@ public class ResolverImpl implements Res
if (!rc.getWirings().containsKey(dynCand.getResource()))
{
- populateWireMap(rc, dynCand.getResource(), resourcePkgMap,
+ populateWireMap(rc, dynCand.getResource(),
wireMap, allCandidates);
}