From 930f6e4cf7df951fee03159ad891e4e606f36aef Mon Sep 17 00:00:00 2001 From: Aleksandr Mashchenko Date: Wed, 20 Jan 2016 17:52:56 +0200 Subject: [PATCH] Cleaner result name parsing --- .../xwork2/config/providers/XmlConfigurationProvider.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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 e3b0c19bf..b04cffb36 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 resultNamesSet; - if (",".equals(resultName.trim())) { - resultNamesSet = new HashSet<>(1); + Set resultNamesSet = TextParseUtil.commaDelimitedStringToSet(resultName); + if (resultNamesSet.isEmpty()) { resultNamesSet.add(resultName); - } else { - resultNamesSet = TextParseUtil.commaDelimitedStringToSet(resultName); } for (String name : resultNamesSet) {