Attachment 132091 Details for Bug 271681 – Surface Errors from Artifact Repositories

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Surface Errors from Artifact Repositories

SurfaceErrors-Artifact.patch (text/plain), 4.39 KB, created by Matthew Piggott

on 2009-04-16 11:16:43 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Piggott

Created: 2009-04-16 11:16:43 EDT

Size: 4.39 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.repository
>Index: src/org/eclipse/equinox/internal/p2/repository/RepositoryStatus.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/RepositoryStatus.java,v
>retrieving revision 1.3
>diff -u -r1.3 RepositoryStatus.java
>--- src/org/eclipse/equinox/internal/p2/repository/RepositoryStatus.java	15 Apr 2009 15:07:11 -0000	1.3
>+++ src/org/eclipse/equinox/internal/p2/repository/RepositoryStatus.java	16 Apr 2009 15:16:23 -0000
>@@ -117,7 +117,7 @@
> 		if (t instanceof ConnectException)
> 			return new DownloadStatus(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_FAILED_READ, NLS.bind(Messages.TransportErrorTranslator_UnableToConnectToRepository_0, toDownload), t);
> 		if (t instanceof UnknownHostException)
>-			return new DownloadStatus(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_INVALID_LOCATION, NLS.bind(Messages.TransportErrorTranslator_UnknownHost, toDownload), t);
>+			return new DownloadStatus(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_INVALID_LOCATION, NLS.bind(Messages.TransportErrorTranslator_UnknownHost, toDownload.getHost()), t);
> 		if (t instanceof IDCreateException) {
> 			IStatus status = ((IDCreateException) t).getStatus();
> 			if (status != null && status.getException() != null)
>#P org.eclipse.equinox.p2.artifact.repository
>Index: src/org/eclipse/equinox/internal/provisional/spi/p2/artifact/repository/SimpleArtifactRepositoryFactory.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/spi/p2/artifact/repository/SimpleArtifactRepositoryFactory.java,v
>retrieving revision 1.10
>diff -u -r1.10 SimpleArtifactRepositoryFactory.java
>--- src/org/eclipse/equinox/internal/provisional/spi/p2/artifact/repository/SimpleArtifactRepositoryFactory.java	2 Apr 2009 21:18:25 -0000	1.10
>+++ src/org/eclipse/equinox/internal/provisional/spi/p2/artifact/repository/SimpleArtifactRepositoryFactory.java	16 Apr 2009 15:16:23 -0000
>@@ -67,8 +67,11 @@
> 						// retry uncompressed
> 						compress = false;
> 						status = getTransport().download(SimpleArtifactRepository.getActualLocation(location, compress), artifacts, sub.newChild(100));
>-						if (!status.isOK())
>-							throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_NOT_FOUND, status.getMessage(), null));
>+						if (!status.isOK()) {
>+							if (status.getException() instanceof FileNotFoundException)
>+								throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_NOT_FOUND, status.getMessage(), null));
>+							throw new ProvisionException(status);
>+						}
> 					}
> 				} finally {
> 					if (artifacts != null)
>Index: src/org/eclipse/equinox/internal/p2/artifact/repository/CompositeArtifactRepositoryFactory.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/CompositeArtifactRepositoryFactory.java,v
>retrieving revision 1.12
>diff -u -r1.12 CompositeArtifactRepositoryFactory.java
>--- src/org/eclipse/equinox/internal/p2/artifact/repository/CompositeArtifactRepositoryFactory.java	2 Apr 2009 21:18:25 -0000	1.12
>+++ src/org/eclipse/equinox/internal/p2/artifact/repository/CompositeArtifactRepositoryFactory.java	16 Apr 2009 15:16:23 -0000
>@@ -66,8 +66,11 @@
> 						// retry uncompressed
> 						compress = false;
> 						status = getTransport().download(CompositeArtifactRepository.getActualLocation(location, compress), artifacts, sub.newChild(100));
>-						if (!status.isOK())
>-							throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_NOT_FOUND, status.getMessage(), null));
>+						if (!status.isOK()) {
>+							if (status.getException() instanceof FileNotFoundException)
>+								throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_NOT_FOUND, status.getMessage(), null));
>+							throw new ProvisionException(status);
>+						}
> 					}
> 				} finally {
> 					if (artifacts != null)

Flags:

john.arthorne: iplog+

Actions: View | Diff

Attachments on bug 271681: 131341 | 132091 | 132094