hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r616492 - in /hadoop/core/trunk/src/contrib/hbase: CHANGES.txt src/java/org/apache/hadoop/hbase/HBaseConfiguration.java
Date Tue, 29 Jan 2008 19:30:28 GMT
Author: stack
Date: Tue Jan 29 11:30:22 2008
New Revision: 616492

URL: http://svn.apache.org/viewvc?rev=616492&view=rev
Log:
HADOOP-2718 Copy Constructor HBaseConfiguration(Configuration) will override
hbase configurations if argumant is not an instance of HBaseConfiguration.

Modified:
    hadoop/core/trunk/src/contrib/hbase/CHANGES.txt
    hadoop/core/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HBaseConfiguration.java

Modified: hadoop/core/trunk/src/contrib/hbase/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hbase/CHANGES.txt?rev=616492&r1=616491&r2=616492&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hbase/CHANGES.txt (original)
+++ hadoop/core/trunk/src/contrib/hbase/CHANGES.txt Tue Jan 29 11:30:22 2008
@@ -152,6 +152,9 @@
    HADOOP-2712 under load, regions won't split
    HADOOP-2675 Options not passed to rest/thrift
    HADOOP-2722 Prevent unintentional thread exit in region server and master
+   HADOOP-2718 Copy Constructor HBaseConfiguration(Configuration) will override
+               hbase configurations if argumant is not an instance of
+               HBaseConfiguration.
    
   IMPROVEMENTS
    HADOOP-2401 Add convenience put method that takes writable

Modified: hadoop/core/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HBaseConfiguration.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HBaseConfiguration.java?rev=616492&r1=616491&r2=616492&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HBaseConfiguration.java
(original)
+++ hadoop/core/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HBaseConfiguration.java
Tue Jan 29 11:30:22 2008
@@ -19,6 +19,8 @@
  */
 package org.apache.hadoop.hbase;
 
+import java.util.Map.Entry;
+
 import org.apache.hadoop.conf.Configuration;
 
 /**
@@ -36,9 +38,9 @@
    * @param c Configuration to clone.
    */
   public HBaseConfiguration(final Configuration c) {
-    super(c);
-    if (!(c instanceof HBaseConfiguration)) {
-      addHbaseResources();
+    super();
+    for (Entry<String, String>e: c) {
+      set(e.getKey(), e.getValue());
     }
   }
   



Mime
View raw message