svn commit: r1356954 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java

[jm...@apache.org]

Author: jmhsieh
Date: Tue Jul  3 21:22:55 2012
New Revision: 1356954

URL: http://svn.apache.org/viewvc?rev=1356954&view=rev
Log:
HBASE-6306 TestFSUtils fails against hadoop 2.0

Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java?rev=1356954&r1=1356953&r2=1356954&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java Tue Jul  3 21:22:55 2012
@@ -267,7 +267,14 @@ public abstract class FSUtils {
   public static String getVersion(FileSystem fs, Path rootdir)
   throws IOException, DeserializationException {
     Path versionFile = new Path(rootdir, HConstants.VERSION_FILE_NAME);
-    FileStatus [] status = fs.listStatus(versionFile);
+    FileStatus[] status = null;
+    try {
+      // hadoop 2.0 throws FNFE if directory does not exist.  
+      // hadoop 1.0 returns null if directory does not exist.
+      status = fs.listStatus(versionFile);
+    } catch (FileNotFoundException fnfe) {
+      return null;
+    }
     if (status == null || status.length == 0) return null;
     String version = null;
     byte [] content = new byte [(int)status[0].getLen()];