svn commit: r628300 - /struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java

[mrdon]

Author: mrdon
Date: Sat Feb 16 06:07:35 2008
New Revision: 628300

URL: http://svn.apache.org/viewvc?rev=628300&view=rev
Log:
Ensuring parent result annotations don't override children
WW-2443

Modified:
    
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java

Modified: 
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java?rev=628300&r1=628299&r2=628300&view=diff
==============================================================================
--- 
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java
 (original)
+++ 
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java
 Sat Feb 16 06:07:35 2008
@@ -480,7 +480,9 @@
                     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 @@
                 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();