Attachment 40225 Details for Bug 137235 – Weaver module patch

[patch] Weaver module patch

bug137235.weaver.patch.txt (text/plain), 2.64 KB, created by Ron Bodkin

on 2006-05-03 11:40:51 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ron Bodkin

Created: 2006-05-03 11:40:51 EDT

Size: 2.64 KB

patch

obsolete

>Index: src/org/aspectj/weaver/tools/WeavingAdaptor.java
>===================================================================
>RCS file: /home/technology/org.aspectj/modules/weaver/src/org/aspectj/weaver/tools/WeavingAdaptor.java,v
>retrieving revision 1.28
>diff -u -r1.28 WeavingAdaptor.java
>--- src/org/aspectj/weaver/tools/WeavingAdaptor.java	18 Mar 2006 13:09:34 -0000	1.28
>+++ src/org/aspectj/weaver/tools/WeavingAdaptor.java	3 May 2006 15:39:11 -0000
>@@ -317,8 +317,7 @@
> 	private void addAspectLibrary(String aspectLibraryName) {
> 		File aspectLibrary = new File(aspectLibraryName);
> 		if (aspectLibrary.isDirectory()
>-                || (aspectLibrary.isFile() 
>-                        && FileUtil.hasZipSuffix(aspectLibraryName))) {
>+                || (FileUtil.isZipFile(aspectLibrary))) {
> 			try {
> 				info("adding aspect library: '" + aspectLibrary + "'");
> 				weaver.addLibraryJarFile(aspectLibrary);
>Index: src/org/aspectj/weaver/bcel/ClassPathManager.java
>===================================================================
>RCS file: /home/technology/org.aspectj/modules/weaver/src/org/aspectj/weaver/bcel/ClassPathManager.java,v
>retrieving revision 1.13
>diff -u -r1.13 ClassPathManager.java
>--- src/org/aspectj/weaver/bcel/ClassPathManager.java	18 Apr 2006 10:51:38 -0000	1.13
>+++ src/org/aspectj/weaver/bcel/ClassPathManager.java	3 May 2006 15:39:11 -0000
>@@ -65,22 +65,23 @@
> 	public void addPath (String name, IMessageHandler handler) {
> 		File f = new File(name);
> 		String lc = name.toLowerCase();
>-		if (lc.endsWith(".jar") || lc.endsWith(".zip")) {
>+		if (!f.isDirectory()) {
> 			if (!f.isFile()) {
>-			MessageUtil.info(handler, WeaverMessages.format(WeaverMessages.ZIPFILE_ENTRY_MISSING,name));
>-			return;
>+				if (!lc.endsWith(".jar") || lc.endsWith(".zip")) {
>+					// heuristic-only: ending with .jar or .zip means probably a zip file
>+					MessageUtil.info(handler, WeaverMessages.format(WeaverMessages.ZIPFILE_ENTRY_MISSING,name));
>+				} else { 
>+					MessageUtil.info(handler, WeaverMessages.format(WeaverMessages.DIRECTORY_ENTRY_MISSING,name));
>+				}
>+				return;
> 			}
> 			try {
> 				entries.add(new ZipFileEntry(f));
> 			} catch (IOException ioe) {
>-			MessageUtil.warn(handler, WeaverMessages.format(WeaverMessages.ZIPFILE_ENTRY_INVALID,name,ioe.getMessage()));
>-			return;
>+				MessageUtil.warn(handler, WeaverMessages.format(WeaverMessages.ZIPFILE_ENTRY_INVALID,name,ioe.getMessage()));
>+				return;
> 			}
> 		} else {
>-			if (!f.isDirectory()) {
>-			MessageUtil.info(handler, WeaverMessages.format(WeaverMessages.DIRECTORY_ENTRY_MISSING,name));
>-			return;
>-			}
> 			entries.add(new DirEntry(f));
> 		}
> 	}

Flags:

aclement: iplog+

Actions: View | Diff

Attachments on bug 137235: 38800 | 40157 | 40158 | 40225 | 40226 | 40227 | 40228 | 40229 | 40230 | 40231 | 40233