Make sure GZIPOutputStream is properly closed, but without closing channel

1 files changed, 7 insertions, 12 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 e3fef4e0e44..ff1a7313540 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
@@ -82,10 +82,13 @@ class LogReader {
                     else
                         inProxy = in;
 
-                    // At the point when logs switch to un-zipped, replace the output stream with a zipping proxy.
-                    if ( ! zipped && ! (outputStream instanceof GZIPOutputStream))
-                        outputStream = new GZIPOutputStream(outputStream);
-
+                    if ( ! zipped) {
+                        ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+                        try (OutputStream outProxy = new GZIPOutputStream(buffer)) {
+                            inProxy.transferTo(outProxy);
+                        }
+                        inProxy = new ByteArrayInputStream(buffer.toByteArray());
+                    }
                     inProxy.transferTo(outputStream);
                 }
             }
@@ -93,14 +96,6 @@ class LogReader {
         catch (IOException e) {
             throw new UncheckedIOException(e);
         }
-        finally {
-            try {
-                outputStream.close();
-            }
-            catch (IOException e) {
-                throw new UncheckedIOException(e);
-            }
-        }
     }
 
     /** Returns log files which may have relevant entries, sorted by modification time — the first and last must be filtered. */