diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableRecordReaderImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableRecordReaderImpl.java index 6356106..2ace8e2 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableRecordReaderImpl.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableRecordReaderImpl.java @@ -154,7 +154,9 @@ public class TableRecordReaderImpl { } public void close() { - this.scanner.close(); + if (this.scanner != null) { + this.scanner.close(); + } try { this.htable.close(); } catch (IOException ioe) { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java index dcc4943..6f1d140 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java @@ -161,7 +161,9 @@ public class TableRecordReaderImpl { * */ public void close() { - this.scanner.close(); + if (this.scanner != null) { + this.scanner.close(); + } try { this.htable.close(); } catch (IOException ioe) {