Merge branch 'release-0.4'

[Sone.git] / src / main / java / net / pterodactylus / sone / freenet / wot / IdentityManager.java

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 dbf4206..98ba2c7 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
@@ -204,16 +204,16 @@ public class IdentityManager extends AbstractService {
                                        }
 
                                        /* find new identities. */
-                                       for (Identity currentIdentity : currentIdentities.get(ownIdentities).values()) {
-                                               if (!oldIdentities.containsKey(currentIdentity.getId())) {
+                                       for (Identity currentIdentity : currentIdentities.get(ownIdentity).values()) {
+                                               if (!oldIdentities.containsKey(ownIdentity) || !oldIdentities.get(ownIdentity).containsKey(currentIdentity.getId())) {
                                                        identityListenerManager.fireIdentityAdded(ownIdentity, currentIdentity);
                                                }
                                        }
 
                                        /* find removed identities. */
                                        if (oldIdentities.containsKey(ownIdentity)) {
-                                               for (Identity oldIdentity : oldIdentities.get(ownIdentities).values()) {
-                                                       if (!currentIdentities.containsKey(oldIdentity.getId())) {
+                                               for (Identity oldIdentity : oldIdentities.get(ownIdentity).values()) {
+                                                       if (!currentIdentities.get(ownIdentity).containsKey(oldIdentity.getId())) {
                                                                identityListenerManager.fireIdentityRemoved(ownIdentity, oldIdentity);
                                                        }
                                                }