You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by jg...@apache.org on 2010/08/23 19:29:13 UTC
svn commit: r988219 - in /hadoop/common/trunk: CHANGES.txt
bin/hadoop-config.sh
Author: jghoman
Date: Mon Aug 23 17:29:13 2010
New Revision: 988219
URL: http://svn.apache.org/viewvc?rev=988219&view=rev
Log:
HADOOP-6453. Hadoop wrapper script shouldn't ignore an existing JAVA_LIBRARY_PATH. Contributed by Chad Metcalf.
Modified:
hadoop/common/trunk/CHANGES.txt
hadoop/common/trunk/bin/hadoop-config.sh
Modified: hadoop/common/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=988219&r1=988218&r2=988219&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Mon Aug 23 17:29:13 2010
@@ -208,6 +208,9 @@ Trunk (unreleased changes)
HADOOP-6906. FileContext copy() utility doesn't work with recursive
copying of directories. (vinod k v via mahadev)
+ HADOOP-6453. Hadoop wrapper script shouldn't ignore an existing
+ JAVA_LIBRARY_PATH. (Chad Metcalf via jghoman)
+
Release 0.21.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/common/trunk/bin/hadoop-config.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/bin/hadoop-config.sh?rev=988219&r1=988218&r2=988219&view=diff
==============================================================================
--- hadoop/common/trunk/bin/hadoop-config.sh (original)
+++ hadoop/common/trunk/bin/hadoop-config.sh Mon Aug 23 17:29:13 2010
@@ -182,14 +182,20 @@ unset IFS
if $cygwin; then
HADOOP_COMMON_HOME=`cygpath -w "$HADOOP_COMMON_HOME"`
HADOOP_LOG_DIR=`cygpath -w "$HADOOP_LOG_DIR"`
+ JAVA_LIBRARY_PATH=`cygpath -w "$JAVA_LIBRARY_PATH"`
fi
+
# setup 'java.library.path' for native-hadoop code if necessary
-JAVA_LIBRARY_PATH=''
+
if [ -d "${HADOOP_COMMON_HOME}/build/native" -o -d "${HADOOP_COMMON_HOME}/lib/native" ]; then
JAVA_PLATFORM=`CLASSPATH=${CLASSPATH} ${JAVA} -Xmx32m ${HADOOP_JAVA_PLATFORM_OPTS} org.apache.hadoop.util.PlatformName | sed -e "s/ /_/g"`
if [ -d "$HADOOP_COMMON_HOME/build/native" ]; then
- JAVA_LIBRARY_PATH=${HADOOP_COMMON_HOME}/build/native/${JAVA_PLATFORM}/lib
+ if [ "x$JAVA_LIBRARY_PATH" != "x" ]; then
+ JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:${HADOOP_CORE_HOME}/build/native/${JAVA_PLATFORM}/lib
+ else
+ JAVA_LIBRARY_PATH=${HADOOP_CORE_HOME}/build/native/${JAVA_PLATFORM}/lib
+ fi
fi
if [ -d "${HADOOP_COMMON_HOME}/lib/native" ]; then