From: Andy Clement <aclement@pivotal.io>
Date: Mon, 27 Jun 2016 21:26:13 +0000 (-0700)
Subject: Change to support new packaging of modules in Java9
X-Git-Tag: V1_9_0_BETA4~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fa03c791aeb9a4d16c9f0d87e2fe6702e08e0411;p=aspectj.git

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 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));
 				}