From fa03c791aeb9a4d16c9f0d87e2fe6702e08e0411 Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Mon, 27 Jun 2016 14:26:13 -0700 Subject: [PATCH] Change to support new packaging of modules in Java9 --- weaver/src/org/aspectj/weaver/bcel/ClassPathManager.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/weaver/src/org/aspectj/weaver/bcel/ClassPathManager.java b/weaver/src/org/aspectj/weaver/bcel/ClassPathManager.java index 9c2af9137..ee315172f 100644 --- 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)); } -- 2.39.5