Don’t throw exceptions when a single “return” would suffice.

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

diff --git a/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java b/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
index 2b25263..06afa8c 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
@@ -70,7 +70,7 @@ public class UploadImagePage extends SoneTemplatePage {
                        String parentId = request.getHttpRequest().getPartAsStringFailsafe("parent", 36);
                        Album parent = webInterface.getCore().getAlbum(parentId, false);
                        if (parent == null) {
-                               throw new RedirectException("invalid.html");
+                               return;
                        }
                        String name = request.getHttpRequest().getPartAsStringFailsafe("title", 200);
                        String description = request.getHttpRequest().getPartAsStringFailsafe("description", 4000);
@@ -82,7 +82,8 @@ public class UploadImagePage extends SoneTemplatePage {
                                imageInputStream = fileBucket.getInputStream();
                                Image uploadedImage = ImageIO.read(imageInputStream);
                                if (uploadedImage == null) {
-                                       throw new RedirectException("invalid.html");
+                                       templateContext.set("messages", webInterface.getL10n().getString("Page.UploadImage.Error.InvalidImage"));
+                                       return;
                                }
                                image = new net.pterodactylus.sone.data.Image().setSone(currentSone);
                                image.setTitle(name).setDescription(description).setWidth(uploadedImage.getWidth(null)).setHeight(uploadedImage.getHeight(null));
@@ -90,7 +91,7 @@ public class UploadImagePage extends SoneTemplatePage {
                                uploadedImage.flush();
                        } catch (IOException ioe1) {
                                logger.log(Level.WARNING, "Could not read uploaded image!", ioe1);
-                               throw new RedirectException("invalid.html");
+                               return;
                        } finally {
                                Closer.close(imageInputStream);
                                fileBucket.free();