1 files changed, 3 insertions, 6 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/handler/LogReader.java b/container-core/src/main/java/com/yahoo/container/handler/LogReader.java
index 95a0e9a6766..663741f9bef 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/LogReader.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/LogReader.java
@@ -57,13 +57,10 @@ class LogReader {
     void writeLogs(OutputStream outputStream, Instant earliestLogThreshold, Instant latestLogThreshold) {
         try {
             for (Path file : getMatchingFiles(earliestLogThreshold, latestLogThreshold)) {
-                if (file.toString().endsWith(".gz")) {
-                    Files.copy(file, outputStream);
-                } else {
-                    OutputStream zip = new GZIPOutputStream(outputStream);
-                    Files.copy(file, zip);
-                    zip.close();
+                if (!file.toString().endsWith(".gz") && !(outputStream instanceof GZIPOutputStream)) {
+                    outputStream = new GZIPOutputStream(outputStream);
                 }
+                Files.copy(file, outputStream);
             }
             outputStream.close();
         } catch (IOException e) {