fix for 42574. (Not using FileUtil.listFiles as recursive (and looks broken for nested files), because I think jre/ext dir is not - should confirm.

1 files changed, 4 insertions, 6 deletions

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java
index 6adf13c3f..0fae2686a 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java
@@ -250,15 +250,13 @@ public class BuildArgParser extends Main {
 		while (tokenizer.hasMoreTokens()) {
 //			classpathCollector.add(tokenizer.nextToken());
 			File dirFile = new File((String)tokenizer.nextToken());
-			if (dirFile.exists() && dirFile.isDirectory()) {
-				File[] files = FileUtil.listFiles(dirFile, new FileFilter() {
-					public boolean accept(File pathname) {
-						return pathname.isFile() && pathname.getName().endsWith(".jar"); 
-					}
-				});
+			if (dirFile.canRead() && dirFile.isDirectory()) {
+				File[] files = dirFile.listFiles(FileUtil.ZIP_FILTER);
 				for (int i = 0; i < files.length; i++) {
 					classpathCollector.add(files[i].getAbsolutePath());	
 				}
+			} else {
+                // XXX alert on invalid -extdirs entries
 			}
 		}	
 	}