X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=77b80cf960e0a4607c4729b220592584ab0f0973;hb=26dde3e5a082d8207be25717098a4ec53811b3cc;hp=f56c1cec2dffdf77e6b7c71e9c2996f7d8454d91;hpb=ca0d9d2f705bc8304f4bcd1fea1f38dec3f661e9;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 f56c1ce..77b80cf 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -87,6 +87,15 @@ public class Core extends AbstractService {
 		return this;
 	}
 
+	/**
+	 * Returns the local Sones.
+	 *
+	 * @return The local Sones
+	 */
+	public Set<Sone> localSones() {
+		return localSones;
+	}
+
 	//
 	// ACTIONS
 	//
@@ -114,7 +123,10 @@ public class Core extends AbstractService {
 		logger.entering(Core.class.getName(), "loadConfiguration()");
 
 		/* get names of all local Sones. */
-		String allSoneNamesString = configuration.getStringValue("Sone/Names").getValue("");
+		String allSoneNamesString = configuration.getStringValue("Sone/Names").getValue(null);
+		if (allSoneNamesString == null) {
+			allSoneNamesString = "";
+		}
 		List<String> allSoneNames;
 		try {
 			allSoneNames = StringEscaper.parseLine(allSoneNamesString);
@@ -128,7 +140,7 @@ public class Core extends AbstractService {
 			String insertUri = configuration.getStringValue("Sone/Name." + soneName + "/InsertURI").getValue(null);
 			String requestUri = configuration.getStringValue("Sone/Name." + soneName + "/RequestURI").getValue(null);
 			try {
-				localSones.add(new Sone(new FreenetURI(requestUri), new FreenetURI(insertUri)));
+				localSones.add(new Sone(soneName, new FreenetURI(requestUri), new FreenetURI(insertUri)));
 			} catch (MalformedURLException mue1) {
 				logger.log(Level.WARNING, "Could not create Sone from requestUri (“" + requestUri + "”) and insertUri (“" + insertUri + "”)!", mue1);
 			}