HADOOP-12467. Respect user-defined JAVA_LIBRARY_PATH in Windows Hadoop scripts. Contributed by Radhey Shah.

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

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