Fix for enableSystemJarsAndModules (#795)

classgraph · Mar 16, 2024 · 052bf46 · 052bf46
1 parent 287824f
commit 052bf46
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/java/nonapi/io/github/classgraph/classpath/ClasspathFinder.java b/src/main/java/nonapi/io/github/classgraph/classpath/ClasspathFinder.java
@@ -136,14 +136,14 @@ public ClasspathFinder(final ScanSpec scanSpec, final ReflectionUtils reflection
                 // It's not possible to instantiate AppClassLoader or PlatformClassLoader, so if these are
                 // passed in as override classloaders, they must have been obtained using
                 // Thread.currentThread().getContextClassLoader() [.getParent()] or similar
-                if (!scanSpec.enableSystemJarsAndModules) {
-                    if (classpathFinderLog != null && classLoaderClassName
-                            .equals("jdk.internal.loader.ClassLoaders$PlatformClassLoader")) {
+                if (!scanSpec.enableSystemJarsAndModules && classLoaderClassName
+                        .equals("jdk.internal.loader.ClassLoaders$PlatformClassLoader")) {
+                    if (classpathFinderLog != null) {
                         classpathFinderLog
                                 .log("overrideClassLoaders() was called with an instance of " + classLoaderClassName
                                         + ", so enableSystemJarsAndModules() was called automatically");
-                        scanSpec.enableSystemJarsAndModules = true;
                     }
+                    scanSpec.enableSystemJarsAndModules = true;
                 }
                 if (classLoaderClassName.equals("jdk.internal.loader.ClassLoaders$AppClassLoader")
                         || classLoaderClassName.equals("jdk.internal.loader.ClassLoaders$PlatformClassLoader")) {