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 D61F0109F1 for ; Wed, 24 Dec 2014 19:35:31 +0000 (UTC) Received: (qmail 29267 invoked by uid 500); 24 Dec 2014 19:35:17 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 28916 invoked by uid 500); 24 Dec 2014 19:35:16 -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 28066 invoked by uid 99); 24 Dec 2014 19:35:16 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Dec 2014 19:35:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 21CA2A37DE8; Wed, 24 Dec 2014 19:35:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zhz@apache.org To: common-commits@hadoop.apache.org Date: Wed, 24 Dec 2014 19:35:39 -0000 Message-Id: <13a6769000ca44e886895c9f2dd3723c@git.apache.org> In-Reply-To: <37d82d341aa143f1bda35bb9397804ad@git.apache.org> References: <37d82d341aa143f1bda35bb9397804ad@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [25/50] hadoop git commit: MAPREDUCE-6045. need close the DataInputStream after open it in TestMapReduce.java (zxu via rkanter) MAPREDUCE-6045. need close the DataInputStream after open it in TestMapReduce.java (zxu via rkanter) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e7c75bf0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e7c75bf0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e7c75bf0 Branch: refs/heads/HDFS-EC Commit: e7c75bf0abdfc48f8904072c8f864986c82f428c Parents: 480d4ea Author: Robert Kanter Authored: Fri Dec 19 11:59:22 2014 -0800 Committer: Zhe Zhang Committed: Wed Dec 24 11:22:16 2014 -0800 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/mapreduce/TestMapReduce.java | 12 ++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e7c75bf0/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 41fdb4f..18270f68 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -285,6 +285,9 @@ Release 2.7.0 - UNRELEASED MAPREDUCE-6166. Reducers do not validate checksum of map outputs when fetching directly to disk. (Eric Payne via gera) + MAPREDUCE-6045. need close the DataInputStream after open it in + TestMapReduce.java (zxu via rkanter) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/e7c75bf0/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMapReduce.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMapReduce.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMapReduce.java index 48ad47a..912f0e3 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMapReduce.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMapReduce.java @@ -465,11 +465,15 @@ public class TestMapReduce { private static boolean isSequenceFile(FileSystem fs, Path f) throws IOException { DataInputStream in = fs.open(f); - byte[] seq = "SEQ".getBytes(); - for(int i=0; i < seq.length; ++i) { - if (seq[i] != in.read()) { - return false; + try { + byte[] seq = "SEQ".getBytes(); + for (int i = 0; i < seq.length; ++i) { + if (seq[i] != in.read()) { + return false; + } } + } finally { + in.close(); } return true; }