diff --git common/src/java/org/apache/hadoop/hive/conf/HiveConf.java common/src/java/org/apache/hadoop/hive/conf/HiveConf.java index 37ab01e..bb42a4c 100644 --- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -648,6 +648,16 @@ public class HiveConf extends Configuration { public String toString() { return varname; } + + private static String findHadoopBinary() { + String val = System.getenv("HADOOP_HOME"); + // In Hadoop 1.X and Hadoop 2.X HADOOP_HOME is gone and replaced with HADOOP_PREFIX + if (val == null) { + val = System.getenv("HADOOP_PREFIX"); + } + // and if all else fails we can at least try /usr/bin/hadoop + return (val == null ? File.separator + "usr" : val) + File.separator + "bin" + File.separator + "hadoop"; + } } /** @@ -907,16 +917,6 @@ public class HiveConf extends Configuration { } } - private static String findHadoopBinary() { - String val = System.getenv("HADOOP_HOME"); - // In Hadoop 1.X and Hadoop 2.X HADOOP_HOME is gone and replaced with HADOOP_PREFIX - if (val == null) { - val = System.getenv("HADOOP_PREFIX"); - } - // and if all else fails we can at least try /usr/bin/hadoop - return (val == null ? File.separator + "usr" : val) + File.separator + "bin" + File.separator + "hadoop"; - } - public Properties getChangedProperties() { Properties ret = new Properties(); Properties newProp = getAllProperties();