reverse changes

acceldata-io · Jul 3, 2024 · 87a24a4 · 87a24a4
1 parent 758d0b8
commit 87a24a4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...e/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java b/...e/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java
@@ -2328,8 +2328,7 @@ public static void setLongVar(Configuration conf, ConfVars var, long val) {
   public static boolean getBoolVar(Configuration conf, ConfVars var) {
     assert var.defaultVal.getClass() == Boolean.class;
     String val = conf.get(var.varname);
-    // return val == null ? conf.getBoolean(var.hiveName, (Boolean)var.defaultVal) : Boolean.valueOf(val);
-    return val == null ? false : Boolean.valueOf(val);
+    return val == null ? conf.getBoolean(var.hiveName, (Boolean)var.defaultVal) : Boolean.valueOf(val);
   }
 
   /**

diff --git a/...tastore-server/src/test/java/org/apache/hadoop/hive/metastore/conf/TestMetastoreConf.java b/...tastore-server/src/test/java/org/apache/hadoop/hive/metastore/conf/TestMetastoreConf.java
@@ -89,12 +89,13 @@ private void createConfFile(String fileName, boolean inConf, String envVar,
     File dir = new File(tmpDir, randomFileName());
     Assume.assumeTrue(dir.mkdir());
     dir.deleteOnExit();
-    System.setProperty(MetastoreConf.TEST_ENV_WORKAROUND + envVar, dir.getAbsolutePath());
+    // System.setProperty(MetastoreConf.TEST_ENV_WORKAROUND + envVar, dir.getAbsolutePath());
     if (inConf) {
       dir = new File(dir, "conf");
       Assume.assumeTrue(dir.mkdir());
       dir.deleteOnExit();
     }
+    System.setProperty(MetastoreConf.TEST_ENV_WORKAROUND + envVar, dir.getAbsolutePath());
     File confFile = new File(dir, fileName);
     confFile.deleteOnExit();
     FileWriter writer = new FileWriter(confFile);