Repository: hadoop
Updated Branches:
  refs/heads/YARN-2139 ddffcd8fa -> 6e13fc62e


HADOOP-11367. Fix warnings from findbugs 3.0 in hadoop-streaming. 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/7bceb13b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7bceb13b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7bceb13b

Branch: refs/heads/YARN-2139
Commit: 7bceb13ba9634123a92a091f93b3b04c14473678
Parents: b557693
Author: Haohui Mai <whe...@apache.org>
Authored: Tue Dec 9 10:41:35 2014 -0800
Committer: Haohui Mai <whe...@apache.org>
Committed: Tue Dec 9 10:41:35 2014 -0800

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt                  | 2 ++
 .../src/main/java/org/apache/hadoop/streaming/Environment.java   | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/7bceb13b/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 a0a10b8..425cab7 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -534,6 +534,8 @@ Release 2.7.0 - UNRELEASED
     HADOOP-10134 [JDK8] Fix Javadoc errors caused by incorrect or illegal tags 
in doc
     comments. (apurtell via stevel)
 
+    HADOOP-11367. Fix warnings from findbugs 3.0 in hadoop-streaming. (Li Lu 
via wheat9)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/7bceb13b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/Environment.java
----------------------------------------------------------------------
diff --git 
a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/Environment.java
 
b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/Environment.java
index bd76c31..98d8aa03 100644
--- 
a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/Environment.java
+++ 
b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/Environment.java
@@ -20,6 +20,7 @@ package org.apache.hadoop.streaming;
 
 import java.io.*;
 import java.net.InetAddress;
+import java.nio.charset.Charset;
 import java.util.*;
 
 import org.apache.hadoop.classification.InterfaceAudience;
@@ -62,7 +63,8 @@ public class Environment extends Properties {
     // Read the environment variables
 
     Process pid = Runtime.getRuntime().exec(command);
-    BufferedReader in = new BufferedReader(new 
InputStreamReader(pid.getInputStream()));
+    BufferedReader in = new BufferedReader(
+        new InputStreamReader(pid.getInputStream(), Charset.forName("UTF-8")));
     try {
       while (true) {
         String line = in.readLine();

Reply via email to