GH-2744 Wrap shared beans loading in Throwable

Resolves #2744
This commit is contained in:
Oleg Zhurakousky
2023-06-07 14:24:04 +02:00
parent e15e5e3a15
commit 08d68aaae2

View File

@@ -377,7 +377,7 @@ public class DefaultBinderFactory implements BinderFactory, DisposableBean, Appl
try { try {
Enumeration<URL> resources = ClassUtils.getDefaultClassLoader().getResources("META-INF/shared.beans"); Enumeration<URL> resources = ClassUtils.getDefaultClassLoader().getResources("META-INF/shared.beans");
while (resources.hasMoreElements()) { while (resources.hasMoreElements()) {
URL url = (URL) resources.nextElement(); URL url = resources.nextElement();
UrlResource resource = new UrlResource(url); UrlResource resource = new UrlResource(url);
Properties properties = PropertiesLoaderUtils.loadProperties(resource); Properties properties = PropertiesLoaderUtils.loadProperties(resource);
Set<Object> classNames = properties.keySet(); Set<Object> classNames = properties.keySet();
@@ -406,9 +406,9 @@ public class DefaultBinderFactory implements BinderFactory, DisposableBean, Appl
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private Class<Object> loadClass(String className) { private Class<Object> loadClass(String className) {
try { try {
return (Class<Object>) ClassUtils.getDefaultClassLoader().loadClass(((String) className).trim()); return (Class<Object>) ClassUtils.getDefaultClassLoader().loadClass(className.trim());
} }
catch (Exception e) { catch (Throwable e) {
logger.debug("Attempt to load " + className + " failed.", e); logger.debug("Attempt to load " + className + " failed.", e);
return null; return null;
} }