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 zh...@apache.org on 2015/09/02 07:58:25 UTC
[13/50] [abbrv] hadoop git commit: Revert "MAPREDUCE-6455. Unable to
use surefire > 2.18. (Charlie Helin via kasha)"
Revert "MAPREDUCE-6455. Unable to use surefire > 2.18. (Charlie Helin via kasha)"
This reverts commit 61bf9cae6f3882c6e9a9222f59457b9be91e3018.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/50fa3837
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/50fa3837
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/50fa3837
Branch: refs/heads/HDFS-7285
Commit: 50fa38370468bf44031607dfed49b052cfc6d1e3
Parents: 1e5f69e
Author: Andrew Wang <wa...@apache.org>
Authored: Thu Aug 27 10:15:19 2015 -0700
Committer: Andrew Wang <wa...@apache.org>
Committed: Thu Aug 27 10:15:19 2015 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/conf/Configuration.java | 9 ++-------
hadoop-mapreduce-project/CHANGES.txt | 2 --
.../src/main/java/org/apache/hadoop/mapred/TaskLog.java | 4 +---
3 files changed, 3 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/50fa3837/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
index 6f1d3f8..0b45429 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
@@ -988,13 +988,8 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
} catch(SecurityException se) {
LOG.warn("Unexpected SecurityException in Configuration", se);
}
- if (val == null || val.isEmpty()) {
- String raw = getRaw(var);
- if (raw != null) {
- // if System.getProperty(var) returns an empty string, retain this
- // value instead of return null
- val = raw;
- }
+ if (val == null) {
+ val = getRaw(var);
}
if (val == null) {
return eval; // return literal ${var}: var is unbound
http://git-wip-us.apache.org/repos/asf/hadoop/blob/50fa3837/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 305b29e..361a19b 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -275,8 +275,6 @@ Trunk (Unreleased)
MAPREDUCE-5801. Uber mode's log message is missing a vcore reason
(Steven Wong via aw)
- MAPREDUCE-6455. Unable to use surefire > 2.18. (Charlie Helin via kasha)
-
Release 2.8.0 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/50fa3837/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLog.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLog.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLog.java
index b8bb2f2..e07b5be 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLog.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLog.java
@@ -181,9 +181,7 @@ public class TaskLog {
}
static String getBaseLogDir() {
- String logDir = System.getProperty("hadoop.log.dir");
- // file is treating "" different from null {@see File#File(String, String)}
- return logDir == null || logDir.isEmpty() ? null : logDir;
+ return System.getProperty("hadoop.log.dir");
}
static File getAttemptDir(TaskAttemptID taskid, boolean isCleanup) {