Return empty posts for not-yet loaded bookmarks.

[Sone.git] / src / main / java / net / pterodactylus / sone / database / memory / MemoryBookmarkDatabase.java

diff --git a/src/main/java/net/pterodactylus/sone/database/memory/MemoryBookmarkDatabase.java b/src/main/java/net/pterodactylus/sone/database/memory/MemoryBookmarkDatabase.java
index 38c5bd0..594cf2b 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/database/memory/MemoryBookmarkDatabase.java
+++ b/src/main/java/net/pterodactylus/sone/database/memory/MemoryBookmarkDatabase.java
@@ -8,6 +8,7 @@ import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.Post.EmptyPost;
 import net.pterodactylus.sone.database.BookmarkDatabase;
 
 import com.google.common.base.Function;
@@ -94,11 +95,12 @@ public class MemoryBookmarkDatabase implements BookmarkDatabase {
        public Set<Post> getBookmarkedPosts() {
                lock.readLock().lock();
                try {
-                       return from(bookmarkedPosts).transformAndConcat(
-                                       new Function<String, Iterable<Post>>() {
+                       return from(bookmarkedPosts).transform(
+                                       new Function<String, Post>() {
                                                @Override
-                                               public Iterable<Post> apply(String postId) {
-                                                       return memoryDatabase.getPost(postId).asSet();
+                                               public Post apply(String postId) {
+                                                       return memoryDatabase.getPost(postId)
+                                                                       .or(new EmptyPost(postId));
                                                }
                                        }).toSet();
                } finally {