diff options
| author | Andy Clement <aclement@pivotal.io> | 2018-10-23 16:44:14 -0700 |
|---|---|---|
| committer | Andy Clement <aclement@pivotal.io> | 2018-10-23 16:44:14 -0700 |
| commit | 29996dac09ab6394357dda48d83bbf4a3c636ceb (patch) | |
| tree | 5cdeb17a0fa151c952e7f6b2377ced6606857c5e | |
| parent | c0c675321782f88aee7828c40ec0776bcb30e527 (diff) | |
| download | aspectj-29996dac09ab6394357dda48d83bbf4a3c636ceb.tar.gz aspectj-29996dac09ab6394357dda48d83bbf4a3c636ceb.zip | |
Exclude delegation loader on JDK11 too (it has been renamed)
| -rw-r--r-- | loadtime/src/org/aspectj/weaver/loadtime/Aj.java | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/loadtime/src/org/aspectj/weaver/loadtime/Aj.java b/loadtime/src/org/aspectj/weaver/loadtime/Aj.java index e9c347acb..652ea0932 100644 --- a/loadtime/src/org/aspectj/weaver/loadtime/Aj.java +++ b/loadtime/src/org/aspectj/weaver/loadtime/Aj.java @@ -72,19 +72,12 @@ public class Aj implements ClassPreProcessor { } private final static String deleLoader = "sun.reflect.DelegatingClassLoader"; + private final static String deleLoader2 = "jdk.internal.reflect.DelegatingClassLoader"; // On JDK11+ - /** - * Weave - * - * @param className - * @param bytes - * @param loader - * @return woven bytes - */ @Override public byte[] preProcess(String className, byte[] bytes, ClassLoader loader, ProtectionDomain protectionDomain) { - // TODO AV needs to doc that - if (loader == null || className == null || loader.getClass().getName().equals(deleLoader)) { + if (loader == null || className == null || + loader.getClass().getName().equals(deleLoader) || loader.getClass().getName().equals(deleLoader2)) { // skip boot loader, null classes (hibernate), or those from a reflection loader return bytes; } |