hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cutt...@apache.org
Subject svn commit: r409217 - in /lucene/hadoop/trunk/src: java/org/apache/hadoop/dfs/FSNamesystem.java test/org/apache/hadoop/fs/TestCopyFiles.java
Date Wed, 24 May 2006 17:55:08 GMT
Author: cutting
Date: Wed May 24 10:55:08 2006
New Revision: 409217

URL: http://svn.apache.org/viewvc?rev=409217&view=rev
Log:
HADOOP-241.  Fix problem raised by CopyFiles on Windows.  Contributed by Milind.

Modified:
    lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/FSNamesystem.java
    lucene/hadoop/trunk/src/test/org/apache/hadoop/fs/TestCopyFiles.java

Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/FSNamesystem.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/FSNamesystem.java?rev=409217&r1=409216&r2=409217&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/FSNamesystem.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/FSNamesystem.java Wed May 24 10:55:08
2006
@@ -183,6 +183,12 @@
           try {
             lmthread.join(3000);
           } catch (InterruptedException ie) {
+          } finally {
+              try {
+                dir.close();
+              } catch (IOException ex) {
+                  // do nothing
+              }
           }
         }
     }

Modified: lucene/hadoop/trunk/src/test/org/apache/hadoop/fs/TestCopyFiles.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/test/org/apache/hadoop/fs/TestCopyFiles.java?rev=409217&r1=409216&r2=409217&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/test/org/apache/hadoop/fs/TestCopyFiles.java (original)
+++ lucene/hadoop/trunk/src/test/org/apache/hadoop/fs/TestCopyFiles.java Wed May 24 10:55:08
2006
@@ -32,7 +32,8 @@
 public class TestCopyFiles extends TestCase {
   
   private static final int NFILES = 20;
-  private static String TEST_ROOT_DIR = System.getProperty("test.build.data","/tmp");
+  private static Path TEST_ROOT_DIR = new Path(
+          System.getProperty("test.build.data","/tmp"));
   
   /** class MyFile contains enough information to recreate the contents of
    * a single file.



Mime
View raw message