From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Thu, 9 Jun 2016 05:20:54 +0000 (+0200)
Subject: Handle missing files correctly
X-Git-Tag: 0.9.5^2~30
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=c438f6411488a8ebe795fd67c52456cb7e9e972a;p=Sone.git

Handle missing files correctly
---

diff --git a/src/main/java/net/pterodactylus/sone/web/ReloadingPage.java b/src/main/java/net/pterodactylus/sone/web/ReloadingPage.java
index 0c8f516..58c2d44 100644
--- a/src/main/java/net/pterodactylus/sone/web/ReloadingPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ReloadingPage.java
@@ -19,6 +19,7 @@ package net.pterodactylus.sone.web;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -72,8 +73,10 @@ 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 = new FileInputStream(new File(filesystemPath, filename));
-		if (fileInputStream == null) {
+		InputStream fileInputStream;
+		try {
+			fileInputStream = new FileInputStream(new File(filesystemPath, filename));
+		} catch (FileNotFoundException fnfe1) {
 			return response.setStatusCode(404).setStatusText("Not found.");
 		}
 		OutputStream contentOutputStream = response.getContent();