svn commit: r1062940 - in /hadoop/common/branches/branch-0.20: CHANGES.txt bin/hadoop

[to...@apache.org]

Author: todd
Date: Mon Jan 24 19:35:32 2011
New Revision: 1062940

URL: http://svn.apache.org/viewvc?rev=1062940&view=rev
Log:
HADOOP-6923. Native Libraries do not load if a different platform signature is returned from org.apache.hadoop.util.PlatformName.
Contributed by Stephen Watt.

Modified:
    hadoop/common/branches/branch-0.20/CHANGES.txt
    hadoop/common/branches/branch-0.20/bin/hadoop

Modified: hadoop/common/branches/branch-0.20/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/CHANGES.txt?rev=1062940&r1=1062939&r2=1062940&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20/CHANGES.txt Mon Jan 24 19:35:32 2011
@@ -6,6 +6,10 @@ Release 0.20.4 - Unreleased
 
   BUG FIXES
 
+  HADOOP-6923. Native Libraries do not load if a different platform
+  signature is returned from org.apache.hadoop.util.PlatformName.
+  (Stephen Watt via todd)
+
   IMPROVEMENTS
 
 Release 0.20.3 - 2011-1-5

Modified: hadoop/common/branches/branch-0.20/bin/hadoop
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/bin/hadoop?rev=1062940&r1=1062939&r2=1062940&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/bin/hadoop (original)
+++ hadoop/common/branches/branch-0.20/bin/hadoop Mon Jan 24 19:35:32 2011
@@ -257,6 +257,10 @@ JAVA_LIBRARY_PATH=''
 if [ -d "${HADOOP_HOME}/build/native" -o -d "${HADOOP_HOME}/lib/native" ]; then
   JAVA_PLATFORM=`CLASSPATH=${CLASSPATH} ${JAVA} -Xmx32m org.apache.hadoop.util.PlatformName | sed -e "s/ /_/g"`
   
+  if [ $JAVA_PLATFORM = "Linux-x86-32" ]; then
+	JAVA_PLATFORM="Linux-i386-32"
+  fi
+  
   if [ -d "$HADOOP_HOME/build/native" ]; then
     JAVA_LIBRARY_PATH=${HADOOP_HOME}/build/native/${JAVA_PLATFORM}/lib
   fi