fixes for 137235 (contributed by Ron): more intelligent logic for determining if a path entry is a jar/zip (don't just rely on suffix, some new .bndl files seem to be becoming popular...)

2 files changed, 11 insertions, 11 deletions

diff --git a/weaver/src/org/aspectj/weaver/bcel/ClassPathManager.java b/weaver/src/org/aspectj/weaver/bcel/ClassPathManager.java
index 2b3b120e3..6876d0a50 100644
--- a/weaver/src/org/aspectj/weaver/bcel/ClassPathManager.java
+++ b/weaver/src/org/aspectj/weaver/bcel/ClassPathManager.java
@@ -65,22 +65,23 @@ public class ClassPathManager {
 	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));
 		}
 	}
diff --git a/weaver/src/org/aspectj/weaver/tools/WeavingAdaptor.java b/weaver/src/org/aspectj/weaver/tools/WeavingAdaptor.java
index 75ffc5de6..ff280aab9 100644
--- a/weaver/src/org/aspectj/weaver/tools/WeavingAdaptor.java
+++ b/weaver/src/org/aspectj/weaver/tools/WeavingAdaptor.java
@@ -317,8 +317,7 @@ public class WeavingAdaptor {
 	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);