[EJBCLIENT-458] Restore exception handling semantics prior to EJBCLIE…

…NT-417 (wildfly#575)
ivassile · Nov 1, 2022 · 23b4cca · 23b4cca
1 parent 74457fb
commit 23b4cca
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/main/java/org/jboss/ejb/client/ConfigurationBasedEJBClientContextSelector.java b/src/main/java/org/jboss/ejb/client/ConfigurationBasedEJBClientContextSelector.java
@@ -247,9 +247,7 @@ private static <T> Class<? extends T> parseClassType(final ConfigurationXMLStrea
         ClassLoader cl;
         if (moduleName != null) {
             try {
-                cl = Module.getModuleFromCallerModuleLoader(moduleName).getClassLoader();
-            } catch (ModuleLoadException e) {
-                throw new ConfigXMLParseException(e);
+                cl = ModuleLoadDelegate.loadModule(moduleName);
             } catch (LinkageError e) {
                 throw Logs.MAIN.noJBossModules(streamReader);
             }
@@ -271,6 +269,16 @@ private static <T> Class<? extends T> parseClassType(final ConfigurationXMLStrea
         throw streamReader.unexpectedElement();
     }
 
+    static final class ModuleLoadDelegate {
+        static ClassLoader loadModule(String moduleName) throws ConfigXMLParseException {
+            try {
+                return Module.getModuleFromCallerModuleLoader(moduleName).getClassLoader();
+            } catch (ModuleLoadException e) {
+                throw new ConfigXMLParseException(e);
+            }
+        }
+    }
+
     private static void parseConnectionsType(final ConfigurationXMLStreamReader streamReader, final EJBClientContext.Builder builder) throws ConfigXMLParseException {
         if (streamReader.getAttributeCount() > 0) {
             throw streamReader.unexpectedAttribute(0);