Make Sone returned by a Sone provider optional.

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

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/DistrustAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/DistrustAjaxPage.java
index b86055d..843b088 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/ajax/DistrustAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/DistrustAjaxPage.java
@@ -17,6 +17,8 @@
 
 package net.pterodactylus.sone.web.ajax;
 
+import com.google.common.base.Optional;
+
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.web.WebInterface;
@@ -51,11 +53,11 @@ public class DistrustAjaxPage extends JsonPage {
                        return createErrorJsonObject("auth-required");
                }
                String soneId = request.getHttpRequest().getParam("sone");
-               Sone sone = webInterface.getCore().getSone(soneId);
-               if (sone == null) {
+               Optional<Sone> sone = webInterface.getCore().getSone(soneId);
+               if (!sone.isPresent()) {
                        return createErrorJsonObject("invalid-sone-id");
                }
-               webInterface.getCore().distrustSone(currentSone, sone);
+               webInterface.getCore().distrustSone(currentSone, sone.get());
                return createSuccessJsonObject().put("trustValue", webInterface.getCore().getPreferences().getNegativeTrust());
        }