You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jv...@apache.org on 2011/02/12 18:09:19 UTC

svn commit: r1070114 - in /hive/trunk: CHANGES.txt metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java

Author: jvs
Date: Sat Feb 12 17:09:19 2011
New Revision: 1070114

URL: http://svn.apache.org/viewvc?rev=1070114&view=rev
Log:
HIVE-1465. hive-site.xml ${user.name} not replaced for local-file derby
metastore connection URL
(Carl Steinbach via jvs)


Modified:
    hive/trunk/CHANGES.txt
    hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java

Modified: hive/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hive/trunk/CHANGES.txt?rev=1070114&r1=1070113&r2=1070114&view=diff
==============================================================================
--- hive/trunk/CHANGES.txt (original)
+++ hive/trunk/CHANGES.txt Sat Feb 12 17:09:19 2011
@@ -822,6 +822,10 @@ Trunk -  Unreleased
     on trunk
     (Ning Zhang via jvs)
 
+    HIVE-1465. hive-site.xml ${user.name} not replaced for local-file derby
+    metastore connection URL
+    (Carl Steinbach via jvs)
+
   TASKS
 
     HIVE-1526. Hive should depend on a release version of Thrift

Modified: hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java?rev=1070114&r1=1070113&r2=1070114&view=diff
==============================================================================
--- hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java (original)
+++ hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java Sat Feb 12 17:09:19 2011
@@ -210,7 +210,7 @@ public class ObjectStore implements RawS
     while (iter.hasNext()) {
       Map.Entry<String, String> e = iter.next();
       if (e.getKey().contains("datanucleus") || e.getKey().contains("jdo")) {
-        Object prevVal = prop.setProperty(e.getKey(), e.getValue());
+        Object prevVal = prop.setProperty(e.getKey(), conf.get(e.getKey()));
         if (LOG.isDebugEnabled()
             && !e.getKey().equals(HiveConf.ConfVars.METASTOREPWD.varname)) {
           LOG.debug("Overriding " + e.getKey() + " value " + prevVal