Attachment 61986 Details for Bug 179132 – patch

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

[patch] patch

179132.txt (text/plain), 1.40 KB, created by Andrew Niefer

on 2007-03-26 11:57:16 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Niefer

Created: 2007-03-26 11:57:16 EDT

Size: 1.40 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.update.core
>Index: src/org/eclipse/update/internal/jarprocessor/Utils.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.update.core/src/org/eclipse/update/internal/jarprocessor/Utils.java,v
>retrieving revision 1.8
>diff -u -r1.8 Utils.java
>--- src/org/eclipse/update/internal/jarprocessor/Utils.java	21 Mar 2007 16:48:52 -0000	1.8
>+++ src/org/eclipse/update/internal/jarprocessor/Utils.java	26 Mar 2007 15:30:53 -0000
>@@ -13,6 +13,7 @@
> import java.io.*;
> import java.util.*;
> import java.util.jar.*;
>+import java.util.zip.ZipException;
> 
> /**
>  * @author aniefer@ca.ibm.com
>@@ -250,6 +251,17 @@
> 		JarFile jar = null;
> 		try {
> 			jar = new JarFile(jarFile, false);
>+		} catch (ZipException e) {
>+			//not a jar, don't bother logging this.
>+			return null;
>+		} catch (IOException e) {
>+			if (verbose) {
>+				System.out.println("Failed to obtain eclipse.inf due to IOException: " + jarFile);
>+				e.printStackTrace();
>+			}
>+			return null;
>+		}
>+		try {
> 			JarEntry mark = jar.getJarEntry(MARK_FILE_NAME);
> 			if (mark != null) {
> 				InputStream in = jar.getInputStream(mark);
>@@ -264,7 +276,6 @@
> 				System.out.println("Failed to obtain eclipse.inf due to IOException: " + jarFile);
> 				e.printStackTrace();
> 			}
>-			//not a jar
> 			return null;
> 		} finally {
> 			close(jar);

Actions: View | Diff

Attachments on bug 179132: 61986