Author: jdcryans
Date: Wed Dec 22 19:54:11 2010
New Revision: 1052051
URL: http://svn.apache.org/viewvc?rev=1052051&view=rev
Log:
HBASE-3386 NPE in TableRecordReaderImpl.restart
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java
Modified: hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1052051&r1=1052050&r2=1052051&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Wed Dec 22 19:54:11 2010
@@ -802,6 +802,7 @@ Release 0.90.0 - Unreleased
HBASE-3374 Our jruby jar has *GPL jars in it; fix
HBASE-3343 Server not shutting down after losing log lease
HBASE-3381 Interrupt of a region open comes across as a successful open
+ HBASE-3386 NPE in TableRecordReaderImpl.restart
IMPROVEMENTS
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java?rev=1052051&r1=1052050&r2=1052051&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java
Wed Dec 22 19:54:11 2010
@@ -94,6 +94,11 @@ extends InputFormat<ImmutableBytesWritab
public RecordReader<ImmutableBytesWritable, Result> createRecordReader(
InputSplit split, TaskAttemptContext context)
throws IOException {
+ if (table == null) {
+ throw new IOException("Cannot create a record reader because of a" +
+ " previous error. Please look at the previous logs lines from" +
+ " the task's full log for more details.");
+ }
TableSplit tSplit = (TableSplit) split;
TableRecordReader trr = this.tableRecordReader;
// if no table record reader was provided use default