Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AAFA91013C for ; Tue, 9 Dec 2014 18:42:20 +0000 (UTC) Received: (qmail 61300 invoked by uid 500); 9 Dec 2014 18:42:20 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 61237 invoked by uid 500); 9 Dec 2014 18:42:20 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 61222 invoked by uid 99); 9 Dec 2014 18:42:20 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Dec 2014 18:42:20 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2E70AA21416; Tue, 9 Dec 2014 18:42:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wheat9@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HADOOP-11367. Fix warnings from findbugs 3.0 in hadoop-streaming. Contributed by Li Lu. Date: Tue, 9 Dec 2014 18:42:20 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-2 c9e9f82ec -> 1b8b51704 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/1b8b5170 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1b8b5170 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1b8b5170 Branch: refs/heads/branch-2 Commit: 1b8b51704a583d1ae448f73c6c565b0a20853ad1 Parents: c9e9f82 Author: Haohui Mai Authored: Tue Dec 9 10:41:35 2014 -0800 Committer: Haohui Mai Committed: Tue Dec 9 10:42:17 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/1b8b5170/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 b1cdfb1..3ce2ae7 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -168,6 +168,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/1b8b5170/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();