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

Ensuring parent result annotations don't override children

Browse Source 
WW-2443


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@628300 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Donald J. Brown
2008-02-16 14:07:35 +00:00
parent 9c00c3fcfb
commit 588dfb56f7
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java
+6 -2
View File
@@ -480,7 +480,9 @@ public class ClasspathPackageProvider implements PackageProvider {
for (int i = 0; i < results.value().length; i++) {
Result result = results.value()[i];
ResultConfig config = createResultConfig(result);
put((K)config.getName(), (V)config);
if (!containsKey((K)config.getName())) {
put((K)config.getName(), (V)config);
}
}
}
@@ -488,7 +490,9 @@ public class ClasspathPackageProvider implements PackageProvider {
Result result = (Result) actionClass.getAnnotation(Result.class);
if (result != null) {
ResultConfig config = createResultConfig(result);
put((K)config.getName(), (V)config);
if (!containsKey((K)config.getName())) {
put((K)config.getName(), (V)config);
}
}
actionClass = actionClass.getSuperclass();