X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FUnlockSonePage.java;h=a2be6184ecc8f6526a23dd4124ccc1a46e338a25;hb=f10d40f746f6c7c716f783da11791d28c1117447;hp=f52755854bf9fabd8e80a7a4360086b6d217d0a1;hpb=45f92ec63dbf8134d92ceed67294faa38117b195;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/UnlockSonePage.java b/src/main/java/net/pterodactylus/sone/web/UnlockSonePage.java
index f527558..a2be618 100644
--- a/src/main/java/net/pterodactylus/sone/web/UnlockSonePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/UnlockSonePage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - UnlockSonePage.java - Copyright © 2010 David Roden
+ * Sone - UnlockSonePage.java - Copyright © 2010–2013 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
@@ -22,6 +22,8 @@ import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
 
+import com.google.common.base.Optional;
+
 /**
  * This page lets the user unlock a {@link Sone} to allow its insertion.
  *
@@ -45,16 +47,13 @@ public class UnlockSonePage extends SoneTemplatePage {
 	// TEMPLATEPAGE METHODS
 	//
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
 		String soneId = request.getHttpRequest().getPartAsStringFailsafe("sone", 44);
-		Sone sone = webInterface.getCore().getLocalSone(soneId, false);
-		if (sone != null) {
-			webInterface.getCore().unlockSone(sone);
+		Optional<Sone> sone = webInterface.getCore().getLocalSone(soneId);
+		if (sone.isPresent()) {
+			webInterface.getCore().unlockSone(sone.get());
 		}
 		String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
 		throw new RedirectException(returnPage);