Return-Path: Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Received: (qmail 898 invoked from network); 16 Jul 2010 11:00:16 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 16 Jul 2010 11:00:16 -0000 Received: (qmail 77534 invoked by uid 500); 16 Jul 2010 11:00:16 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 77453 invoked by uid 500); 16 Jul 2010 11:00:14 -0000 Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mapreduce-dev@hadoop.apache.org Delivered-To: mailing list mapreduce-commits@hadoop.apache.org Received: (qmail 77440 invoked by uid 99); 16 Jul 2010 11:00:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Jul 2010 11:00:13 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Jul 2010 11:00:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CF86923889ED; Fri, 16 Jul 2010 10:59:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r964752 - in /hadoop/mapreduce/trunk: ./ src/contrib/streaming/src/java/org/apache/hadoop/streaming/io/ Date: Fri, 16 Jul 2010 10:59:16 -0000 To: mapreduce-commits@hadoop.apache.org From: amareshwari@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100716105916.CF86923889ED@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: amareshwari Date: Fri Jul 16 10:59:16 2010 New Revision: 964752 URL: http://svn.apache.org/viewvc?rev=964752&view=rev Log: MAPREDUCE-1621. Fixes NPE in TextOutputReader.getLastOutput if it has never read any output. Contributed by Amareshwari Sriramadasu Modified: hadoop/mapreduce/trunk/CHANGES.txt hadoop/mapreduce/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/io/RawBytesOutputReader.java hadoop/mapreduce/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/io/TextOutputReader.java hadoop/mapreduce/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/io/TypedBytesOutputReader.java Modified: hadoop/mapreduce/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=964752&r1=964751&r2=964752&view=diff ============================================================================== --- hadoop/mapreduce/trunk/CHANGES.txt (original) +++ hadoop/mapreduce/trunk/CHANGES.txt Fri Jul 16 10:59:16 2010 @@ -170,6 +170,9 @@ Trunk (unreleased changes) MAPREDUCE-1865. Rumen should also support jobhistory files generated using trunk. (Amar Kamat via amareshwari) + MAPREDUCE-1621. Fixes NPE in TextOutputReader.getLastOutput if it has never + read any output. (amareshwari) + Release 0.21.0 - Unreleased INCOMPATIBLE CHANGES Modified: hadoop/mapreduce/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/io/RawBytesOutputReader.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/io/RawBytesOutputReader.java?rev=964752&r1=964751&r2=964752&view=diff ============================================================================== --- hadoop/mapreduce/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/io/RawBytesOutputReader.java (original) +++ hadoop/mapreduce/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/io/RawBytesOutputReader.java Fri Jul 16 10:59:16 2010 @@ -68,7 +68,11 @@ public class RawBytesOutputReader @Override public String getLastOutput() { - return new BytesWritable(bytes).toString(); + if (bytes != null) { + return new BytesWritable(bytes).toString(); + } else { + return null; + } } private int readLength() throws IOException { Modified: hadoop/mapreduce/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/io/TextOutputReader.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/io/TextOutputReader.java?rev=964752&r1=964751&r2=964752&view=diff ============================================================================== --- hadoop/mapreduce/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/io/TextOutputReader.java (original) +++ hadoop/mapreduce/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/io/TextOutputReader.java Fri Jul 16 10:59:16 2010 @@ -83,10 +83,14 @@ public class TextOutputReader extends Ou @Override public String getLastOutput() { - try { - return new String(bytes, "UTF-8"); - } catch (UnsupportedEncodingException e) { - return ""; + if (bytes != null) { + try { + return new String(bytes, "UTF-8"); + } catch (UnsupportedEncodingException e) { + return ""; + } + } else { + return null; } } Modified: hadoop/mapreduce/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/io/TypedBytesOutputReader.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/io/TypedBytesOutputReader.java?rev=964752&r1=964751&r2=964752&view=diff ============================================================================== --- hadoop/mapreduce/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/io/TypedBytesOutputReader.java (original) +++ hadoop/mapreduce/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/io/TypedBytesOutputReader.java Fri Jul 16 10:59:16 2010 @@ -70,7 +70,11 @@ public class TypedBytesOutputReader exte @Override public String getLastOutput() { - return new TypedBytesWritable(bytes).toString(); + if (bytes != null) { + return new TypedBytesWritable(bytes).toString(); + } else { + return null; + } } }