hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From whe...@apache.org
Subject hadoop git commit: HADOOP-12467. Respect user-defined JAVA_LIBRARY_PATH in Windows Hadoop scripts. Contributed by Radhey Shah.
Date Mon, 23 Nov 2015 00:05:44 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 64add87f5 -> 812dbea5c


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/812dbea5
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/812dbea5
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/812dbea5

Branch: refs/heads/branch-2
Commit: 812dbea5c0c35c624d219df31e781664e399391c
Parents: 64add87
Author: Haohui Mai <wheat9@apache.org>
Authored: Sun Nov 22 16:03:59 2015 -0800
Committer: Haohui Mai <wheat9@apache.org>
Committed: Sun Nov 22 16:04:06 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/812dbea5/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 7ce69f3..7b68bc6 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -813,6 +813,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/812dbea5/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 f8d71ba..b4bc5fd 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


Mime
View raw message