@@ -16,10 +16,6 @@ public class IsolatedClassLoader extends URLClassLoader {
1616
1717 private static boolean isEnabled = false ;
1818
19- public static boolean isEnabled () {
20- return isEnabled ;
21- }
22-
2319 static {
2420 try {
2521 Class <SkipIsolatedClassLoader > clazz = SkipIsolatedClassLoader .class ;
@@ -30,7 +26,7 @@ public static boolean isEnabled() {
3026
3127 private final Set <String > excludedClasses = new HashSet <>();
3228 private final Set <String > excludedPackages = new HashSet <>();
33-
29+
3430 private final MethodHandles .Lookup lookup = MethodHandles .lookup ();
3531 private MethodHandle methodHandleTaboolibCommonRun ;
3632
@@ -45,51 +41,49 @@ public IsolatedClassLoader(URL[] urls, ClassLoader parent) {
4541 ServiceLoader <IsolatedClassLoaderConfig > serviceLoader = ServiceLoader .load (IsolatedClassLoaderConfig .class , parent );
4642 for (IsolatedClassLoaderConfig config : serviceLoader ) {
4743 Set <String > configExcludedClasses = config .excludedClasses ();
48- if (configExcludedClasses != null && !configExcludedClasses .isEmpty ())
44+ if (configExcludedClasses != null && !configExcludedClasses .isEmpty ()) {
4945 excludedClasses .addAll (configExcludedClasses );
50-
46+ }
5147 Set <String > configExcludedPackages = config .excludedPackages ();
52- if (configExcludedPackages != null && !configExcludedPackages .isEmpty ())
48+ if (configExcludedPackages != null && !configExcludedPackages .isEmpty ()) {
5349 excludedPackages .addAll (configExcludedPackages );
50+ }
5451 }
5552 }
56-
53+
5754 @ Override
5855 protected Class <?> loadClass (String name , boolean resolve ) throws ClassNotFoundException {
5956 return loadClass (name , resolve , true );
6057 }
6158
6259 public Class <?> loadClass (String name , boolean resolve , boolean checkParents ) throws ClassNotFoundException {
6360 synchronized (getClassLoadingLock (name )) {
64- Class <?> c = findLoadedClass (name );
65-
61+ Class <?> findClass = findLoadedClass (name );
6662 // Check isolated classes and libraries before parent to:
6763 // - prevent accessing classes of other plugins
6864 // - prevent the usage of old patch classes (which stay in memory after reloading)
69- if (c == null && !excludedClasses .contains (name )) {
65+ if (findClass == null && !excludedClasses .contains (name )) {
7066 boolean flag = true ;
7167 for (String excludedPackage : excludedPackages ) {
7268 if (name .startsWith (excludedPackage )) {
7369 flag = false ;
7470 break ;
7571 }
7672 }
77- if (flag ) c = findClassOrNull (name );
73+ if (flag ) {
74+ findClass = findClassOrNull (name );
75+ }
7876 }
79-
80- if (c == null && checkParents ) {
81- c = loadClassFromParentOrNull (name );
77+ if (findClass == null && checkParents ) {
78+ findClass = loadClassFromParentOrNull (name );
8279 }
83-
84- if (c == null ) {
80+ if (findClass == null ) {
8581 throw new ClassNotFoundException (name );
8682 }
87-
8883 if (resolve ) {
89- resolveClass (c );
84+ resolveClass (findClass );
9085 }
91-
92- return c ;
86+ return findClass ;
9387 }
9488 }
9589
@@ -128,16 +122,16 @@ public void addExcludedPackages(Collection<String> names) {
128122 public void runIsolated (Runnable target ) throws Throwable {
129123 getMethodHandleTaboolibCommonRun ().invoke (target );
130124 }
131-
125+
132126 private MethodHandle getMethodHandleTaboolibCommonRun () throws ClassNotFoundException , NoSuchMethodException , IllegalAccessException {
133127 if (methodHandleTaboolibCommonRun == null ) {
134- methodHandleTaboolibCommonRun = lookup .findStatic (
135- loadClass ("taboolib.common.TabooLibCommon" ),
136- "run" ,
137- MethodType .methodType (void .class , Runnable .class )
138- );
128+ methodHandleTaboolibCommonRun = lookup .findStatic (loadClass ("taboolib.common.TabooLibCommon" ), "run" , MethodType .methodType (void .class , Runnable .class ));
139129 }
140130 return methodHandleTaboolibCommonRun ;
141131 }
142-
132+
133+ public static boolean isEnabled () {
134+ return isEnabled ;
135+ }
143136}
137+
0 commit comments