X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=7d4441b7b5e21257fe5ace88c3f39e308b4a4b15;hb=f46b38dcf269fb32f3e4a3d1020f8409406a111a;hp=f056c0ecfee15588965056e76d7ff28b93be8aaa;hpb=3b751d0c053450961bb66d2507d6187ce56f8785;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index f056c0e..7d4441b 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -88,6 +88,7 @@ import net.pterodactylus.util.service.AbstractService;
 import net.pterodactylus.util.thread.NamedThreadFactory;
 
 import com.google.common.base.Function;
+import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Collections2;
@@ -540,9 +541,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 * {@inheritDoc}
 	 */
 	@Override
-	public Post getPost(String postId) {
+	public Optional<Post> getPost(String postId) {
 		synchronized (posts) {
-			return posts.get(postId);
+			return Optional.fromNullable(posts.get(postId));
 		}
 	}
 
@@ -580,9 +581,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 * {@inheritDoc}
 	 */
 	@Override
-	public PostReply getPostReply(String replyId) {
+	public Optional<PostReply> getPostReply(String replyId) {
 		synchronized (replies) {
-			return replies.get(replyId);
+			return Optional.fromNullable(replies.get(replyId));
 		}
 	}
 
@@ -675,9 +676,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		Set<Post> posts = new HashSet<Post>();
 		synchronized (bookmarkedPosts) {
 			for (String bookmarkedPostId : bookmarkedPosts) {
-				Post post = getPost(bookmarkedPostId);
-				if (post != null) {
-					posts.add(post);
+				Optional<Post> post = getPost(bookmarkedPostId);
+				if (!post.isPresent()) {
+					posts.add(post.get());
 				}
 			}
 		}
@@ -1941,6 +1942,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		webOfTrustUpdater.stop();
 		updateChecker.stop();
 		soneDownloader.stop();
+		soneDownloaders.shutdown();
 		identityManager.stop();
 	}
 
@@ -2007,7 +2009,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			for (PostReply reply : sone.getReplies()) {
 				String replyPrefix = sonePrefix + "/Replies/" + replyCounter++;
 				configuration.getStringValue(replyPrefix + "/ID").setValue(reply.getId());
-				configuration.getStringValue(replyPrefix + "/Post/ID").setValue(reply.getPost().getId());
+				configuration.getStringValue(replyPrefix + "/Post/ID").setValue(reply.getPostId());
 				configuration.getLongValue(replyPrefix + "/Time").setValue(reply.getTime());
 				configuration.getStringValue(replyPrefix + "/Text").setValue(reply.getText());
 			}