Repository: hbase Updated Branches: refs/heads/branch-1 6b44b7340 -> 49ae4ab67
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/49ae4ab6 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/49ae4ab6 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/49ae4ab6 Branch: refs/heads/branch-1 Commit: 49ae4ab672676b387d67c4d2ceaad707358d7cc0 Parents: 6b44b73 Author: Sean Busbey <bus...@apache.org> Authored: Thu Feb 19 13:59:27 2015 -0600 Committer: Sean Busbey <bus...@apache.org> Committed: Thu Feb 19 16:22:46 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/49ae4ab6/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 da457cf..ddba8a1 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 @@ -230,7 +230,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/49ae4ab6/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 26c6a61..e474b88 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 @@ -443,7 +443,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."); }
