X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=6cd61355c625d57736003caaf6afde0512d54ac7;hp=28ef2d76cb4e6c5f83edb538b402db5fa653752e;hb=d0104f792aec1befd7c18bb46c174682dc416322;hpb=08fbb88535d0804680dff1e51f8754b0e1e9669f

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 28ef2d7..6cd6135 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -200,12 +200,10 @@ public class Core implements IdentityListener {
 	 *         Sone
 	 */
 	public Sone getSone(String id) {
-		Sone sone = getRemoteSone(id);
-		if (sone != null) {
-			return sone;
+		if (isLocalSone(id)) {
+			return getLocalSone(id);
 		}
-		sone = getLocalSone(id);
-		return sone;
+		return getRemoteSone(id);
 	}
 
 	/**
@@ -222,6 +220,20 @@ public class Core implements IdentityListener {
 	}
 
 	/**
+	 * Returns whether the given ID is the ID of a local Sone.
+	 *
+	 * @param id
+	 *            The Sone ID to check for its locality
+	 * @return {@code true} if the given ID is a local Sone, {@code false}
+	 *         otherwise
+	 */
+	public boolean isLocalSone(String id) {
+		synchronized (localSones) {
+			return localSones.containsKey(id);
+		}
+	}
+
+	/**
 	 * Returns all local Sones.
 	 *
 	 * @return All local Sones
@@ -237,11 +249,16 @@ public class Core implements IdentityListener {
 	 *
 	 * @param id
 	 *            The ID of the Sone to get
-	 * @return The Sone, or {@code null} if there is no Sone with the given ID
+	 * @return The Sone with the given ID
 	 */
 	public Sone getLocalSone(String id) {
 		synchronized (localSones) {
-			return localSones.get(id);
+			Sone sone = localSones.get(id);
+			if (sone == null) {
+				sone = new Sone(id);
+				localSones.put(id, sone);
+			}
+			return sone;
 		}
 	}
 
@@ -261,11 +278,16 @@ public class Core implements IdentityListener {
 	 *
 	 * @param id
 	 *            The ID of the remote Sone to get
-	 * @return The Sone, or {@code null} if there is no such Sone
+	 * @return The Sone with the given ID
 	 */
 	public Sone getRemoteSone(String id) {
 		synchronized (remoteSones) {
-			return remoteSones.get(id);
+			Sone sone = remoteSones.get(id);
+			if (sone == null) {
+				sone = new Sone(id);
+				remoteSones.put(id, sone);
+			}
+			return sone;
 		}
 	}
 
@@ -310,7 +332,12 @@ public class Core implements IdentityListener {
 	 */
 	public Reply getReply(String replyId) {
 		synchronized (replies) {
-			return replies.get(replyId);
+			Reply reply = replies.get(replyId);
+			if (reply == null) {
+				reply = new Reply(replyId);
+				replies.put(replyId, reply);
+			}
+			return reply;
 		}
 	}
 
@@ -415,7 +442,7 @@ public class Core implements IdentityListener {
 			}
 			final Sone sone;
 			try {
-				sone = new Sone(ownIdentity).setInsertUri(new FreenetURI(ownIdentity.getInsertUri())).setRequestUri(new FreenetURI(ownIdentity.getRequestUri()));
+				sone = getLocalSone(ownIdentity.getId()).setIdentity(ownIdentity).setInsertUri(new FreenetURI(ownIdentity.getInsertUri())).setRequestUri(new FreenetURI(ownIdentity.getRequestUri()));
 				sone.setLatestEdition(Numbers.safeParseLong(ownIdentity.getProperty("Sone.LatestEdition"), (long) 0));
 			} catch (MalformedURLException mue1) {
 				logger.log(Level.SEVERE, "Could not convert the Identity’s URIs to Freenet URIs: " + ownIdentity.getInsertUri() + ", " + ownIdentity.getRequestUri(), mue1);