From 47706da0700960ccc059436ae9f207a71a156fe8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Thu, 17 Nov 2016 07:27:21 +0100 Subject: [PATCH] Use try-with-resources --- .../java/net/pterodactylus/sone/web/ReloadingPage.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/main/java/net/pterodactylus/sone/web/ReloadingPage.java b/src/main/java/net/pterodactylus/sone/web/ReloadingPage.java index f89bbed..bc18816 100644 --- a/src/main/java/net/pterodactylus/sone/web/ReloadingPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ReloadingPage.java @@ -24,7 +24,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import net.pterodactylus.util.io.Closer; import net.pterodactylus.util.io.StreamCopier; import net.pterodactylus.util.web.Page; import net.pterodactylus.util.web.Request; @@ -73,19 +72,12 @@ public class ReloadingPage implements Page { String path = request.getUri().getPath(); int lastSlash = path.lastIndexOf('/'); String filename = path.substring(lastSlash + 1); - InputStream fileInputStream; - try { - fileInputStream = new FileInputStream(new File(filesystemPath, filename)); + try (InputStream fileInputStream = new FileInputStream(new File(filesystemPath, filename)); + OutputStream contentOutputStream = response.getContent()) { + StreamCopier.copy(fileInputStream, contentOutputStream); } catch (FileNotFoundException fnfe1) { return response.setStatusCode(404).setStatusText("Not found."); } - OutputStream contentOutputStream = response.getContent(); - try { - StreamCopier.copy(fileInputStream, contentOutputStream); - } finally { - Closer.close(fileInputStream); - Closer.close(contentOutputStream); - } return response.setStatusCode(200).setStatusText("OK").setContentType(mimeType); } } -- 2.7.4