Repository: hadoop Updated Branches: refs/heads/branch-2.6 c3b7425bf -> 9195e81fd
Remove parent's env vars from child processes (fixed java 1.6 compilation error) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9195e81f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9195e81f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9195e81f Branch: refs/heads/branch-2.6 Commit: 9195e81fd4f1b4c38c56b4d30ba2b65fdc4fef57 Parents: c3b7425 Author: Sangjin Lee <[email protected]> Authored: Wed Sep 14 21:05:26 2016 -0700 Committer: Sangjin Lee <[email protected]> Committed: Wed Sep 14 21:05:26 2016 -0700 ---------------------------------------------------------------------- .../src/test/java/org/apache/hadoop/util/TestShell.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9195e81f/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java index 6fb1ce8..accb469 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java @@ -138,12 +138,12 @@ public class TestShell extends TestCase { inheritParentEnv); command.execute(); String[] varsArr = command.getOutput().split("\n"); - Map<String, String> vars = new HashMap<>(); + Map<String, String> vars = new HashMap<String, String>(); for (String var : varsArr) { int eqIndex = var.indexOf('='); vars.put(var.substring(0, eqIndex), var.substring(eqIndex + 1)); } - Map<String, String> expectedEnv = new HashMap<>(); + Map<String, String> expectedEnv = new HashMap<String, String>(); expectedEnv.putAll(System.getenv()); if (inheritParentEnv) { expectedEnv.putAll(customEnv); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
