Author: tchemit Date: 2012-07-31 14:52:15 +0200 (Tue, 31 Jul 2012) New Revision: 3574 Url: http://chorem.org/repositories/revision/pollen/3574 Log: fixes #721: Can't change my account profile Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-07-31 10:54:49 UTC (rev 3573) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-07-31 12:52:15 UTC (rev 3574) @@ -23,6 +23,7 @@ package org.chorem.pollen.services.impl; import com.google.common.base.Preconditions; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -177,7 +178,8 @@ // In case of email change, check if an other user has not already // the new email // existing user found - if (dao.isUserExist(user)) { + if (ObjectUtils.notEqual(user.getEmail(), userToUpdate.getEmail()) + && dao.isUserExist(user)) { throw new UserEmailAlreadyUsedException(); }