From 89ea8af04f64dc3080bc345f540693da5d340803 Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Thu, 29 Mar 2012 21:23:23 +0000 Subject: [PATCH] HBASE-4398 If HRegionPartitioner is used in MapReduce, client side configurations are overwritten by hbase-site.xml git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1307116 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/hadoop/hbase/mapreduce/HRegionPartitioner.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/org/apache/hadoop/hbase/mapreduce/HRegionPartitioner.java b/src/main/java/org/apache/hadoop/hbase/mapreduce/HRegionPartitioner.java index f36a50744f0..8401c98a7a4 100644 --- a/src/main/java/org/apache/hadoop/hbase/mapreduce/HRegionPartitioner.java +++ b/src/main/java/org/apache/hadoop/hbase/mapreduce/HRegionPartitioner.java @@ -120,9 +120,8 @@ implements Configurable { */ @Override public void setConf(Configuration configuration) { - this.conf = configuration; + this.conf = HBaseConfiguration.create(configuration); try { - HBaseConfiguration.addHbaseResources(conf); this.table = new HTable(this.conf, configuration.get(TableOutputFormat.OUTPUT_TABLE)); } catch (IOException e) {