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 om...@apache.org on 2011/03/04 04:31:25 UTC

svn commit: r1077026 - /hadoop/common/branches/branch-0.20-security-patches/src/tools/org/apache/hadoop/tools/HadoopArchives.java

Author: omalley
Date: Fri Mar  4 03:31:25 2011
New Revision: 1077026

URL: http://svn.apache.org/viewvc?rev=1077026&view=rev
Log:
commit c85d8db0bb4a9714de6a8cb1d6816c65806eb9b7
Author: Mahadev Konar <ma...@cdev6022.inktomisearch.com>
Date:   Tue Oct 20 23:47:06 2009 +0000

    MAPREDUCE-826 from https://issues.apache.org/jira/secure/attachment/12419080/mapreduce-826-2.patch
    
    +++ b/YAHOO-CHANGES.txt
    +    MAPREDUCE-826.  harchive doesn't use ToolRunner / harchive returns 0 even
    +    if the job fails with exception (koji via mahadev)
    +

Modified:
    hadoop/common/branches/branch-0.20-security-patches/src/tools/org/apache/hadoop/tools/HadoopArchives.java

Modified: hadoop/common/branches/branch-0.20-security-patches/src/tools/org/apache/hadoop/tools/HadoopArchives.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/tools/org/apache/hadoop/tools/HadoopArchives.java?rev=1077026&r1=1077025&r2=1077026&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/tools/org/apache/hadoop/tools/HadoopArchives.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/tools/org/apache/hadoop/tools/HadoopArchives.java Fri Mar  4 03:31:25 2011
@@ -675,11 +675,16 @@ public class HadoopArchives implements T
   public static void main(String[] args) {
     JobConf job = new JobConf(HadoopArchives.class);
     HadoopArchives harchives = new HadoopArchives(job);
-    try {
-      int res = harchives.run(args);
-      System.exit(res);
+    int ret = 0;
+
+    try{
+      ret = ToolRunner.run(harchives, args);
     } catch(Exception e) {
+      LOG.debug("Exception in archives  ", e);
+      System.err.println("Exception in archives");
       System.err.println(e.getLocalizedMessage());
+      System.exit(1);
     }
+    System.exit(ret);
   }
 }