Repository: hadoop Updated Branches: refs/heads/branch-2 657a6e389 -> 92acb0e4f
HADOOP-10478. Fix new findbugs warnings in hadoop-maven-plugins. Contributed by Li Lu. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/92acb0e4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/92acb0e4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/92acb0e4 Branch: refs/heads/branch-2 Commit: 92acb0e4f46ccb0b20c64e0fe6878bf4d4c4b8b6 Parents: 657a6e3 Author: Haohui Mai <[email protected]> Authored: Mon Feb 23 16:37:48 2015 -0800 Committer: Haohui Mai <[email protected]> Committed: Mon Feb 23 16:38:10 2015 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../main/java/org/apache/hadoop/maven/plugin/util/Exec.java | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/92acb0e4/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 7938012..9b86b3e 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -581,6 +581,9 @@ Release 2.7.0 - UNRELEASED HADOOP-11584 s3a file block size set to 0 in getFileStatus. (Brahma Reddy Battula via stevel) + HADOOP-10478. Fix new findbugs warnings in hadoop-maven-plugins. + (Li Lu via wheat9) + Release 2.6.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/92acb0e4/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/util/Exec.java ---------------------------------------------------------------------- diff --git a/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/util/Exec.java b/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/util/Exec.java index 141ab5a..37dbc72 100644 --- a/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/util/Exec.java +++ b/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/util/Exec.java @@ -19,6 +19,7 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.List; @@ -87,7 +88,11 @@ public class Exec { public OutputBufferThread(InputStream is) { this.setDaemon(true); output = new ArrayList<String>(); - reader = new BufferedReader(new InputStreamReader(is)); + try { + reader = new BufferedReader(new InputStreamReader(is, "UTF-8")); + } catch (UnsupportedEncodingException e) { + throw new RuntimeException("Unsupported encoding " + e.toString()); + } } @Override
