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 jh...@apache.org on 2018/12/15 01:13:46 UTC
hadoop git commit: fix an oopsie
Repository: hadoop
Updated Branches:
refs/heads/branch-2-jhung-test 5b580aaa7 -> be705b531
fix an oopsie
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/be705b53
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/be705b53
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/be705b53
Branch: refs/heads/branch-2-jhung-test
Commit: be705b531f2d2ecb6cd93857f7ac8bae40404efb
Parents: 5b580aa
Author: Jonathan Hung <jy...@gmail.com>
Authored: Fri Dec 14 17:13:28 2018 -0800
Committer: Jonathan Hung <jy...@gmail.com>
Committed: Fri Dec 14 17:13:28 2018 -0800
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/ant/DfsTask.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/be705b53/hadoop-tools/hadoop-ant/src/main/java/org/apache/hadoop/ant/DfsTask.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-ant/src/main/java/org/apache/hadoop/ant/DfsTask.java b/hadoop-tools/hadoop-ant/src/main/java/org/apache/hadoop/ant/DfsTask.java
index 1856d5c..36119f5 100644
--- a/hadoop-tools/hadoop-ant/src/main/java/org/apache/hadoop/ant/DfsTask.java
+++ b/hadoop-tools/hadoop-ant/src/main/java/org/apache/hadoop/ant/DfsTask.java
@@ -148,8 +148,8 @@ public class DfsTask extends Task {
antOut = System.out;
antErr = System.err;
try {
- //System.setOut(new PrintStream(out, false, "UTF-8"));
- //System.setErr(out == err ?
+ System.setOut(new PrintStream(out, false, "UTF-8"));
+ System.setErr(out == err ?
System.out : new PrintStream(err, false, "UTF-8"));
} catch (UnsupportedEncodingException ignored) {
}
@@ -167,8 +167,8 @@ public class DfsTask extends Task {
if (out != err && errprop != null && !System.err.checkError())
getProject().setNewProperty(errprop, err.toString());
- //System.setErr(antErr);
- //System.setOut(antOut);
+ System.setErr(antErr);
+ System.setOut(antOut);
confloader.cleanup();
confloader.setParent(null);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org