Repository: hadoop Updated Branches: refs/heads/branch-2 2796c1099 -> dd3867ab9
HADOOP-12639. Improve JavaDoc for getTrimmedStrings. (BELUGA BEHR via umamahesh) (cherry picked from commit ae67c8424c188a2b00920108e6104690137c61b7) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dd3867ab Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dd3867ab Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dd3867ab Branch: refs/heads/branch-2 Commit: dd3867ab9f07fc4a91ddaad7fccd8e8452a05a0e Parents: 2796c10 Author: Uma Mahesh <umamah...@apache.org> Authored: Tue Dec 15 15:13:37 2015 -0800 Committer: Uma Mahesh <umamah...@apache.org> Committed: Tue Dec 15 15:19:27 2015 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ .../java/org/apache/hadoop/util/StringUtils.java | 19 ++++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd3867ab/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index f22da24..e83f313 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -373,6 +373,8 @@ Release 2.8.0 - UNRELEASED HADOOP-12618. Fix NPE in TestSequenceFile. (Brahma Reddy Battula via umamahesh) + HADOOP-12639. Improve JavaDoc for getTrimmedStrings. (BELUGA BEHR via umamahesh) + OPTIMIZATIONS HADOOP-11785. Reduce the number of listStatus operation in distcp http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd3867ab/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java index 1dff0fa..1ccdb22 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java @@ -399,10 +399,12 @@ public class StringUtils { } /** - * Splits a comma separated value <code>String</code>, trimming leading and trailing whitespace on each value. - * Duplicate and empty values are removed. - * @param str a comma separated <String> with values - * @return a <code>Collection</code> of <code>String</code> values + * Splits a comma separated value <code>String</code>, trimming leading and + * trailing whitespace on each value. Duplicate and empty values are removed. + * + * @param str a comma separated <String> with values, may be null + * @return a <code>Collection</code> of <code>String</code> values, empty + * Collection if null String input */ public static Collection<String> getTrimmedStringCollection(String str){ Set<String> set = new LinkedHashSet<String>( @@ -412,9 +414,12 @@ public class StringUtils { } /** - * Splits a comma separated value <code>String</code>, trimming leading and trailing whitespace on each value. - * @param str a comma separated <String> with values - * @return an array of <code>String</code> values + * Splits a comma separated value <code>String</code>, trimming leading and + * trailing whitespace on each value. + * + * @param str a comma separated <code>String</code> with values, may be null + * @return an array of <code>String</code> values, empty array if null String + * input */ public static String[] getTrimmedStrings(String str){ if (null == str || str.trim().isEmpty()) {
