diff options
Diffstat (limited to 'filedistribution')
| -rw-r--r-- | filedistribution/src/main/java/com/yahoo/vespa/filedistribution/CompressedFileReference.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/CompressedFileReference.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/CompressedFileReference.java index c4cd2a073c1..a1ad5c8a200 100644 --- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/CompressedFileReference.java +++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/CompressedFileReference.java @@ -64,9 +64,11 @@ public class CompressedFileReference { static void decompress(File inputFile, File outputDir) throws IOException { log.log(LogLevel.DEBUG, () -> "Decompressing '" + inputFile + "' into '" + outputDir + "'"); - ArchiveInputStream ais = new TarArchiveInputStream(new GZIPInputStream(new FileInputStream(inputFile))); - decompress(ais, outputDir); - ais.close(); + try (ArchiveInputStream ais = new TarArchiveInputStream(new GZIPInputStream(new FileInputStream(inputFile)))) { + decompress(ais, outputDir); + } catch (IllegalArgumentException e) { + throw new RuntimeException("Unable to decompress '" + inputFile.getAbsolutePath() + "': " + e.getMessage()); + } } private static void decompress(ArchiveInputStream archiveInputStream, File outputFile) throws IOException { @@ -95,7 +97,8 @@ public class CompressedFileReference { entries++; } if (entries == 0) { - log.log(LogLevel.WARNING, "Not able to read any entries from " + outputFile.getName()); + throw new IllegalArgumentException("Not able to read any entries from stream (" + + archiveInputStream.getBytesRead() + " bytes read from stream)"); } } |