From e41e0790c0cb073e9e2e30071afecfcdc4621d42 Mon Sep 17 00:00:00 2001 From: chibash Date: Fri, 27 Oct 2017 06:51:38 +0900 Subject: [PATCH] changes ClassPool#appendSystemPath(). The new implementation appends ClassClassPath when the JVM is earlier than 9. --- javassist.jar | Bin 728963 -> 729051 bytes src/main/javassist/ClassPoolTail.java | 8 ++++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/javassist.jar b/javassist.jar index 7d27f3072f41c6aff958b2e00d1631da31793dc1..915b45a65b2690835fd53202f6e5f6c3f95a1abc 100644 GIT binary patch delta 20328 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

L(rWSvY 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 C!J*** diff --git a/src/main/javassist/ClassPoolTail.java b/src/main/javassist/ClassPoolTail.java index 681c550e..1b580855 100644 --- a/src/main/javassist/ClassPoolTail.java +++ b/src/main/javassist/ClassPoolTail.java @@ -240,8 +240,12 @@ public synchronized void removeClassPath(ClassPath cp) { } public ClassPath appendSystemPath() { - ClassLoader cl = Thread.currentThread().getContextClassLoader(); - return appendClassPath(new LoaderClassPath(cl)); + if (javassist.bytecode.ClassFile.MAJOR_VERSION < javassist.bytecode.ClassFile.JAVA_9) + return appendClassPath(new ClassClassPath()); + else { + ClassLoader cl = Thread.currentThread().getContextClassLoader(); + return appendClassPath(new LoaderClassPath(cl)); + } } public ClassPath insertClassPath(String pathname)