From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Thu, 17 Nov 2016 06:27:21 +0000 (+0100)
Subject: Use try-with-resources
X-Git-Tag: 0.9.7^2~432
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=47706da0700960ccc059436ae9f207a71a156fe8

Use try-with-resources
---

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<REQ extends Request> implements Page<REQ> {
 		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);
 	}
 }