From f05b4413a4ceae45fbc444aed7cd11ac6abb62ba Mon Sep 17 00:00:00 2001
From: Jarek Jarcec Cecho <jarcec@apache.org>
Date: Fri, 25 Jul 2014 06:48:57 -0700
Subject: [PATCH] SQOOP-1368: the configuration properties are reset in
 HBaseImportJob

(Guodong Wang via Jarek Jarcec Cecho)
---
 src/java/org/apache/sqoop/mapreduce/HBaseImportJob.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/java/org/apache/sqoop/mapreduce/HBaseImportJob.java b/src/java/org/apache/sqoop/mapreduce/HBaseImportJob.java
index 3f18bd98..d10050de 100644
--- a/src/java/org/apache/sqoop/mapreduce/HBaseImportJob.java
+++ b/src/java/org/apache/sqoop/mapreduce/HBaseImportJob.java
@@ -138,7 +138,8 @@ protected void jobSetup(Job job) throws IOException, ImportException {
     }
 
     // Add HBase configuration files to this conf object.
-    HBaseConfiguration.addHbaseResources(conf);
+    Configuration newConf = HBaseConfiguration.create(conf);
+    HBaseConfiguration.merge(conf, newConf);
 
     HBaseAdmin admin = new HBaseAdmin(conf);