You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by tj...@apache.org on 2016/05/10 20:33:40 UTC
svn commit: r1743255 -
/felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java
Author: tjwatson
Date: Tue May 10 20:33:40 2016
New Revision: 1743255
URL: http://svn.apache.org/viewvc?rev=1743255&view=rev
Log:
FELIX-5251: Avoid passing isDynamic boolean when session is available
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=1743255&r1=1743254&r2=1743255&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 Tue May 10 20:33:40 2016
@@ -529,7 +529,6 @@ public class ResolverImpl implements Res
checkConsistency(
session,
allCandidates,
- session.isDynamic(),
currentFaultyResources
)
);
@@ -556,7 +555,7 @@ public class ResolverImpl implements Res
private ResolutionError checkConsistency(
ResolveSession session,
- Candidates allCandidates, boolean isDynamic,
+ Candidates allCandidates,
Map<Resource, ResolutionError> currentFaultyResources)
{
ResolutionError rethrow = allCandidates.checkSubstitutes();
@@ -576,7 +575,7 @@ public class ResolverImpl implements Res
{
rethrow = checkPackageSpaceConsistency(
session, entry.getValue(),
- allCandidates, isDynamic, resourcePkgMap, resultCache);
+ allCandidates, session.isDynamic(), resourcePkgMap, resultCache);
if (rethrow != null)
{
Resource faultyResource = entry.getKey();