Author: cutting
Date: Mon Jan 8 15:25:45 2007
New Revision: 494249
URL: http://svn.apache.org/viewvc?view=rev&rev=494249
Log:
HADOOP-864. Fix 'bin/hadoop -jar' to operate correctly when hadoop.tmp.dir
does not yet exist. Contributed by Owen.
Modified:
lucene/hadoop/trunk/CHANGES.txt
lucene/hadoop/trunk/src/java/org/apache/hadoop/util/RunJar.java
Modified: lucene/hadoop/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=494249&r1=494248&r2=494249
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Mon Jan 8 15:25:45 2007
@@ -14,6 +14,9 @@
4. HADOOP-600. Fix a race condition in JobTracker.
(Arun C Murthy via cutting)
+ 5. HADOOP-864. Fix 'bin/hadoop -jar' to operate correctly when
+ hadoop.tmp.dir does not yet exist. (omalley via cutting)
+
Release 0.10.0 - 2007-01-05
Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/util/RunJar.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/util/RunJar.java?view=diff&rev=494249&r1=494248&r2=494249
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/util/RunJar.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/util/RunJar.java Mon Jan 8
15:25:45 2007
@@ -106,14 +106,18 @@
}
mainClassName = mainClassName.replaceAll("/", ".");
- final File workDir = File.createTempFile("hadoop-unjar","",
- new File( new Configuration().get("hadoop.tmp.dir")) );
+ File tmpDir = new File(new Configuration().get("hadoop.tmp.dir"));
+ tmpDir.mkdirs();
+ if (!tmpDir.isDirectory()) {
+ System.err.println("Mkdirs failed to create " + tmpDir);
+ System.exit(-1);
+ }
+ final File workDir = File.createTempFile("hadoop-unjar", "", tmpDir );
workDir.delete();
- if (!workDir.mkdirs()) {
- if (!workDir.isDirectory()) {
- System.err.println("Mkdirs failed to create " + workDir.toString());
- System.exit(-1);
- }
+ workDir.mkdirs();
+ if (!workDir.isDirectory()) {
+ System.err.println("Mkdirs failed to create " + workDir);
+ System.exit(-1);
}
Runtime.getRuntime().addShutdownHook(new Thread() {
