Repository: hadoop Updated Branches: refs/heads/branch-2 63b64a20c -> b3b81b4f0
HADOOP-13320. Fix arguments check in documentation for WordCount v2.0. Contributed by niccolo becchi. (cherry picked from commit 9d46a49c746b9e1ef552dbb10d1e22f87db68c76) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b3b81b4f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b3b81b4f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b3b81b4f Branch: refs/heads/branch-2 Commit: b3b81b4f0e1cd0b37ab2dfdf3e7301e0ef3e0676 Parents: 63b64a2 Author: Akira Ajisaka <aajis...@apache.org> Authored: Thu Jul 7 15:29:26 2016 -0700 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Thu Jul 7 15:32:05 2016 -0700 ---------------------------------------------------------------------- .../src/site/markdown/MapReduceTutorial.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b3b81b4f/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md index 8271e7e..8599676 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md @@ -1040,7 +1040,7 @@ public class WordCount2 { Configuration conf = new Configuration(); GenericOptionsParser optionParser = new GenericOptionsParser(conf, args); String[] remainingArgs = optionParser.getRemainingArgs(); - if (!(remainingArgs.length != 2 | | remainingArgs.length != 4)) { + if ((remainingArgs.length != 2) && (remainingArgs.length != 4)) { System.err.println("Usage: wordcount <in> <out> [-skip skipPatternFile]"); System.exit(2); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
