hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cutt...@apache.org
Subject svn commit: r475393 - in /lucene/hadoop/trunk: CHANGES.txt src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamLineRecordReader.java
Date Wed, 15 Nov 2006 20:09:38 GMT
Author: cutting
Date: Wed Nov 15 12:09:38 2006
New Revision: 475393

URL: http://svn.apache.org/viewvc?view=rev&rev=475393
Log:
HADOOP-695.  Fix a NullPointerException in contrib/streaming.

Modified:
    lucene/hadoop/trunk/CHANGES.txt
    lucene/hadoop/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamLineRecordReader.java

Modified: lucene/hadoop/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=475393&r1=475392&r2=475393
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Wed Nov 15 12:09:38 2006
@@ -85,6 +85,9 @@
     to be smaller than the buffer size, typically only when debugging.
     (Milind Bhandarkar via cutting)
 
+26. HADOOP-695.  Fix a NullPointerException in contrib/streaming.
+    (Hairong Kuang via cutting)
+
 
 Release 0.8.0 - 2006-11-03
 

Modified: lucene/hadoop/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamLineRecordReader.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamLineRecordReader.java?view=diff&rev=475393&r1=475392&r2=475393
==============================================================================
--- lucene/hadoop/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamLineRecordReader.java
(original)
+++ lucene/hadoop/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamLineRecordReader.java
Wed Nov 15 12:09:38 2006
@@ -97,13 +97,13 @@
       }
 
       line = UTF8ByteArrayUtils.readLine((InputStream) in_);
+      if (line == null) return false;
       try {
         Text.validateUTF8(line);
       } catch (MalformedInputException m) {
         System.err.println("line=" + line + "|" + new Text(line));
         System.out.flush();
       }
-      if (line == null) return false;
       try {
         int tab = UTF8ByteArrayUtils.findTab(line);
         if (tab == -1) {



Mime
View raw message