branch develop updated (512fd3c -> f8d009c)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 512fd3c Merge branch 'feature/7606' into develop new f8d009c deux Dto avec des Id null ne sont pas égaux (refs #7606, 7607) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit f8d009cc4ec5c30feb2752531611c9c7c08b1c11 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 21 10:54:14 2015 +0200 deux Dto avec des Id null ne sont pas égaux (refs #7606, 7607) Summary of changes: .../src/main/java/fr/ird/observe/services/dto/IdDto.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit f8d009cc4ec5c30feb2752531611c9c7c08b1c11 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 21 10:54:14 2015 +0200 deux Dto avec des Id null ne sont pas égaux (refs #7606, 7607) --- .../src/main/java/fr/ird/observe/services/dto/IdDto.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDto.java index 3b65566..19f48fa 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDto.java @@ -43,7 +43,7 @@ public abstract class IdDto extends AbstractIdDto { if (this == o) return true; if (!(o instanceof AbstractIdDto)) return false; AbstractIdDto that = (AbstractIdDto) o; - return Objects.equals(id, that.id); + return !(id == null || that.id == null) && Objects.equals(id, that.id); } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm