Changeset 1450

Timestamp:

Nov 3, 2011, 8:52:08 AM (12 years ago)

Author:

Nicklas Nordborg

Message:

References #304: Implement HDFS external file support

Fixed a NullPointerException? when file doesn't exists on the hdfs file system. Now throws a FileNotFoundException? instead.

File:

• extensions/net.sf.basedb.hdfs/trunk/src/net/sf/basedb/hdfs/HdfsConnectionManager.java (modified) (3 diffs)

extensions/net.sf.basedb.hdfs/trunk/src/net/sf/basedb/hdfs/HdfsConnectionManager.java

@@ -22 +22 @@
 package net.sf.basedb.hdfs;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -82 +83 @@
       if (port == -1) port = 9000;
       client = createClient(uri, parameters);
-      stream = new CloseResourceInputStream(client.open(uri.getPath()), client);
+      InputStream tmp = client.open(uri.getPath());
+      if (tmp == null)
+      {
+        throw new FileNotFoundException(uri.toString());
+      }
+      stream = new CloseResourceInputStream(tmp, client);
     }
     finally
@@ -103 +109 @@
       {
         client = createClient(uri, parameters);
-        metadata = createMetadata(uri, client.getFileInfo(uri.getPath()));
+        HdfsFileStatus status = client.getFileInfo(uri.getPath());
+        if (status == null)
+        {
+          throw new FileNotFoundException(uri.toString());
+        }
+        metadata = createMetadata(uri, status);
       }
       finally