X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FDismissNotificationPage.java;h=24b6aaa369a941fbc0f6b52b0bd55fac40220874;hb=3da1daa6488c642430858a4baacc0aa986a6ebc1;hp=d5bb6eaf256f239cb1224d2d05ad8286b203311a;hpb=76ed638264e531a26e35647d13702db865a52321;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/DismissNotificationPage.java b/src/main/java/net/pterodactylus/sone/web/DismissNotificationPage.java
index d5bb6ea..24b6aaa 100644
--- a/src/main/java/net/pterodactylus/sone/web/DismissNotificationPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/DismissNotificationPage.java
@@ -22,6 +22,8 @@ import net.pterodactylus.util.notify.Notification;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
 
+import com.google.common.base.Optional;
+
 /**
  * Page that lets the user dismiss a notification.
  *
@@ -52,9 +54,9 @@ public class DismissNotificationPage extends SoneTemplatePage {
 	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
 		String notificationId = request.getHttpRequest().getPartAsStringFailsafe("notification", 36);
-		Notification notification = webInterface.getNotifications().getNotification(notificationId);
-		if ((notification != null) && notification.isDismissable()) {
-			notification.dismiss();
+		Optional<Notification> notification = webInterface.getNotification(notificationId);
+		if (notification.isPresent() && notification.get().isDismissable()) {
+			notification.get().dismiss();
 		}
 		String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
 		throw new RedirectException(returnPage);