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/c15fd6b0 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c15fd6b0 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c15fd6b0 Branch: refs/heads/branch-2.0 Commit: c15fd6b00a37ed927c33cb13401dc8dfe234e595 Parents: 18ca1fc 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:19:44 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/c15fd6b0/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()) {