summaryrefslogtreecommitdiffstats
path: root/filedistribution
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2023-01-13 11:24:51 +0100
committerHarald Musum <musum@yahooinc.com>2023-01-13 11:24:51 +0100
commit1557b74d966fee5c6c5e931e300f0c993b0ccf0e (patch)
tree55c1be8f21949990701efb16fbad391da69544f1 /filedistribution
parent77e6ef8c0bd9a8e407cdd7d269f9dda187b576d3 (diff)
Go back to previous way of creating new streams
Diffstat (limited to 'filedistribution')
-rw-r--r--filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceCompressor.java21
1 files changed, 8 insertions, 13 deletions
diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceCompressor.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceCompressor.java
index 80ed682025b..8d6f9ea1af3 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceCompressor.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceCompressor.java
@@ -119,40 +119,35 @@ public class FileReferenceCompressor {
}
private OutputStream compressedOutputStream(File outputFile) throws IOException {
- FileOutputStream out = new FileOutputStream(outputFile);
switch (type) {
case compressed:
log.log(Level.FINE, () -> "Compressing with compression type " + compressionType);
return switch (compressionType) {
- case gzip -> new GZIPOutputStream(out);
- case lz4 -> new LZ4BlockOutputStream(out);
- case zstd -> new ZstdOutputStream(out);
+ case gzip -> new GZIPOutputStream(new FileOutputStream(outputFile));
+ case lz4 -> new LZ4BlockOutputStream(new FileOutputStream(outputFile));
+ case zstd -> new ZstdOutputStream(new FileOutputStream(outputFile));
};
case file:
- return out;
+ return new FileOutputStream(outputFile);
default:
- out.close();
throw new RuntimeException("Unknown file reference type " + type);
}
}
private InputStream decompressedInputStream(File inputFile) throws IOException {
- FileInputStream in = new FileInputStream(inputFile);
switch (type) {
case compressed:
log.log(Level.FINE, () -> "Decompressing with compression type " + compressionType);
return switch (compressionType) {
- case gzip -> new GZIPInputStream(in);
- case lz4 -> new LZ4BlockInputStream(in);
- case zstd -> new ZstdInputStream(in);
+ case gzip -> new GZIPInputStream(new FileInputStream(inputFile));
+ case lz4 -> new LZ4BlockInputStream(new FileInputStream(inputFile));
+ case zstd -> new ZstdInputStream(new FileInputStream(inputFile));
};
case file:
- return in;
+ return new FileInputStream(inputFile);
default:
- in.close();
throw new RuntimeException("Unknown file reference type " + type);
}
}
}
-