This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch 1.X in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git
commit fd02cff627fe8fc803c8052ba402fec45660a24a Author: Gary Gregory <[email protected]> AuthorDate: Sun Aug 18 08:43:06 2024 -0400 Use else if --- .../beanutils/locale/LocaleBeanUtilsBean.java | 39 ++++++++++------------ 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java b/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java index 8656cd2f..7985c218 100644 --- a/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java +++ b/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java @@ -322,18 +322,16 @@ public class LocaleBeanUtilsBean extends BeanUtilsBean { else { newValue = value; } + // Value into scalar + } else if (value instanceof String) { + newValue = ConvertUtils.convert((String) value, type); } - else { // Value into scalar - if (value instanceof String) { - newValue = ConvertUtils.convert((String) value, type); - } - else if (value instanceof String[]) { - newValue = ConvertUtils.convert(((String[]) value)[0], - type); - } - else { - newValue = value; - } + else if (value instanceof String[]) { + newValue = ConvertUtils.convert(((String[]) value)[0], + type); + } + else { + newValue = value; } return newValue; } @@ -381,18 +379,15 @@ public class LocaleBeanUtilsBean extends BeanUtilsBean { else { newValue = value; } + } else if (value instanceof String) { + newValue = getLocaleConvertUtils().convert((String) value, type, pattern); } - else { // Value into scalar - if (value instanceof String) { - newValue = getLocaleConvertUtils().convert((String) value, type, pattern); - } - else if (value instanceof String[]) { - newValue = getLocaleConvertUtils().convert(((String[]) value)[0], - type, pattern); - } - else { - newValue = value; - } + else if (value instanceof String[]) { + newValue = getLocaleConvertUtils().convert(((String[]) value)[0], + type, pattern); + } + else { + newValue = value; } return newValue; }
