Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-06 07:06:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-5364 Don't throw ConfigurationException on unloadable action or interceptor classes

Browse Source
This commit is contained in:
Kusal Kithul-Godage
2023-11-24 22:11:27 +11:00
parent 39c3e332d7
commit 6657e01f9b
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/opensymphony/xwork2/config/providers/XmlDocConfigurationProvider.java
+9 -7
View File
@@ -534,7 +534,11 @@ public abstract class XmlDocConfigurationProvider implements ConfigurationProvid
clazz.getConstructor();
}
} catch (ClassNotFoundException e) {
throw new ConfigurationException("Action class [" + className + "] not found", e, loc);
if (objectFactory.isNoArgConstructorRequired()) {
throw new ConfigurationException("Action class [" + className + "] not found", e, loc);
}
LOG.warn("Action class [" + className + "] not found");
LOG.debug("Action class [" + className + "] not found", e);
} catch (NoSuchMethodException e) {
throw new ConfigurationException("Action class [" + className + "] does not have a public no-arg constructor", e, loc);
} catch (RuntimeException ex) {
@@ -543,8 +547,7 @@ public abstract class XmlDocConfigurationProvider implements ConfigurationProvid
LOG.debug("Action verification cause", ex);
} catch (Exception ex) {
// Default to failing fast
LOG.debug("Unable to verify action class [{}]", className, ex);
throw new ConfigurationException(ex, loc);
throw new ConfigurationException("Unable to verify action class [" + className + "]", ex, loc);
}
}
@@ -556,9 +559,7 @@ public abstract class XmlDocConfigurationProvider implements ConfigurationProvid
Location loc = DomHelper.getLocationObject(resultTypeElement);
Class<?> clazz = verifyResultType(className, loc);
if (clazz == null) {
return;
}
String paramName = null;
try {
paramName = (String) clazz.getField("DEFAULT_PARAM").get(null);
@@ -961,7 +962,8 @@ public abstract class XmlDocConfigurationProvider implements ConfigurationProvid
try {
allowAndLoadClass(className);
} catch (ClassNotFoundException | NoClassDefFoundError e) {
throw new ConfigurationException("Interceptor class [" + className + "] not found", e, loc);
LOG.warn("Interceptor class [" + className + "] at location " + loc + " not found");
LOG.debug("Interceptor class [" + className + "] not found", e);
}
}