Attachment 15991 Details for Bug 78128 – Apply after the first patch has been applied

[patch] Apply after the first patch has been applied

patch_78128.txt (text/plain), 1.48 KB, created by Olivier Thomann

on 2004-11-18 16:48:48 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2004-11-18 16:48:48 EST

Size: 1.48 KB

patch

obsolete

>Index: model/org/eclipse/jdt/core/ToolFactory.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/ToolFactory.java,v
>retrieving revision 1.40.2.4
>diff -u -r1.40.2.4 ToolFactory.java
>--- model/org/eclipse/jdt/core/ToolFactory.java	18 Nov 2004 21:41:57 -0000	1.40.2.4
>+++ model/org/eclipse/jdt/core/ToolFactory.java	18 Nov 2004 21:45:01 -0000
>@@ -165,7 +165,6 @@
> 		if (root != null){
> 			try {
> 				if (root instanceof JarPackageFragmentRoot) {
>-						
> 					String archiveName = null;
> 					ZipFile jar = null;
> 					try {
>@@ -209,11 +208,12 @@
> 	 * @see IClassFileReader
> 	 */
> 	public static IClassFileReader createDefaultClassFileReader(String zipFileName, String zipEntryName, int decodingFlag){
>+		ZipFile zipFile = null;
> 		try {
> 			if (JavaModelManager.ZIP_ACCESS_VERBOSE) {
> 				System.out.println("(" + Thread.currentThread() + ") [ToolFactory.createDefaultClassFileReader()] Creating ZipFile on " + zipFileName); //$NON-NLS-1$	//$NON-NLS-2$
> 			}
>-			ZipFile zipFile = new ZipFile(zipFileName);
>+			zipFile = new ZipFile(zipFileName);
> 			ZipEntry zipEntry = zipFile.getEntry(zipEntryName);
> 			if (zipEntry == null) {
> 				return null;
>@@ -227,6 +227,14 @@
> 			return null;
> 		} catch(IOException e) {
> 			return null;
>+		} finally {
>+			if (zipFile != null) {
>+				try {
>+					zipFile.close();
>+				} catch(IOException e) {
>+					// ignore
>+				}
>+			}
> 		}
> 	}

Actions: View | Diff

Attachments on bug 78128: 15973 | 15974 | 15991 | 16011