Attachment 104067 Details for Bug 236157 – Patch ensuring that retry errors are not being consumed

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

[patch] Patch ensuring that retry errors are not being consumed

236157b.patch (text/plain), 1.69 KB, created by Pascal Rapicault

on 2008-06-06 23:13:38 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Pascal Rapicault

Created: 2008-06-06 23:13:38 EDT

Size: 1.69 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.artifact.repository
>Index: src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorRequest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorRequest.java,v
>retrieving revision 1.21
>diff -u -r1.21 MirrorRequest.java
>--- src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorRequest.java	4 Jun 2008 18:53:13 -0000	1.21
>+++ src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorRequest.java	7 Jun 2008 03:12:48 -0000
>@@ -156,16 +156,21 @@
> 			return e.getStatus();
> 		}
> 
>+		IStatus status = null;
> 		// Do the actual transfer
> 		try {
>-			return getSourceRepository().getArtifact(sourceDescriptor, destination, monitor);
>+			status = getSourceRepository().getArtifact(sourceDescriptor, destination, monitor);
> 		} finally {
> 			try {
> 				destination.close();
> 			} catch (IOException e) {
>-				return new Status(IStatus.ERROR, Activator.ID, NLS.bind(Messages.error_closing_stream, getArtifactKey(), target.getLocation()), e);
>+				if (status != null && status.getSeverity() == IStatus.ERROR && status.getCode() == IArtifactRepository.CODE_RETRY)
>+					status = new MultiStatus(Activator.ID, status.getCode(), new IStatus[] {status}, NLS.bind(Messages.error_closing_stream, getArtifactKey(), target.getLocation()), e);
>+				else
>+					status = new Status(IStatus.ERROR, Activator.ID, NLS.bind(Messages.error_closing_stream, getArtifactKey(), target.getLocation()), e);
> 			}
> 		}
>+		return status;
> 	}
> 
> 	public String toString() {

Actions: View | Diff

Attachments on bug 236157: 104067 | 104071 | 104072