X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetStatusAjaxPage.java;h=ae3dfc2b66df985eee52b25bc58ac2be0d3a5d09;hb=6db033602e7c17efc40a4a19efe705d67832fc1a;hp=c5563146e863f81511a73644794b32faff9c1307;hpb=8454806e48890675178c1b4b6cbe4bb9c42b68a3;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
index c556314..ae3dfc2 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
@@ -22,6 +22,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -62,7 +63,10 @@ public class GetStatusAjaxPage extends JsonPage {
 	protected JsonObject createJsonObject(Request request) {
 		/* load Sones. */
 		boolean loadAllSones = Boolean.parseBoolean(request.getHttpRequest().getParam("loadAllSones", "true"));
-		Set<Sone> sones = loadAllSones ? webInterface.getCore().getSones() : Collections.singleton(getCurrentSone(request.getToadletContext()));
+		Set<Sone> sones = new HashSet<Sone>(Collections.singleton(getCurrentSone(request.getToadletContext())));
+		if (loadAllSones) {
+			sones.addAll(webInterface.getCore().getSones());
+		}
 		JsonArray jsonSones = new JsonArray();
 		for (Sone sone : sones) {
 			JsonObject jsonSone = createJsonSone(sone);