From d575057852ab2be41abb39b8de69a35cace5c67d Mon Sep 17 00:00:00 2001 From: Jerry Zhao Date: Fri, 19 Jan 2018 13:57:30 +1100 Subject: [PATCH] LANG-1375: defaultString(str) reuses defaultString(str, defaultStr) --- src/main/java/org/apache/commons/lang3/StringUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java b/src/main/java/org/apache/commons/lang3/StringUtils.java index 924e10f19..4619a5006 100644 --- a/src/main/java/org/apache/commons/lang3/StringUtils.java +++ b/src/main/java/org/apache/commons/lang3/StringUtils.java @@ -4743,7 +4743,7 @@ public static String joinWith(final String separator, final Object... objects) { throw new IllegalArgumentException("Object varargs must not be null"); } - final String sanitizedSeparator = defaultString(separator, StringUtils.EMPTY); + final String sanitizedSeparator = defaultString(separator); final StringBuilder result = new StringBuilder(); @@ -7359,7 +7359,7 @@ public static boolean isMixedCase(final CharSequence cs) { * was {@code null} */ public static String defaultString(final String str) { - return str == null ? EMPTY : str; + return defaultString(str, EMPTY); } /**