From 588dfb56f73517be4f2ba5611f289ae142fdf3b6 Mon Sep 17 00:00:00 2001 From: "Donald J. Brown" Date: Sat, 16 Feb 2008 14:07:35 +0000 Subject: [PATCH] Ensuring parent result annotations don't override children WW-2443 git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@628300 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/struts2/config/ClasspathPackageProvider.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java b/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java index 7769d8737..53b4967c7 100644 --- a/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java +++ b/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java @@ -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();