[JBWS-4418]:Allow MapToBeanConverter to load and create instance from…

… deployment
jbossws · May 10, 2024 · fe36cdc · fe36cdc
1 parent 8a76e29
commit fe36cdc
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/...client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/MapToBeanConverter.java b/...client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/MapToBeanConverter.java
@@ -18,6 +18,7 @@
  */
 package org.jboss.wsf.stack.cxf.client.configuration;
 
+import java.security.PrivilegedActionException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -95,7 +96,12 @@ protected Object build(String key) throws Exception {
    protected Object newInstance(String className) throws Exception {
       ClassLoader loader = SecurityActions.createDelegateClassLoader(ClassLoaderProvider.getDefaultProvider()
             .getServerIntegrationClassLoader(), SecurityActions.getContextClassLoader());
-      Class<?> clazz = SecurityActions.loadClass(loader, className);
+      Class<?> clazz = null;
+      try {
+         clazz = SecurityActions.loadClass(loader, className);
+      } catch (ClassNotFoundException e) {
+         clazz = SecurityActions.loadClass(Thread.currentThread().getContextClassLoader(), className);
+      }
       return clazz.newInstance();
    }