You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by md...@apache.org on 2018/05/09 03:21:01 UTC
[2/6] hbase git commit: HBASE-20521 change getConf as first sequence
instead of jobContext in TableOutputFormat.checkOutputSpec, add unit tests
HBASE-20521 change getConf as first sequence instead of jobContext in TableOutputFormat.checkOutputSpec, add unit tests
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/421ed6ca
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/421ed6ca
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/421ed6ca
Branch: refs/heads/branch-2
Commit: 421ed6ca513d09e1345a73c5da1289798a25ae47
Parents: d91908b
Author: Mike Drob <md...@apache.org>
Authored: Tue May 8 22:18:48 2018 -0500
Committer: Mike Drob <md...@apache.org>
Committed: Tue May 8 22:18:48 2018 -0500
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/421ed6ca/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java
----------------------------------------------------------------------
diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java
index 0a1928b..78be5af 100644
--- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java
+++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java
@@ -174,9 +174,9 @@ implements Configurable {
@Override
public void checkOutputSpecs(JobContext context) throws IOException,
InterruptedException {
- Configuration hConf = context.getConfiguration();
- if(hConf == null) {
- hConf = this.conf;
+ Configuration hConf = getConf();
+ if (hConf == null) {
+ hConf = context.getConfiguration();
}
try (Admin admin = ConnectionFactory.createConnection(hConf).getAdmin()) {