[LOGMGR-336] Merge pull request #426 from geoand/quarkus-#33318

Introduce extra indirection in `ObjectBuilder$ModuleFinder`
jboss-logging · Aug 8, 2023 · 7124ec2 · 7124ec2
2 parents bd5bdd6 + 7afd61a
commit 7124ec2
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/main/java/org/jboss/logmanager/configuration/ObjectBuilder.java b/src/main/java/org/jboss/logmanager/configuration/ObjectBuilder.java
@@ -371,11 +371,18 @@ private ModuleFinder() {
         }
 
         static ClassLoader getClassLoader(final String moduleName) throws Exception {
-            ModuleLoader moduleLoader = ModuleLoader.forClass(ModuleFinder.class);
-            if (moduleLoader == null) {
-                moduleLoader = Module.getBootModuleLoader();
+            return Holder.getClassLoader(moduleName);
+        }
+
+        private static class Holder {
+
+            static ClassLoader getClassLoader(final String moduleName) throws Exception {
+                ModuleLoader moduleLoader = ModuleLoader.forClass(ModuleFinder.class);
+                if (moduleLoader == null) {
+                    moduleLoader = Module.getBootModuleLoader();
+                }
+                return moduleLoader.loadModule(moduleName).getClassLoader();
             }
-            return moduleLoader.loadModule(moduleName).getClassLoader();
         }
     }