X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FUploadImagePage.java;h=7621a6d15d6fa320ff86d2d24688699c9c78fd93;hp=30a58906fc49c2eaa5dcdfde079153b4b554dcf0;hb=419098bcd6215125408b29e60bd888e60979d37b;hpb=32998f6979928e57b9b7a4eac4dabe668a821471

diff --git a/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java b/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
index 30a5890..7621a6d 100644
--- a/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - UploadImagePage.java - Copyright © 2011–2013 David Roden
+ * Sone - UploadImagePage.java - Copyright © 2011–2015 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
@@ -17,6 +17,7 @@
 
 package net.pterodactylus.sone.web;
 
+import static com.google.common.base.Optional.fromNullable;
 import static java.util.logging.Logger.getLogger;
 
 import java.awt.Image;
@@ -55,8 +56,8 @@ import freenet.support.api.HTTPUploadedFile;
  */
 public class UploadImagePage extends SoneTemplatePage {
 
-	/** The logger. */
 	private static final Logger logger = getLogger(UploadImagePage.class.getName());
+	private static final String UNKNOWN_MIME_TYPE = "application/octet-stream";
 
 	/**
 	 * Creates a new “upload image” page.
@@ -154,12 +155,13 @@ public class UploadImagePage extends SoneTemplatePage {
 			ImageInputStream imageInputStream = ImageIO.createImageInputStream(imageDataInputStream);
 			Iterator<ImageReader> imageReaders = ImageIO.getImageReaders(imageInputStream);
 			if (imageReaders.hasNext()) {
-				return imageReaders.next().getOriginatingProvider().getMIMETypes()[0];
+				return fromNullable(imageReaders.next().getOriginatingProvider().getMIMETypes())
+						.or(new String[] { UNKNOWN_MIME_TYPE })[0];
 			}
 		} catch (IOException ioe1) {
 			logger.log(Level.FINE, "Could not detect MIME type for image.", ioe1);
 		}
-		return "application/octet-stream";
+		return UNKNOWN_MIME_TYPE;
 	}
 
 }