Attachment 126038 Details for Bug 262073 – Fix + tests v01

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

[patch] Fix + tests v01

patch.txt (text/plain), 1.51 KB, created by John Arthorne

on 2009-02-18 11:23:18 EST

(hide)

Description:

Filename:

MIME Type:

Creator: John Arthorne

Created: 2009-02-18 11:23:18 EST

Size: 1.51 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.metadata.repository
>Index: src/org/eclipse/equinox/internal/p2/metadata/repository/CacheManager.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/CacheManager.java,v
>retrieving revision 1.5
>diff -u -r1.5 CacheManager.java
>--- src/org/eclipse/equinox/internal/p2/metadata/repository/CacheManager.java	22 Jan 2009 23:23:02 -0000	1.5
>+++ src/org/eclipse/equinox/internal/p2/metadata/repository/CacheManager.java	17 Feb 2009 22:07:56 -0000
>@@ -84,14 +84,17 @@
> 			}
> 			cacheFile.getParentFile().mkdirs();
> 			OutputStream metadata = new BufferedOutputStream(new FileOutputStream(cacheFile));
>+			IStatus result;
> 			try {
>-				IStatus result = getTransport().download(remoteFile.toString(), metadata, monitor);
>-				if (!result.isOK()) {
>-					throw new ProvisionException(result);
>-				}
>+				result = getTransport().download(remoteFile.toString(), metadata, monitor);
> 			} finally {
> 				metadata.close();
> 			}
>+			if (!result.isOK()) {
>+				//don't leave a partial cache file lying around
>+				cacheFile.delete();
>+				throw new ProvisionException(result);
>+			}
> 		}
> 		return cacheFile;
> 	}
>@@ -169,7 +172,7 @@
> 			// cache is stale
> 			return true;
> 		}
>-		return lastModifiedRemote > lastModified ? true : false;
>+		return lastModifiedRemote > lastModified;
> 	}
> 
> 	/**

Actions: View | Diff

Attachments on bug 262073: 126038