You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2015/02/19 23:22:15 UTC

hbase git commit: HBASE-13075 TableInputFormatBase spuriously warning about multiple initializeTable calls

Repository: hbase
Updated Branches:
  refs/heads/master 18402cc85 -> 365054c11


HBASE-13075 TableInputFormatBase spuriously warning about multiple initializeTable calls


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

Branch: refs/heads/master
Commit: 365054c110467d0628019761791281875631f4be
Parents: 18402cc
Author: Sean Busbey <bu...@apache.org>
Authored: Thu Feb 19 13:59:27 2015 -0600
Committer: Sean Busbey <bu...@apache.org>
Committed: Thu Feb 19 13:59:27 2015 -0600

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


http://git-wip-us.apache.org/repos/asf/hbase/blob/365054c1/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableInputFormatBase.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableInputFormatBase.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableInputFormatBase.java
index b5b79d2..dd58d5c 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableInputFormatBase.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableInputFormatBase.java
@@ -231,7 +231,7 @@ implements InputFormat<ImmutableBytesWritable, Result> {
    * @throws IOException
    */
   protected void initializeTable(Connection connection, TableName tableName) throws IOException {
-    if (table != null || connection != null) {
+    if (this.table != null || this.connection != null) {
       LOG.warn("initializeTable called multiple times. Overwriting connection and table " +
           "reference; TableInputFormatBase will not close these old references when done.");
     }

http://git-wip-us.apache.org/repos/asf/hbase/blob/365054c1/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java
index 6c42d7f..e27251a 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java
@@ -641,7 +641,7 @@ extends InputFormat<ImmutableBytesWritable, Result> {
    * @throws IOException 
    */
   protected void initializeTable(Connection connection, TableName tableName) throws IOException {
-    if (table != null || connection != null) {
+    if (this.table != null || this.connection != null) {
       LOG.warn("initializeTable called multiple times. Overwriting connection and table " +
           "reference; TableInputFormatBase will not close these old references when done.");
     }