Repository: hadoop Updated Branches: refs/heads/trunk 8d7215d40 -> 9b0ba59b8
MAPREDUCE-6221. Stringifier is left unclosed in Chain#getChainElementConf(). Contributed by Ted Yu. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9b0ba59b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9b0ba59b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9b0ba59b Branch: refs/heads/trunk Commit: 9b0ba59b8284fae132535fbca5ce372d7a6c38c0 Parents: 8d7215d Author: Tsuyoshi Ozawa <[email protected]> Authored: Fri Feb 13 02:27:54 2015 +0900 Committer: Tsuyoshi Ozawa <[email protected]> Committed: Fri Feb 13 02:27:54 2015 +0900 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../main/java/org/apache/hadoop/mapreduce/lib/chain/Chain.java | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9b0ba59b/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index f591bc8..de3f926 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -356,6 +356,9 @@ Release 2.7.0 - UNRELEASED MAPREDUCE-6233. org.apache.hadoop.mapreduce.TestLargeSort.testLargeSort failed in trunk (zxu via rkanter) + MAPREDUCE-6221. Stringifier is left unclosed in Chain#getChainElementConf(). + (Ted Yu via ozawa) + Release 2.6.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/9b0ba59b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/chain/Chain.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/chain/Chain.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/chain/Chain.java index 384524a..208616b 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/chain/Chain.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/chain/Chain.java @@ -575,9 +575,8 @@ public class Chain { protected static Configuration getChainElementConf(Configuration jobConf, String confKey) { Configuration conf = null; - try { - Stringifier<Configuration> stringifier = - new DefaultStringifier<Configuration>(jobConf, Configuration.class); + try (Stringifier<Configuration> stringifier = + new DefaultStringifier<Configuration>(jobConf, Configuration.class);) { String confString = jobConf.get(confKey, null); if (confString != null) { conf = stringifier.fromString(jobConf.get(confKey, null));
