Attachment 104071 Details for Bug 236157 – Patch to close stream created when the source is a folder

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

[patch] Patch to close stream created when the source is a folder

236157a.patch (text/plain), 1.84 KB, created by Pascal Rapicault

on 2008-06-06 23:31:31 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Pascal Rapicault

Created: 2008-06-06 23:31:31 EDT

Size: 1.84 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.artifact.repository
>Index: src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java,v
>retrieving revision 1.59
>diff -u -r1.59 SimpleArtifactRepository.java
>--- src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java	6 Jun 2008 20:12:11 -0000	1.59
>+++ src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java	7 Jun 2008 03:30:36 -0000
>@@ -399,6 +399,8 @@
> 	protected IStatus downloadArtifact(IArtifactDescriptor descriptor, OutputStream destination, IProgressMonitor monitor) {
> 		if (isFolderBased(descriptor)) {
> 			File artifactFolder = getArtifactFile(descriptor);
>+			if (artifactFolder == null)
>+				return reportStatus(descriptor, destination, new Status(IStatus.ERROR, Activator.ID, NLS.bind(Messages.artifact_not_found, descriptor.getArtifactKey())));
> 			// TODO: optimize and ensure manifest is written first
> 			File zipFile = null;
> 			try {
>@@ -407,12 +409,12 @@
> 				FileInputStream fis = new FileInputStream(zipFile);
> 				FileUtils.copyStream(fis, true, destination, false);
> 			} catch (IOException e) {
>-				return new Status(IStatus.ERROR, Activator.ID, e.getMessage());
>+				return reportStatus(descriptor, destination, new Status(IStatus.ERROR, Activator.ID, e.getMessage()));
> 			} finally {
> 				if (zipFile != null)
> 					zipFile.delete();
> 			}
>-			return Status.OK_STATUS;
>+			return reportStatus(descriptor, destination, Status.OK_STATUS);
> 		}
> 
> 		//download from the best available mirror

Actions: View | Diff

Attachments on bug 236157: 104067 | 104071 | 104072