mirror of
https://github.com/apache/struts.git
synced 2026-08-31 19:35:40 +00:00
WW-3023 Use ClassLoaderUtils to resolve the class in ConcentionServiceImpl
thanks to Travis Rein for the patch git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@750965 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
+2
-1
@@ -26,6 +26,7 @@ import java.util.ResourceBundle;
|
||||
|
||||
import org.apache.struts2.convention.annotation.AnnotationTools;
|
||||
import org.apache.struts2.convention.annotation.ResultPath;
|
||||
import org.apache.struts2.util.ClassLoaderUtils;
|
||||
|
||||
import com.opensymphony.xwork2.config.ConfigurationException;
|
||||
import com.opensymphony.xwork2.config.entities.ActionConfig;
|
||||
@@ -94,7 +95,7 @@ public class ConventionsServiceImpl implements ConventionsService {
|
||||
}
|
||||
|
||||
try {
|
||||
return determineResultPath(Class.forName(actionConfig.getClassName()));
|
||||
return determineResultPath(ClassLoaderUtils.loadClass(actionConfig.getClassName(), this.getClass()));
|
||||
} catch (ClassNotFoundException e) {
|
||||
throw new RuntimeException("Invalid action class configuration that references an unknown " +
|
||||
"class named [" + actionConfig.getClassName() + "]", e);
|
||||
|
||||
+1
@@ -287,6 +287,7 @@ public class PackageBasedActionConfigBuilderTest extends TestCase {
|
||||
mockContainer.setConventionsService(new ConventionsServiceImpl(""));
|
||||
|
||||
PackageBasedActionConfigBuilder builder = new PackageBasedActionConfigBuilder(configuration, mockContainer ,of, "false", "struts-default");
|
||||
builder.setFileProtocols("jar");
|
||||
if (actionPackages != null) {
|
||||
builder.setActionPackages(actionPackages);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user