Download remote Sones first thing after adding them.

[Sone.git] / src / main / java / net / pterodactylus / sone / core / Core.java

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index e4814fe..d63b938 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -454,15 +454,7 @@ public class Core implements IdentityListener {
                        soneInserters.put(sone, soneInserter);
                        soneInserter.start();
                        setSoneStatus(sone, SoneStatus.idle);
-                       new Thread(new Runnable() {
-
-                               @Override
-                               @SuppressWarnings("synthetic-access")
-                               public void run() {
-                                       soneDownloader.fetchSone(sone);
-                               }
-
-                       }, "Sone Downloader").start();
+                       loadSone(sone);
                        return sone;
                }
        }
@@ -497,14 +489,23 @@ public class Core implements IdentityListener {
                        return null;
                }
                synchronized (remoteSones) {
+                       final Sone sone = getRemoteSone(identity.getId()).setIdentity(identity);
                        if (remoteSones.containsKey(identity.getId())) {
                                logger.log(Level.FINE, "Identity already exists: %s", identity);
                                return remoteSones.get(identity.getId());
                        }
-                       Sone sone = new Sone(identity);
                        sone.setRequestUri(getSoneUri(identity.getRequestUri(), identity.getProperty("Sone.LatestEdition")));
                        remoteSones.put(identity.getId(), sone);
                        soneDownloader.addSone(sone);
+                       new Thread(new Runnable() {
+
+                               @Override
+                               @SuppressWarnings("synthetic-access")
+                               public void run() {
+                                       soneDownloader.fetchSone(sone);
+                               }
+
+                       }, "Sone Downloader").start();
                        setSoneStatus(sone, SoneStatus.idle);
                        return sone;
                }