X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=inline;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryDatabase.java;h=e311a5e957aa46af5766fd64d347e01164dd2832;hb=e80be3f00b1d486fd3995d8f29ce3bf04da7b61d;hp=a935b75efb209af7b527fb4e96f3dbf1c73f6473;hpb=16cadd4cd69c0c8cbbd6bfc41257c852e6590e40;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java b/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
index a935b75..e311a5e 100644
--- a/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
+++ b/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
@@ -33,8 +33,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
@@ -42,7 +40,6 @@ import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.PostReply;
-import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.data.impl.DefaultSoneBuilder;
 import net.pterodactylus.sone.database.Database;
@@ -221,7 +218,12 @@ public class MemoryDatabase extends AbstractService implements Database {
 			@Override
 			public Sone build(Optional<SoneCreated> soneCreated) throws IllegalStateException {
 				Sone sone = super.build(soneCreated);
-				sones.put(sone.getId(), sone);
+				lock.writeLock().lock();
+				try {
+					sones.put(sone.getId(), sone);
+				} finally {
+					lock.writeLock().unlock();
+				}
 				return sone;
 			}
 		};
@@ -534,7 +536,9 @@ public class MemoryDatabase extends AbstractService implements Database {
 		lock.writeLock().lock();
 		try {
 			allAlbums.put(album.getId(), album);
-			albumChildren.put(album.getParent().getId(), album.getId());
+			if (!album.isRoot()) {
+				albumChildren.put(album.getParent().getId(), album.getId());
+			}
 		} finally {
 			lock.writeLock().unlock();
 		}