391400 Include repository URL in status if getArtifacts fails

Bug: 391400 Status returned by getArtifacts does not include repository URL of problematic repository in case of an error

1 files changed, 8 insertions, 2 deletions

diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java
index f72ae6847..0953cdea9 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java
@@ -765,7 +765,7 @@ public class SimpleArtifactRepository extends AbstractArtifactRepository impleme
 		if (monitor.isCanceled())
 			return Status.CANCEL_STATUS;
 
-		final MultiStatus overallStatus = new MultiStatus(Activator.ID, IStatus.OK, null, null);
+		final MultiStatus overallStatus = new MultiStatus(Activator.ID, IStatus.OK, NLS.bind(Messages.message_problemReadingArtifact, getLocation()), null);
 		LinkedList<IArtifactRequest> requestsPending = new LinkedList<IArtifactRequest>(Arrays.asList(requests));
 
 		int numberOfJobs = Math.min(requests.length, getMaximumThreads());
@@ -802,7 +802,13 @@ public class SimpleArtifactRepository extends AbstractArtifactRepository impleme
 				monitor.done();
 			}
 		}
-		return (monitor.isCanceled() ? Status.CANCEL_STATUS : overallStatus);
+
+		if (monitor.isCanceled())
+			return Status.CANCEL_STATUS;
+		else if (overallStatus.isOK())
+			return Status.OK_STATUS;
+		else
+			return overallStatus;
 	}
 
 	public synchronized IArtifactDescriptor getCompleteArtifactDescriptor(IArtifactKey key) {