hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r617025 - in /hadoop/core/trunk/src/contrib/hbase: CHANGES.txt src/java/org/apache/hadoop/hbase/HBaseConfiguration.java
Date Thu, 31 Jan 2008 07:03:37 GMT
Author: stack
Date: Wed Jan 30 23:03:33 2008
New Revision: 617025

URL: http://svn.apache.org/viewvc?rev=617025&view=rev
Log:
HADOOP-2753 Back out 2718; programmatic config works but
hbase*xml conf is overridden

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=617025&r1=617024&r2=617025&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hbase/CHANGES.txt (original)
+++ hadoop/core/trunk/src/contrib/hbase/CHANGES.txt Wed Jan 30 23:03:33 2008
@@ -155,6 +155,8 @@
    HADOOP-2718 Copy Constructor HBaseConfiguration(Configuration) will override
                hbase configurations if argumant is not an instance of
                HBaseConfiguration.
+   HADOOP-2753 Back out 2718; programmatic config works but hbase*xml conf
+               is overridden
    HADOOP-2631 2443 breaks HTable.getStartKeys when there is more than one
                table or table you are enumerating isn't the first table
    Delete empty file: src/contrib/hbase/src/java/org/apache/hadoop/hbase/mapred/

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=617025&r1=617024&r2=617025&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
Wed Jan 30 23:03:33 2008
@@ -19,8 +19,6 @@
  */
 package org.apache.hadoop.hbase;
 
-import java.util.Map.Entry;
-
 import org.apache.hadoop.conf.Configuration;
 
 /**
@@ -38,9 +36,9 @@
    * @param c Configuration to clone.
    */
   public HBaseConfiguration(final Configuration c) {
-    super();
-    for (Entry<String, String>e: c) {
-      set(e.getKey(), e.getValue());
+    super(c);
+    if (!(c instanceof HBaseConfiguration)) {
+      addHbaseResources();
     }
   }
   



Mime
View raw message