Skip to content
This repository has been archived by the owner on Mar 19, 2019. It is now read-only.

Commit

Permalink
Fix NPE
Browse files Browse the repository at this point in the history
  • Loading branch information
cdupuis committed Jan 4, 2017
1 parent 7507fb5 commit 58ce49d
Showing 1 changed file with 6 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public DefaultOperationsLoader(DependencyResolver resolver) {

@Override
public Operations load(ArtifactDescriptor artifact) throws OperationsLoaderException {
return load(artifact, createArtifactSource(artifact));
return load(artifact, null);
}

@Override
Expand Down Expand Up @@ -100,6 +100,11 @@ public final Operations load(ArtifactDescriptor artifact, ArtifactSource source)
for (ArtifactDescriptor ad : dependencies) {
if (ad.match(artifact.group(), artifact.artifact(), artifact.version(),
Extension.ZIP)) {
// Make sure to load the ArtifactSource if it hasn't been provided
if (source == null) {
source = createArtifactSource(ad);
}

operations = loadArtifact(ad, source, reader, otherOperations);
}
else {
Expand Down

0 comments on commit 58ce49d

Please sign in to comment.