Repository: commons-lang
Updated Branches:
  refs/heads/master e72654ed5 -> f50ec5e60


LANG-1375: defaultString(str) reuses defaultString(str, defaultStr)


Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/d5750578
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/d5750578
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/d5750578

Branch: refs/heads/master
Commit: d575057852ab2be41abb39b8de69a35cace5c67d
Parents: e72654e
Author: Jerry Zhao <[email protected]>
Authored: Fri Jan 19 13:57:30 2018 +1100
Committer: Jerry Zhao <[email protected]>
Committed: Sat Jan 20 13:12:33 2018 +1100

----------------------------------------------------------------------
 src/main/java/org/apache/commons/lang3/StringUtils.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-lang/blob/d5750578/src/main/java/org/apache/commons/lang3/StringUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java 
b/src/main/java/org/apache/commons/lang3/StringUtils.java
index 924e10f..4619a50 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 class StringUtils {
             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 class StringUtils {
      *  was {@code null}
      */
     public static String defaultString(final String str) {
-        return str == null ? EMPTY : str;
+        return defaultString(str, EMPTY);
     }
 
     /**

Reply via email to