From 13e1c7ad4eb6f494c55e8df134cb892f57642aaf Mon Sep 17 00:00:00 2001 From: Ivan Mitic Date: Sat, 8 Jun 2013 19:18:28 +0000 Subject: [PATCH] HADOOP-9599. Merging change r1491030 from trunk. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491035 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../hadoop-common/src/main/bin/hadoop-config.cmd | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 64868c9fc15..23b787bdd53 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -432,6 +432,9 @@ Release 2.1.0-beta - UNRELEASED HADOOP-8958. ViewFs:Non absolute mount name failures when running multiple tests on Windows. (Chris Nauroth via suresh) + HADOOP-9599. hadoop-config.cmd doesn't set JAVA_LIBRARY_PATH correctly. + (Mostafa Elhemali via ivanmi) + Release 2.0.5-alpha - 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 bcb72a2a19e..3e6e4571a4e 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 @@ -195,13 +195,13 @@ set JAVA_PLATFORM=%JAVA_PLATFORM: =_% @rem Check if we're running hadoop directly from the build set JAVA_LIBRARY_PATH= -if exist %HADOOP_CORE_HOME%\target\bin ( - set JAVA_LIBRARY_PATH=%HADOOP_CORE_HOME%\target\bin +if exist %HADOOP_COMMON_HOME%\target\bin ( + set JAVA_LIBRARY_PATH=%HADOOP_COMMON_HOME%\target\bin ) @rem For the distro case, check the bin folder -if exist %HADOOP_CORE_HOME%\bin ( - set JAVA_LIBRARY_PATH=%JAVA_LIBRARY_PATH%;%HADOOP_CORE_HOME%\bin +if exist %HADOOP_COMMON_HOME%\bin ( + set JAVA_LIBRARY_PATH=%JAVA_LIBRARY_PATH%;%HADOOP_COMMON_HOME%\bin ) @rem