X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=ea4fef78a280e9ea667b291ace282218520d6093;hb=8b00671178fda30725538696e60ca9674d259fa0;hp=0043feb8050df91a65527827801263d86e8e8c48;hpb=f720183b01cc2f677358986cd165a0fd26a45a43;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 0043feb..ea4fef7 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -509,17 +509,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	 *
 	 * @param id
 	 *            The ID of the remote Sone to get
-	 * @return The Sone with the given ID
-	 */
-	public Sone getRemoteSone(String id) {
-		return getRemoteSone(id, true);
-	}
-
-	/**
-	 * Returns the remote Sone with the given ID.
-	 *
-	 * @param id
-	 *            The ID of the remote Sone to get
 	 * @param create
 	 *            {@code true} to always create a Sone, {@code false} to return
 	 *            {@code null} if no Sone with the given ID exists
@@ -528,7 +517,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	public Sone getRemoteSone(String id, boolean create) {
 		synchronized (remoteSones) {
 			Sone sone = remoteSones.get(id);
-			if ((sone == null) && create) {
+			if ((sone == null) && create && (id != null) && (id.length() == 43)) {
 				sone = new Sone(id);
 				remoteSones.put(id, sone);
 				setSoneStatus(sone, SoneStatus.unknown);
@@ -1050,7 +1039,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			return null;
 		}
 		synchronized (remoteSones) {
-			final Sone sone = getRemoteSone(identity.getId()).setIdentity(identity);
+			final Sone sone = getRemoteSone(identity.getId(), true).setIdentity(identity);
 			boolean newSone = sone.getRequestUri() == null;
 			sone.setRequestUri(getSoneUri(identity.getRequestUri()));
 			sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), (long) 0));
@@ -1070,7 +1059,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 					}
 				}
 			}
-			remoteSones.put(identity.getId(), sone);
 			soneDownloader.addSone(sone);
 			setSoneStatus(sone, SoneStatus.unknown);
 			soneDownloaders.execute(new Runnable() {
@@ -2565,7 +2553,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			@Override
 			@SuppressWarnings("synthetic-access")
 			public void run() {
-				Sone sone = getRemoteSone(identity.getId());
+				Sone sone = getRemoteSone(identity.getId(), false);
 				sone.setIdentity(identity);
 				sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), sone.getLatestEdition()));
 				soneDownloader.addSone(sone);