diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectBuilder.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectBuilder.java index b51241642aae..62ae3b9db97d 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectBuilder.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectBuilder.java @@ -189,8 +189,7 @@ public Severity getSeverity() { public Optional getDependencyResolverResult() { return Optional.ofNullable(res.getDependencyResolutionResult()) .map(r -> new DefaultDependencyResolverResult( - // TODO: this should not be null - null, null, r.getCollectionErrors(), session.getNode(r.getDependencyGraph()), 0)); + null, r.getCollectionErrors(), session.getNode(r.getDependencyGraph()), 0)); } }; } catch (ProjectBuildingException e) { diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyResolverResult.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyResolverResult.java index fa7ace6e0d05..742014a7527a 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyResolverResult.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyResolverResult.java @@ -102,19 +102,27 @@ public class DefaultDependencyResolverResult implements DependencyResolverResult * to {@link #addDependency(Node, Dependency, Predicate, Path)}. * * @param request the corresponding request - * @param cache cache of module information about each dependency * @param exceptions the exceptions that occurred while building the dependency graph * @param root the root node of the dependency graph * @param count estimated number of dependencies */ public DefaultDependencyResolverResult( + DependencyResolverRequest request, List exceptions, Node root, int count) { + this(request, new PathModularizationCache(), exceptions, root, count); + } + + DefaultDependencyResolverResult( DependencyResolverRequest request, PathModularizationCache cache, List exceptions, Node root, int count) { this.request = request; - this.cache = cache; + if (cache == null) { + this.cache = new PathModularizationCache(); + } else { + this.cache = cache; + } this.exceptions = exceptions; this.root = root; nodes = new ArrayList<>(count);