Only load remote Sones after loading configuration.
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 16 Oct 2010 16:02:10 +0000 (18:02 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 16 Oct 2010 16:02:10 +0000 (18:02 +0200)
src/main/java/net/pterodactylus/sone/core/Core.java

index d098456..6ecd5fc 100644 (file)
@@ -536,7 +536,6 @@ public class Core extends AbstractService {
                                        String friendKey = configuration.getStringValue(friendPrefix + "/Key").getValue(null);
                                        String friendName = configuration.getStringValue(friendPrefix + "/Name").getValue(null);
                                        friendSone.setRequestUri(new FreenetURI(friendKey)).setName(friendName);
-                                       loadSone(friendKey);
                                        sone.addFriend(friendSone);
                                }
 
@@ -548,6 +547,11 @@ public class Core extends AbstractService {
                } while (true);
                logger.log(Level.INFO, "Loaded %d Sones.", getSones().size());
 
+               /* load all remote Sones. */
+               for (Sone remoteSone : getRemoteSones()) {
+                       loadSone(remoteSone);
+               }
+
                logger.exiting(Core.class.getName(), "loadConfiguration()");
        }