Commits

Anonymous committed 1ad6787

Action from parent package loses its parent's global results
o applied suggested patch

Issue Number: XW-495

git-svn-id: http://svn.opensymphony.com/svn/xwork/trunk@1433e221344d-f017-0410-9bd5-d282ab1896d7

Comments (0)

Files changed (1)

src/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java

         Map<String, ResultConfig> results = new TreeMap<String, ResultConfig>();
 
         if (!baseConfig.getPackageName().equals(packageContext.getName()) && packageContexts.containsKey(baseConfig.getPackageName())) {
-            results.putAll(packageContexts.get(baseConfig.getPackageName()).getGlobalResultConfigs());
+            results.putAll(packageContexts.get(baseConfig.getPackageName()).getAllGlobalResults());
         } else {
             results.putAll(packageContext.getAllGlobalResults());
         }
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.