From 59ab2c5d315abbe061d8e7bfba3920d7a151a040 Mon Sep 17 00:00:00 2001
From: Tsz-wo Sze <szetszwo@apache.org>
Date: Tue, 29 Sep 2009 21:26:06 +0000
Subject: [PATCH] HADOOP-6284. Add a new parameter, HADOOP_JAVA_PLATFORM_OPTS,
 to hadoop-config.sh so that it allows setting java command options for
 JAVA_PLATFORM.  Contributed by Koji Noguchi

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@820094 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt          | 4 ++++
 bin/hadoop-config.sh | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 006d667514c..b2f7ff2e82e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,10 @@ Trunk (unreleased changes)
 
   NEW FEATURES
 
+    HADOOP-6284. Add a new parameter, HADOOP_JAVA_PLATFORM_OPTS, to
+    hadoop-config.sh so that it allows setting java command options for
+    JAVA_PLATFORM.  (Koji Noguchi via szetszwo)
+
   IMPROVEMENTS
 
   OPTIMIZATIONS
diff --git a/bin/hadoop-config.sh b/bin/hadoop-config.sh
index 4e8629b83cf..52c5b22c085 100644
--- a/bin/hadoop-config.sh
+++ b/bin/hadoop-config.sh
@@ -183,7 +183,7 @@ fi
 # setup 'java.library.path' for native-hadoop code if necessary
 JAVA_LIBRARY_PATH=''
 if [ -d "${HADOOP_CORE_HOME}/build/native" -o -d "${HADOOP_CORE_HOME}/lib/native" ]; then
-  JAVA_PLATFORM=`CLASSPATH=${CLASSPATH} ${JAVA} -Xmx32m org.apache.hadoop.util.PlatformName | sed -e "s/ /_/g"`
+  JAVA_PLATFORM=`CLASSPATH=${CLASSPATH} ${JAVA} -Xmx32m ${HADOOP_JAVA_PLATFORM_OPTS} org.apache.hadoop.util.PlatformName | sed -e "s/ /_/g"`
   
   if [ -d "$HADOOP_CORE_HOME/build/native" ]; then
     JAVA_LIBRARY_PATH=${HADOOP_CORE_HOME}/build/native/${JAVA_PLATFORM}/lib