- if (!currentOwnIdentities.containsKey(currentOwnIdentity.getId())) {
- identityListenerManager.fireOwnIdentityAdded(currentOwnIdentity);
+ OwnIdentity oldOwnIdentity = currentOwnIdentities.get(currentOwnIdentity.getId());
+ if (((oldOwnIdentity == null) && ((context == null) || currentOwnIdentity.hasContext(context))) || ((oldOwnIdentity != null) && (context != null) && (!oldOwnIdentity.hasContext(context) && currentOwnIdentity.hasContext(context)))) {
+ identityListenerManager.fireOwnIdentityAdded(new DefaultOwnIdentity(currentOwnIdentity));