Change to support new packaging of modules in Java9

diff --git a/weaver/src/org/aspectj/weaver/bcel/ClassPathManager.java b/weaver/src/org/aspectj/weaver/bcel/ClassPathManager.java
index 9c2af91373bdee4524aaf28fe9eb393b436cc652..ee315172f406c10c77b30e614f0bb28143b524e9 100644 (file)
--- a/weaver/src/org/aspectj/weaver/bcel/ClassPathManager.java
+++ b/weaver/src/org/aspectj/weaver/bcel/ClassPathManager.java
@@ -38,6 +38,7 @@ import java.util.zip.ZipFile;
 
 import org.aspectj.bridge.IMessageHandler;
 import org.aspectj.bridge.MessageUtil;
+import org.aspectj.util.LangUtil;
 import org.aspectj.weaver.BCException;
 import org.aspectj.weaver.UnresolvedType;
 import org.aspectj.weaver.WeaverMessages;
@@ -100,9 +101,9 @@ public class ClassPathManager {
                                return;
                        }
                        try {
-                               if (lc.endsWith(".jimage")) {
+                               if (lc.endsWith(LangUtil.JRT_FS)) {
                                        // Java9
-                                       entries.add(new JImageEntry(f));
+                                       entries.add(new JImageEntry(new File(f.getParentFile()+File.separator+"lib"+File.separator+"modules")));
                                } else {
                                        entries.add(new ZipFileEntry(f));
                                }