Attachment 67672 Details for Bug 187580 – updated patch

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

[patch] updated patch

187580.txt (text/plain), 2.42 KB, created by Andrew Niefer

on 2007-05-17 12:01:50 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Niefer

Created: 2007-05-17 12:01:50 EDT

Size: 2.42 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.update.core
>Index: src/org/eclipse/update/internal/core/FeaturePackagedContentProvider.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePackagedContentProvider.java,v
>retrieving revision 1.55
>diff -u -r1.55 FeaturePackagedContentProvider.java
>--- src/org/eclipse/update/internal/core/FeaturePackagedContentProvider.java	21 Mar 2007 17:34:42 -0000	1.55
>+++ src/org/eclipse/update/internal/core/FeaturePackagedContentProvider.java	17 May 2007 16:00:21 -0000
>@@ -229,7 +229,20 @@
> 		
> 		if (packedRef == null) {
> 			//no pack.gz on server, get normal jar
>-			return asLocalReference(reference, monitor);
>+			ContentReference contentReference = null;
>+			try {
>+				contentReference = asLocalReference(reference, monitor);
>+			}
>+			catch (FileNotFoundException e) {
>+				contentReference = continueOnErrorOrRethrow(reference.getIdentifier(), e);
>+			}
>+			catch (IOException e) {
>+				contentReference = continueOnErrorOrRethrow(reference.getIdentifier(), e);
>+			}
>+			catch (CoreException e) {
>+				contentReference = continueOnErrorOrRethrow(reference.getIdentifier(), e);
>+			}
>+			return contentReference;
> 		}
> 
> 		boolean success = false;
>@@ -253,7 +266,11 @@
> 						monitor.showCopyDetails(false);
> 					}
> 					//unpacking the jar will strip the ".pack.gz" and leave us back with the original filename
>-					processor.processJar(packedFile);
>+					try {
>+						processor.processJar(packedFile);
>+					} catch (Throwable e) {
>+						//something is wrong unpacking
>+					}
> 	
> 					if(tempFile.exists() && tempFile.length() > 0){
> 						success = true;
>@@ -271,7 +288,20 @@
> 		}
> 		if(!success){
> 			//Something went wrong with the unpack, get the normal jar.
>-			return asLocalReference(reference, monitor);
>+			ContentReference contentReference = null;
>+			try {
>+				contentReference = asLocalReference(reference, monitor);
>+			}
>+			catch (FileNotFoundException e) {
>+				contentReference = continueOnErrorOrRethrow(reference.getIdentifier(), e);
>+			}
>+			catch (IOException e) {
>+				contentReference = continueOnErrorOrRethrow(reference.getIdentifier(), e);
>+			}
>+			catch (CoreException e) {
>+				contentReference = continueOnErrorOrRethrow(reference.getIdentifier(), e);
>+			}
>+			return contentReference;
> 		}
> 		return packedRef;
> 	}

Actions: View | Diff

Attachments on bug 187580: 67669 | 67672