From c7fea088f7b6c44e4e04bde19dc839975d8ac8ba Mon Sep 17 00:00:00 2001 From: Akira Ajisaka Date: Fri, 22 May 2015 14:13:51 +0900 Subject: [PATCH] HADOOP-12014. hadoop-config.cmd displays a wrong error message. Contributed by Kengo Seki. --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../hadoop-common/src/main/bin/hadoop-config.cmd | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 32f0630d6a9..c02b44d74ae 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -737,6 +737,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12000. cannot use --java-home in test-patch (aw) + HADOOP-12014. hadoop-config.cmd displays a wrong error message. + (Kengo Seki via aajisaka) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd index bf86f1b7ac3..6670aca2105 100644 --- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd +++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd @@ -115,7 +115,7 @@ if not defined JAVA_HOME ( if not exist %JAVA_HOME%\bin\java.exe ( echo Error: JAVA_HOME is incorrectly set. - echo Please update %HADOOP_HOME%\conf\hadoop-env.cmd + echo Please update %HADOOP_CONF_DIR%\hadoop-env.cmd goto :eof )