Prevent NPE when no artifact repository is given

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.
eclipse-equinox · Jun 16, 2024 · 8a25278 · 8a25278
1 parent 5c5045c
commit 8a25278
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 6 deletions.
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.artifact.repository/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.equinox.p2.artifact.repository;singleton:=true
-Bundle-Version: 1.5.400.qualifier
+Bundle-Version: 1.5.500.qualifier
 Bundle-Activator: org.eclipse.equinox.internal.p2.artifact.repository.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

diff --git a/....repository/src/org/eclipse/equinox/internal/p2/artifact/repository/RawMirrorRequest.java b/....repository/src/org/eclipse/equinox/internal/p2/artifact/repository/RawMirrorRequest.java
@@ -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.*;
@@ -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
@@ -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();
+	}
 }
diff --git a/features/org.eclipse.equinox.p2.core.feature/feature.xml b/features/org.eclipse.equinox.p2.core.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.equinox.p2.core.feature"
       label="%featureName"
-      version="1.7.200.qualifier"
+      version="1.7.300.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">

diff --git a/features/org.eclipse.equinox.p2.extras.feature/feature.xml b/features/org.eclipse.equinox.p2.extras.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.equinox.p2.extras.feature"
       label="%featureName"
-      version="1.4.2400.qualifier"
+      version="1.4.2500.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">

diff --git a/features/org.eclipse.equinox.p2.rcp.feature/feature.xml b/features/org.eclipse.equinox.p2.rcp.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.equinox.p2.rcp.feature"
       label="%featureName"
-      version="1.4.2400.qualifier"
+      version="1.4.2500.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">

diff --git a/features/org.eclipse.equinox.server.p2/feature.xml b/features/org.eclipse.equinox.server.p2/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.equinox.server.p2"
       label="%featureName"
-      version="1.12.1300.qualifier"
+      version="1.12.1400.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">