svn commit: r713847 - in /hadoop/core/trunk: CHANGES.txt src/core/org/apache/hadoop/util/ProgramDriver.java

[om...@apache.org]

Author: omalley
Date: Thu Nov 13 14:38:47 2008
New Revision: 713847

URL: http://svn.apache.org/viewvc?rev=713847&view=rev
Log:
HADOOP-4608. Don't print a stack trace when the example driver gets an
unknown program to run. (Edward Yoon via omalley)

Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/src/core/org/apache/hadoop/util/ProgramDriver.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=713847&r1=713846&r2=713847&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Thu Nov 13 14:38:47 2008
@@ -16,10 +16,10 @@
     (Suresh Srinivas via johan)
 
     HADOOP-4618. Move http server from FSNamesystem into NameNode.
-      FSNamesystem.getNameNodeInfoPort() is removed.
-      FSNamesystem.getDFSNameNodeMachine() and FSNamesystem.getDFSNameNodePort()
-        replaced by FSNamesystem.getDFSNameNodeAddress().
-      NameNode(bindAddress, conf) is removed.
+    FSNamesystem.getNameNodeInfoPort() is removed.
+    FSNamesystem.getDFSNameNodeMachine() and FSNamesystem.getDFSNameNodePort()
+      replaced by FSNamesystem.getDFSNameNodeAddress().
+    NameNode(bindAddress, conf) is removed.
     (shv)
 
     HADOOP-4567. GetFileBlockLocations returns the NetworkTopology
@@ -74,13 +74,14 @@
 
     HADOOP-3461. Remove hdfs.StringBytesWritable. (szetszwo)
 
-    HADOOP-4437. Use Halton sequence instead of java.util.Random in PiEstimator.
-    (szetszwo)
+    HADOOP-4437. Use Halton sequence instead of java.util.Random in 
+    PiEstimator. (szetszwo)
 
-    HADOOP-4572. Change INode and its sub-classes to package private. (szetszwo)
+    HADOOP-4572. Change INode and its sub-classes to package private. 
+    (szetszwo)
 
-    HADOOP-4187. Does a runtime lookup for JobConf/JobConfigurable, and if found,
-    invokes the appropriate configure method. (Sharad Agarwal via ddas)
+    HADOOP-4187. Does a runtime lookup for JobConf/JobConfigurable, and if 
+    found, invokes the appropriate configure method. (Sharad Agarwal via ddas)
 
     HADOOP-4453. Improve ssl configuration and handling in HsftpFileSystem,
     particularly when used with DistCp. (Kan Zhang via cdouglas)
@@ -96,6 +97,9 @@
     HADOOP-4505. Add a unit test to test faulty setup task and cleanup
     task killing the job. (Amareshwari Sriramadasu via johan)
 
+    HADOOP-4608. Don't print a stack trace when the example driver gets an
+    unknown program to run. (Edward Yoon via omalley)
+
   OPTIMIZATIONS
 
   BUG FIXES

Modified: hadoop/core/trunk/src/core/org/apache/hadoop/util/ProgramDriver.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/util/ProgramDriver.java?rev=713847&r1=713846&r2=713847&view=diff
==============================================================================
--- hadoop/core/trunk/src/core/org/apache/hadoop/util/ProgramDriver.java (original)
+++ hadoop/core/trunk/src/core/org/apache/hadoop/util/ProgramDriver.java Thu Nov 13 14:38:47 2008
@@ -120,8 +120,7 @@
       System.out.println("An example program must be given as the" + 
                          " first argument.");
       printUsage(programs);
-      throw new IllegalArgumentException("An example program must be given " +
-      		                               "as the first argument.");
+      System.exit(-1);
     }
 	
     // And that it is good.
@@ -129,8 +128,7 @@
     if (pgm == null) {
       System.out.println("Unknown program '" + args[0] + "' chosen.");
       printUsage(programs);
-      throw new IllegalArgumentException("Unknown program '" + args[0] + 
-                                         "' chosen.");
+      System.exit(-1);
     }
 	
     // Remove the leading argument and call main