Attachment 58283 Details for Bug 149970 – patch to update.core

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

[patch] patch to update.core

149970.txt (text/plain), 2.10 KB, created by Andrew Niefer

on 2007-02-05 16:13:09 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Niefer

Created: 2007-02-05 16:13:09 EST

Size: 2.10 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.update.core
>Index: src/org/eclipse/update/internal/jarprocessor/JarProcessor.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.update.core/src/org/eclipse/update/internal/jarprocessor/JarProcessor.java,v
>retrieving revision 1.5
>diff -u -r1.5 JarProcessor.java
>--- src/org/eclipse/update/internal/jarprocessor/JarProcessor.java	24 Nov 2006 19:29:30 -0000	1.5
>+++ src/org/eclipse/update/internal/jarprocessor/JarProcessor.java	5 Feb 2007 21:11:31 -0000
>@@ -123,11 +123,33 @@
> 				if (replacements.containsKey(entry.getName())) {
> 					String name = (String) replacements.get(entry.getName());
> 					replacement = new File(directory, name);
>-					in = new BufferedInputStream(new FileInputStream(replacement));
>-					newEntry = new JarEntry(name);
>-				} else {
>-					in = new BufferedInputStream(jar.getInputStream(entry));
>-					newEntry = new JarEntry(entry.getName());
>+					if (name != null) {
>+						if (replacement.exists()) {
>+							try {
>+								in = new BufferedInputStream(new FileInputStream(replacement));
>+								newEntry = new JarEntry(name);
>+							} catch (Exception e) {
>+								if (verbose) {
>+									e.printStackTrace();
>+									System.out.println("Warning: Problem reading " +replacement.getPath() + ", using " + jar.getName() + File.separator + entry.getName()  + " instead.");
>+								}
>+							}
>+						} else if (verbose) {
>+							System.out.println("Warning: " + replacement.getPath() + " not found, using " + jar.getName() + File.separator + entry.getName() + " instead.");	
>+						}
>+					}
>+				}
>+				if (newEntry == null) {
>+					try {
>+						in = new BufferedInputStream(jar.getInputStream(entry));
>+						newEntry = new JarEntry(entry.getName());
>+					} catch( Exception e ) {
>+						if(verbose) {
>+							e.printStackTrace();
>+							System.out.println("ERROR: problem reading " + entry.getName() + " from " + jar.getName());
>+						}
>+						continue;
>+					}
> 				}
> 				newEntry.setTime(entry.getTime());
> 				outputJar.putNextEntry(newEntry);

Actions: View | Diff

Attachments on bug 149970: 58271 | 58283 | 58284