hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject hbase git commit: HBASE-17601 close() in TableRecordReaderImpl assumes the split has started (Michael Axiak)
Date Mon, 06 Feb 2017 18:33:11 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1 4456d2285 -> 35e4eb7a7


HBASE-17601 close() in TableRecordReaderImpl assumes the split has started (Michael Axiak)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/35e4eb7a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/35e4eb7a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/35e4eb7a

Branch: refs/heads/branch-1
Commit: 35e4eb7a7ab8055825e3c35f13521d5e9e0261e3
Parents: 4456d22
Author: tedyu <yuzhihong@gmail.com>
Authored: Mon Feb 6 10:33:05 2017 -0800
Committer: tedyu <yuzhihong@gmail.com>
Committed: Mon Feb 6 10:33:05 2017 -0800

----------------------------------------------------------------------
 .../org/apache/hadoop/hbase/mapred/TableRecordReaderImpl.java    | 4 +++-
 .../org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/35e4eb7a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableRecordReaderImpl.java
----------------------------------------------------------------------
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) {

http://git-wip-us.apache.org/repos/asf/hbase/blob/35e4eb7a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java
----------------------------------------------------------------------
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) {


Mime
View raw message