use try-with-resources to ensure streams are closed

2 files changed, 6 insertions, 10 deletions

diff --git a/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java
index 3912a3be853..fb21626cc41 100644
--- a/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java
+++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java
@@ -261,18 +261,16 @@ public class LogFileHandler extends StreamHandler {
 
     private void runCompression(File oldFile) {
         File gzippedFile = new File(oldFile.getPath() + ".gz");
-        try {
-            GZIPOutputStream compressor = new GZIPOutputStream(new FileOutputStream(gzippedFile), 0x100000);
-            FileInputStream inputStream = new FileInputStream(oldFile);
+        try (GZIPOutputStream compressor = new GZIPOutputStream(new FileOutputStream(gzippedFile), 0x100000);
+             FileInputStream inputStream = new FileInputStream(oldFile))
+        {
             byte [] buffer = new byte[0x100000];
 
             for (int read = inputStream.read(buffer); read > 0; read = inputStream.read(buffer)) {
                 compressor.write(buffer, 0, read);
             }
-            inputStream.close();
             compressor.finish();
             compressor.flush();
-            compressor.close();
 
             NativeIO nativeIO = new NativeIO();
             nativeIO.dropFileFromCache(oldFile); // Drop from cache in case somebody else has a reference to it preventing from dying quickly.
diff --git a/logserver/src/main/java/com/yahoo/logserver/handlers/archive/FilesArchived.java b/logserver/src/main/java/com/yahoo/logserver/handlers/archive/FilesArchived.java
index fa716921be5..ff082f7efba 100644
--- a/logserver/src/main/java/com/yahoo/logserver/handlers/archive/FilesArchived.java
+++ b/logserver/src/main/java/com/yahoo/logserver/handlers/archive/FilesArchived.java
@@ -113,19 +113,17 @@ public class FilesArchived {
 
     private void compress(File oldFile) {
         File gzippedFile = new File(oldFile.getPath() + ".gz");
-        try {
+        try (GZIPOutputStream compressor = new GZIPOutputStream(new FileOutputStream(gzippedFile), 0x100000);
+             FileInputStream inputStream = new FileInputStream(oldFile))
+        {
             long mtime = oldFile.lastModified();
-            GZIPOutputStream compressor = new GZIPOutputStream(new FileOutputStream(gzippedFile), 0x100000);
-            FileInputStream inputStream = new FileInputStream(oldFile);
             byte [] buffer = new byte[0x100000];
 
             for (int read = inputStream.read(buffer); read > 0; read = inputStream.read(buffer)) {
                 compressor.write(buffer, 0, read);
             }
-            inputStream.close();
             compressor.finish();
             compressor.flush();
-            compressor.close();
             oldFile.delete();
             gzippedFile.setLastModified(mtime);
             log.info("Compressed: "+gzippedFile);