X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FIdentifyFile.java;h=82916f9b2c6628e16c9b2e350cb745d76b9d66b5;hb=2860a1bcd936fe7bcd89fbeee6ccbcfc0f71c0b5;hp=a5e7fbc32a757fc1b6b311aab54d20cba50bf935;hpb=3f0b6b0db9b146f9d89bb40908546a2efaaf4fe9;p=jalview.git

diff --git a/src/jalview/io/IdentifyFile.java b/src/jalview/io/IdentifyFile.java
index a5e7fbc..82916f9 100755
--- a/src/jalview/io/IdentifyFile.java
+++ b/src/jalview/io/IdentifyFile.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
- * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Copyright (C) 2015 The Jalview Authors
  *
  * This file is part of Jalview.
  *
@@ -260,6 +260,10 @@ public class IdentifyFile
           {
             break;
           }
+          if (data == null)
+          {
+            break;
+          }
         }
 
         if (data.indexOf("{\"") > -1)
@@ -306,19 +310,18 @@ public class IdentifyFile
           break;
         }
 
-
         /*
          * // TODO comment out SimpleBLAST identification for Jalview 2.4.1 else
          * if (!lineswereskipped && data.indexOf("BLAST")<4) { reply =
          * "SimpleBLAST"; break;
-         *
+         * 
          * } // end comments for Jalview 2.4.1
          */
         else if (!lineswereskipped && data.charAt(0) != '*'
                 && data.charAt(0) != ' '
                 && data.indexOf(":") < data.indexOf(",")) // &&
-          // data.indexOf(",")<data.indexOf(",",
-          // data.indexOf(",")))
+        // data.indexOf(",")<data.indexOf(",",
+        // data.indexOf(",")))
         {
           // file looks like a concise JNet file
           reply = "JnetFile";
@@ -344,7 +347,7 @@ public class IdentifyFile
     if (length == 0)
     {
       System.err
-      .println("File Identification failed! - Empty file was read.");
+              .println("File Identification failed! - Empty file was read.");
       return "EMPTY DATA FILE";
     }
     return reply;