From d1bf9f268e1f8561b84d8e7125ef88e2f63ffe3a Mon Sep 17 00:00:00 2001 From: Jing Zhao Date: Wed, 8 Jan 2014 18:43:14 +0000 Subject: [PATCH] HADOOP-10208. Merge change r1556602 from trunk. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556604 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/util/StringUtils.java | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 3f6c1a5eb00..139554d18e4 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -115,6 +115,9 @@ Release 2.4.0 - UNRELEASED HADOOP-10198. DomainSocket: add support for socketpair. (Colin Patrick McCabe via wang) + HADOOP-10208. Remove duplicate initialization in StringUtils.getStringCollection. + (Benoy Antony via jing9) + OPTIMIZATIONS HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn) 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 70ad18f6a4d..dfa8e65df47 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 @@ -343,7 +343,6 @@ public class StringUtils { if (str == null) return values; StringTokenizer tokenizer = new StringTokenizer(str, delim); - values = new ArrayList(); while (tokenizer.hasMoreTokens()) { values.add(tokenizer.nextToken()); }