From 6cd767287845e1314964e78df2999b05c3cd6c38 Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
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.

(cherry picked from commit 07007bdbc8900cfe8421f4829b1444fc9e7aceb7)
---
 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 e58e9cb478c..681b4b81dc7 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -272,6 +272,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 13fb64c44b9..f8d71ba82bf 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
 )