Repository: hadoop Updated Branches: refs/heads/trunk 66428d33a -> f0cd90386
HADOOP-12467. Respect user-defined JAVA_LIBRARY_PATH in Windows Hadoop scripts. Contributed by Radhey Shah. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f0cd9038 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f0cd9038 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f0cd9038 Branch: refs/heads/trunk Commit: f0cd903866850cf40f9300289ba57472c9072cd7 Parents: 66428d3 Author: Haohui Mai <[email protected]> Authored: Sun Nov 22 16:03:59 2015 -0800 Committer: Haohui Mai <[email protected]> Committed: Sun Nov 22 16:03:59 2015 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../hadoop-common/src/main/bin/hadoop-config.cmd | 13 ++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f0cd9038/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 8863837..52dea6e 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -1434,6 +1434,9 @@ Release 2.8.0 - UNRELEASED HADOOP-11218. Add TLSv1.1,TLSv1.2 to KMS, HttpFS, SSLFactory. (Vijay Singh via wheat9) + HADOOP-12467. Respect user-defined JAVA_LIBRARY_PATH in Windows Hadoop + scripts. (Radhey Shah via wheat9) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/f0cd9038/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd ---------------------------------------------------------------------- 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 6670aca..8d4b897 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 @@ -198,14 +198,21 @@ set JAVA_PLATFORM=%JAVA_PLATFORM: =_% @rem @rem Check if we're running hadoop directly from the build -set JAVA_LIBRARY_PATH= if exist %HADOOP_COMMON_HOME%\target\bin ( - set JAVA_LIBRARY_PATH=%HADOOP_COMMON_HOME%\target\bin + if defined JAVA_LIBRARY_PATH ( + set JAVA_LIBRARY_PATH=%JAVA_LIBRARY_PATH%;%HADOOP_COMMON_HOME%\target\bin + ) else ( + set JAVA_LIBRARY_PATH=%HADOOP_COMMON_HOME%\target\bin + ) ) @rem For the distro case, check the bin folder if exist %HADOOP_COMMON_HOME%\bin ( - set JAVA_LIBRARY_PATH=%JAVA_LIBRARY_PATH%;%HADOOP_COMMON_HOME%\bin + if defined JAVA_LIBRARY_PATH ( + set JAVA_LIBRARY_PATH=%JAVA_LIBRARY_PATH%;%HADOOP_COMMON_HOME%\bin + ) else ( + set JAVA_LIBRARY_PATH=%HADOOP_COMMON_HOME%\bin + ) ) @rem
