Author: bdaw Date: 2012-02-17 09:22:41 -0500 (Fri, 17 Feb 2012) New Revision: 1406 Modified: idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/FallbackIdentityStoreRepository.java Log: PLIDM-36 When user is not in read/write LDAP and in DB it can lead to NPE during removal Modified: idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/FallbackIdentityStoreRepository.java =================================================================== --- idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/FallbackIdentityStoreRepository.java 2012-02-17 12:11:44 UTC (rev 1405) +++ idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/FallbackIdentityStoreRepository.java 2012-02-17 14:22:41 UTC (rev 1406) @@ -573,7 +573,10 @@ try { - targetStore.removeIdentityObject(targetCtx, identity); + if (hasIdentityObject(targetCtx, targetStore, identity)) + { + targetStore.removeIdentityObject(targetCtx, identity); + } } catch (IdentityException e) {