MAPREDUCE-6455. Unable to use surefire > 2.18. (Charlie Helin via kasha)
This commit is contained in:
parent
745d04be59
commit
61bf9cae6f
|
@ -988,8 +988,13 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
|||
} catch(SecurityException se) {
|
||||
LOG.warn("Unexpected SecurityException in Configuration", se);
|
||||
}
|
||||
if (val == null) {
|
||||
val = getRaw(var);
|
||||
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) {
|
||||
return eval; // return literal ${var}: var is unbound
|
||||
|
|
|
@ -275,6 +275,8 @@ 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
|
||||
|
|
|
@ -181,7 +181,9 @@ public class TaskLog {
|
|||
}
|
||||
|
||||
static String getBaseLogDir() {
|
||||
return System.getProperty("hadoop.log.dir");
|
||||
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;
|
||||
}
|
||||
|
||||
static File getAttemptDir(TaskAttemptID taskid, boolean isCleanup) {
|
||||
|
|
Loading…
Reference in New Issue