sqoop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jar...@apache.org
Subject git commit: SQOOP-1368: the configuration properties are reset in HBaseImportJob
Date Fri, 25 Jul 2014 13:49:32 GMT
Repository: sqoop
Updated Branches:
  refs/heads/trunk 28f5aa03b -> f05b4413a


SQOOP-1368: the configuration properties are reset in HBaseImportJob

(Guodong Wang via Jarek Jarcec Cecho)


Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/f05b4413
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/f05b4413
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/f05b4413

Branch: refs/heads/trunk
Commit: f05b4413a4ceae45fbc444aed7cd11ac6abb62ba
Parents: 28f5aa0
Author: Jarek Jarcec Cecho <jarcec@apache.org>
Authored: Fri Jul 25 06:48:57 2014 -0700
Committer: Jarek Jarcec Cecho <jarcec@apache.org>
Committed: Fri Jul 25 06:48:57 2014 -0700

----------------------------------------------------------------------
 src/java/org/apache/sqoop/mapreduce/HBaseImportJob.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/sqoop/blob/f05b4413/src/java/org/apache/sqoop/mapreduce/HBaseImportJob.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/sqoop/mapreduce/HBaseImportJob.java b/src/java/org/apache/sqoop/mapreduce/HBaseImportJob.java
index 3f18bd9..d10050d 100644
--- a/src/java/org/apache/sqoop/mapreduce/HBaseImportJob.java
+++ b/src/java/org/apache/sqoop/mapreduce/HBaseImportJob.java
@@ -138,7 +138,8 @@ public class HBaseImportJob extends DataDrivenImportJob {
     }
 
     // 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);
 


Mime
View raw message