Skip to content

Commit

Permalink
Prevent NPE when no artifact repository is given
Browse files Browse the repository at this point in the history
Currently RawMirrorRequest can fail if no repository is given in the
descriptor and it want to log a message.

P2 should be gracefully in this case and simply report the location as
being unknown.
  • Loading branch information
laeubi committed Jun 11, 2024
1 parent a287e7e commit 1040588
Showing 1 changed file with 14 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package org.eclipse.equinox.internal.p2.artifact.repository;

import java.io.OutputStream;
import java.net.URI;
import java.util.Collection;
import java.util.Collections;
import org.eclipse.core.runtime.*;
Expand Down Expand Up @@ -95,7 +96,7 @@ protected IStatus getArtifact(IArtifactDescriptor artifactDescriptor, OutputStre
if (steps.isEmpty()) {
LogHelper.log(new Status(IStatus.WARNING, Activator.ID,
NLS.bind(Messages.noDigestAlgorithmToVerifyDownload, artifactDescriptor.getArtifactKey(),
artifactDescriptor.getRepository().getLocation())));
getLocation(artifactDescriptor))));
}
ProcessingStep[] stepArray = steps.toArray(new ProcessingStep[steps.size()]);
// TODO should probably be using createAndLink here
Expand All @@ -105,4 +106,16 @@ protected IStatus getArtifact(IArtifactDescriptor artifactDescriptor, OutputStre
subMon.setWorkRemaining(1);
return getSourceRepository().getRawArtifact(artifactDescriptor, destination, subMon.split(1));
}

private String getLocation(IArtifactDescriptor artifactDescriptor) {
IArtifactRepository repository = artifactDescriptor.getRepository();
if (repository == null) {
return "<unkown repository>"; //$NON-NLS-1$
}
URI loc = repository.getLocation();
if (loc == null) {
return "<unkown location>"; //$NON-NLS-1$
}
return loc.toASCIIString();
}
}

0 comments on commit 1040588

Please sign in to comment.