big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "MAPREDUCE-6455. Unable to use surefire > 2.18. (Charlie Helin via kasha)"

Browse Source 
This reverts commit 61bf9cae6f.
This commit is contained in:
Andrew Wang 2015-08-27 10:15:19 -07:00
parent 1e5f69e85c
commit 50fa383704
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
View File

@ -988,13 +988,8 @@ private String substituteVars(String expr) {
} catch(SecurityException se) { } catch(SecurityException se) {
LOG.warn("Unexpected SecurityException in Configuration", se); LOG.warn("Unexpected SecurityException in Configuration", se);
} }
if (val == null || val.isEmpty()) { if (val == null) {
String raw = getRaw(var); val = 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) { if (val == null) {
return eval; // return literal ${var}: var is unbound return eval; // return literal ${var}: var is unbound

2
hadoop-mapreduce-project/CHANGES.txt
View File

@ -275,8 +275,6 @@ Trunk (Unreleased)
MAPREDUCE-5801. Uber mode's log message is missing a vcore reason MAPREDUCE-5801. Uber mode's log message is missing a vcore reason
(Steven Wong via aw) (Steven Wong via aw)
MAPREDUCE-6455. Unable to use surefire > 2.18. (Charlie Helin via kasha)
Release 2.8.0 - UNRELEASED Release 2.8.0 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLog.java
View File

@ -181,9 +181,7 @@ static String obtainLogDirOwner(TaskAttemptID taskid) throws IOException {
} }
static String getBaseLogDir() { static String getBaseLogDir() {
String logDir = System.getProperty("hadoop.log.dir"); return System.getProperty("hadoop.log.dir");
// file is treating "" different from null {@see File#File(String, String)}
return logDir == null || logDir.isEmpty() ? null : logDir;
} }
static File getAttemptDir(TaskAttemptID taskid, boolean isCleanup) { static File getAttemptDir(TaskAttemptID taskid, boolean isCleanup) {