X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFileParse.java;h=2dec5592664b9889095ed0d9f4618696cc1524d1;hb=5a352aa2f3330ae269d9b70c4a7374c2518bfb2e;hp=d986dc5c3979394a6e4e067e4d99643918cfc4f1;hpb=b15eb801bc371fb2b7e147aa4ca90cbfb19899cf;p=jalview.git diff --git a/src/jalview/io/FileParse.java b/src/jalview/io/FileParse.java index d986dc5..2dec559 100755 --- a/src/jalview/io/FileParse.java +++ b/src/jalview/io/FileParse.java @@ -41,7 +41,7 @@ import jalview.api.AlignExportSettingsI; import jalview.api.AlignViewportI; import jalview.api.AlignmentViewPanel; import jalview.api.FeatureSettingsModelI; -import jalview.bin.Cache; +import jalview.bin.Console; import jalview.util.MessageManager; import jalview.util.Platform; @@ -225,24 +225,23 @@ public class FileParse { if (!input.markSupported()) { - Cache.log.error( + Console.error( "FileParse.izGzipStream: input stream must support mark/reset"); return false; } input.mark(4); - byte[] bytes = new byte[2]; // input.readNBytes(2); + + // get first 2 bytes or return false + byte[] bytes = new byte[2]; int read = input.read(bytes); input.reset(); if (read != bytes.length) { return false; } - if (bytes.length == 2) - { - int header = (bytes[0] & 0xff) | ((bytes[1] << 8) & 0xff00); - return (GZIPInputStream.GZIP_MAGIC == header); - } - return false; + + int header = (bytes[0] & 0xff) | ((bytes[1] << 8) & 0xff00); + return (GZIPInputStream.GZIP_MAGIC == header); } /**