You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ki...@apache.org on 2018/01/20 04:03:41 UTC

[1/2] [lang] LANG-1375: defaultString(str) reuses defaultString(str, defaultStr)

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 <je...@afterpaytouch.com>
Authored: Fri Jan 19 13:57:30 2018 +1100
Committer: Jerry Zhao <je...@afterpaytouch.com>
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);
     }
 
     /**

[2/2] [lang] LANG-1375: add changes.xml entry

Posted by ki...@apache.org.
LANG-1375: add changes.xml entry


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

Branch: refs/heads/master
Commit: f50ec5e608286b0c48d6b9b4c792352de8353804
Parents: d575057
Author: Bruno P. Kinoshita <ki...@apache.org>
Authored: Sat Jan 20 17:02:55 2018 +1300
Committer: Bruno P. Kinoshita <ki...@apache.org>
Committed: Sat Jan 20 17:02:55 2018 +1300

----------------------------------------------------------------------
 src/changes/changes.xml | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-lang/blob/f50ec5e6/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index b1138d3..220578c 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -46,6 +46,7 @@ The <action> type attribute can be add,update,fix,remove.
   <body>
 
   <release version="3.8" date="2017-MM-DD" description="New features and bug fixes. Requires Java 7, supports Java 8, 9, 10.">
+    <action issue="LANG-1375" type="fix" dev="kinow" due-to=" Jerry Zhao">defaultString(final String str) in StringUtils to reuse defaultString(final String str, final String defaultStr)</action>
     <action issue="LANG-1374" type="fix" dev="kinow" due-to="Jaswanth Bala">Parsing Json Array failed</action>
     <action issue="LANG-1371" type="fix" dev="pschumacher" due-to="Dmitry Ovchinnikov">Fix TypeUtils#parameterize to work correctly with narrower-typed array</action>
     <action issue="LANG-1370" type="fix" dev="kinow" due-to="Andre Dieb">Fix EventCountCircuitBreaker increment batch</action>