svn commit: r668399 - in /hadoop/core/branches/branch-0.18: CHANGES.txt src/tools/org/apache/hadoop/tools/HadoopArchives.java

[ddas]

Author: ddas
Date: Mon Jun 16 22:28:18 2008
New Revision: 668399

URL: http://svn.apache.org/viewvc?rev=668399&view=rev
Log:
Merge -r 668397:668398 from trunk onto 0.18 branch. Fixes HADOOP-3545.

Modified:
    hadoop/core/branches/branch-0.18/CHANGES.txt
    
hadoop/core/branches/branch-0.18/src/tools/org/apache/hadoop/tools/HadoopArchives.java

Modified: hadoop/core/branches/branch-0.18/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/CHANGES.txt?rev=668399&r1=668398&r2=668399&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.18/CHANGES.txt Mon Jun 16 22:28:18 2008
@@ -590,6 +590,9 @@
     HADOOP-3560. Fixes a problem to do with split creation in archives.
     (Mahadev Konar via ddas)
 
+    HADOOP-3545. Fixes a overflow problem in archives.
+    (Mahadev Konar via ddas)
+
 Release 0.17.0 - 2008-05-18
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/core/branches/branch-0.18/src/tools/org/apache/hadoop/tools/HadoopArchives.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/tools/org/apache/hadoop/tools/HadoopArchives.java?rev=668399&r1=668398&r2=668399&view=diff
==============================================================================
--- 
hadoop/core/branches/branch-0.18/src/tools/org/apache/hadoop/tools/HadoopArchives.java
 (original)
+++ 
hadoop/core/branches/branch-0.18/src/tools/org/apache/hadoop/tools/HadoopArchives.java
 Mon Jun 16 22:28:18 2008
@@ -59,6 +59,7 @@
 import org.apache.hadoop.util.Tool;
 import org.apache.hadoop.util.ToolRunner;
 
+
 /**
  * a archive creation utility.
  * This class provides methods that can be used 
@@ -78,7 +79,7 @@
   static final String DST_HAR_LABEL = NAME + ".archive.name";
   // size of each part file
   // its fixed for now.
-  static final long partSize = 2 * 1024 * 1024 * 1024;
+  static final long partSize = 2 * 1024 * 1024 * 1024l;
 
   private static final String usage = "archive"
   + " -archiveName NAME <src>* <dest>" +
@@ -91,7 +92,7 @@
     if (conf instanceof JobConf) {
       this.conf = (JobConf) conf;
     } else {
-      this.conf = new JobConf(conf);
+      this.conf = new JobConf(conf, HadoopArchives.class);
     }
   }