Cleaner result name parsing
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/930f6e4c Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/930f6e4c Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/930f6e4c Branch: refs/heads/master Commit: 930f6e4cf7df951fee03159ad891e4e606f36aef Parents: 087cf61 Author: Aleksandr Mashchenko <[email protected]> Authored: Wed Jan 20 17:52:56 2016 +0200 Committer: Aleksandr Mashchenko <[email protected]> Committed: Wed Jan 20 17:52:56 2016 +0200 ---------------------------------------------------------------------- .../xwork2/config/providers/XmlConfigurationProvider.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/930f6e4c/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java index e3b0c19..b04cffb 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java +++ b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java @@ -777,12 +777,9 @@ public class XmlConfigurationProvider implements ConfigurationProvider { } params.putAll(resultParams); - Set<String> resultNamesSet; - if (",".equals(resultName.trim())) { - resultNamesSet = new HashSet<>(1); + Set<String> resultNamesSet = TextParseUtil.commaDelimitedStringToSet(resultName); + if (resultNamesSet.isEmpty()) { resultNamesSet.add(resultName); - } else { - resultNamesSet = TextParseUtil.commaDelimitedStringToSet(resultName); } for (String name : resultNamesSet) {
