svn commit: r921542 - in /hadoop/common/trunk: CHANGES.txt src/java/org/apache/hadoop/util/Tool.java

[to...@apache.org]

Author: tomwhite
Date: Wed Mar 10 20:06:07 2010
New Revision: 921542

URL: http://svn.apache.org/viewvc?rev=921542&view=rev
Log:
HADOOP-6504. Invalid example in the documentation of org.apache.hadoop.util.Tool. Contributed by Benoit Sigoure.

Modified:
    hadoop/common/trunk/CHANGES.txt
    hadoop/common/trunk/src/java/org/apache/hadoop/util/Tool.java

Modified: hadoop/common/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=921542&r1=921541&r2=921542&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Wed Mar 10 20:06:07 2010
@@ -264,8 +264,11 @@ Trunk (unreleased changes)
 
     HADOOP-6545. Changes the Key for the FileSystem cache to be UGI (ddas)
 
-   HADOOP-6609. Fixed deadlock in RPC by replacing shared static 
-   DataOutputBuffer in the UTF8 class with a thread local variable. (omalley)
+    HADOOP-6609. Fixed deadlock in RPC by replacing shared static 
+    DataOutputBuffer in the UTF8 class with a thread local variable. (omalley)
+
+    HADOOP-6504. Invalid example in the documentation of
+    org.apache.hadoop.util.Tool. (Benoit Sigoure via tomwhite)
 
 Release 0.21.0 - Unreleased
 

Modified: hadoop/common/trunk/src/java/org/apache/hadoop/util/Tool.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/util/Tool.java?rev=921542&r1=921541&r2=921542&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/util/Tool.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/util/Tool.java Wed Mar 10 20:06:07 2010
@@ -48,16 +48,17 @@ import org.apache.hadoop.conf.Configurab
  *         job.setJobName("my-app");
  *         job.setInputPath(in);
  *         job.setOutputPath(out);
- *         job.setMapperClass(MyApp.MyMapper.class);
- *         job.setReducerClass(MyApp.MyReducer.class);
+ *         job.setMapperClass(MyMapper.class);
+ *         job.setReducerClass(MyReducer.class);
  *
  *         // Submit the job, then poll for progress until the job is complete
  *         JobClient.runJob(job);
+ *         return 0;
  *       }
  *       
  *       public static void main(String[] args) throws Exception {
  *         // Let <code>ToolRunner</code> handle generic command-line options 
- *         int res = ToolRunner.run(new Configuration(), new Sort(), args);
+ *         int res = ToolRunner.run(new Configuration(), new MyApp(), args);
  *         
  *         System.exit(res);
  *       }