Merge branch 'release-0.9.6'

[Sone.git] / src / main / java / net / pterodactylus / sone / web / ReloadingPage.java

diff --git a/src/main/java/net/pterodactylus/sone/web/ReloadingPage.java b/src/main/java/net/pterodactylus/sone/web/ReloadingPage.java
index 0c8f516..f89bbed 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/ReloadingPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ReloadingPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - ReloadingPage.java - Copyright © 2010–2015 David Roden
+ * Sone - ReloadingPage.java - Copyright © 2010–2016 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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();