X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FIdentityManager.java;h=6f33a4ac07833ec7ccee2396e17cd1cb89d25085;hb=d8f787ea2b94de403ef0ab989282643423d7131c;hp=77e0480af572e4d6280713a629c53d60cc508ff6;hpb=058238fbb2972fc4656bd89fa234b1a0b2d3accf;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java b/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
index 77e0480..6f33a4a 100644
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
@@ -150,7 +150,9 @@ public class IdentityManager extends AbstractService {
 	 * @return All own identities
 	 */
 	public Set<OwnIdentity> getAllOwnIdentities() {
-		return new HashSet<OwnIdentity>(currentOwnIdentities.values());
+		synchronized (syncObject) {
+			return new HashSet<OwnIdentity>(currentOwnIdentities.values());
+		}
 	}
 
 	//
@@ -167,12 +169,11 @@ public class IdentityManager extends AbstractService {
 			Map<OwnIdentity, Map<String, Identity>> currentIdentities = new HashMap<OwnIdentity, Map<String, Identity>>();
 			Map<String, OwnIdentity> currentOwnIdentities = new HashMap<String, OwnIdentity>();
 
-			Set<OwnIdentity> ownIdentities = null;
 			boolean identitiesLoaded = false;
 			try {
 				/* get all identities with the wanted context from WoT. */
 				logger.finer("Getting all Own Identities from WoT...");
-				ownIdentities = webOfTrustConnector.loadAllOwnIdentities();
+				Set<OwnIdentity> ownIdentities = webOfTrustConnector.loadAllOwnIdentities();
 				logger.finest(String.format("Loaded %d Own Identities.", ownIdentities.size()));
 
 				/* load trusted identities. */