X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=86940c357d827d7d158f9d61134bd42637218129;hb=16c7363bb5593a2c6b495176d1abaa5db8c6f8e0;hp=90d3696fd7f47aa1efd34fca130bd820a6d2d791;hpb=ba4d63c0da5bc1326073ccab87bff409291be571;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 90d3696..86940c3 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -301,9 +301,23 @@ public class Core implements IdentityListener {
 	 * @return The Sone with the given ID
 	 */
 	public Sone getLocalSone(String id) {
+		return getLocalSone(id, true);
+	}
+
+	/**
+	 * Returns the local Sone with the given ID, optionally creating a new Sone.
+	 *
+	 * @param id
+	 *            The ID of the Sone
+	 * @param create
+	 *            {@code true} to create a new Sone if none exists,
+	 *            {@code false} to return null if none exists
+	 * @return The Sone with the given ID, or {@code null}
+	 */
+	public Sone getLocalSone(String id, boolean create) {
 		synchronized (localSones) {
 			Sone sone = localSones.get(id);
-			if (sone == null) {
+			if ((sone == null) && create) {
 				sone = new Sone(id);
 				localSones.put(id, sone);
 			}
@@ -578,11 +592,11 @@ public class Core implements IdentityListener {
 			final Sone sone;
 			try {
 				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);
 				return null;
 			}
+			sone.setLatestEdition(Numbers.safeParseLong(ownIdentity.getProperty("Sone.LatestEdition"), (long) 0));
 			/* TODO - load posts ’n stuff */
 			localSones.put(ownIdentity.getId(), sone);
 			SoneInserter soneInserter = new SoneInserter(this, freenetInterface, sone);