From 08ae87f6ba334bd3442234e65b93495fe312cbb7 Mon Sep 17 00:00:00 2001 From: Allen Wittenauer Date: Thu, 28 May 2015 11:29:58 -0700 Subject: [PATCH] HADOOP-11983. HADOOP_USER_CLASSPATH_FIRST works the opposite of what it is supposed to do (Sangjin Lee via aw) --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../hadoop-common/src/main/bin/hadoop-functions.sh | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) mode change 100644 => 100755 hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 71b3388756..69f5aa78d7 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -474,6 +474,9 @@ Trunk (Unreleased) HADOOP-11406. xargs -P is not portable (Kengo Seki via aw) + HADOOP-11983. HADOOP_USER_CLASSPATH_FIRST works the opposite of what it is + supposed to do (Sangjin Lee via aw) + OPTIMIZATIONS HADOOP-7761. Improve the performance of raw comparisons. (todd) diff --git a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh old mode 100644 new mode 100755 index 5556f2f966..be65d7f0c1 --- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh +++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh @@ -761,11 +761,11 @@ function hadoop_add_to_classpath_userpath if [[ -z "${HADOOP_USE_CLIENT_CLASSLOADER}" ]]; then if [[ -z "${HADOOP_USER_CLASSPATH_FIRST}" ]]; then for ((i=j; i>=0; i--)); do - hadoop_add_classpath "${array[$i]}" before + hadoop_add_classpath "${array[$i]}" after done else for ((i=0; i<=j; i++)); do - hadoop_add_classpath "${array[$i]}" after + hadoop_add_classpath "${array[$i]}" before done fi fi