This is an automated email from the git hooks/post-receive script. New commit to branch feature/pollen-riot-js in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 050bfbc1c4de0c46c11fe51515c7dc3cf4d22bbf Author: Tony CHEMIT <dev@tchemit.fr> Date: Tue Jan 24 17:01:37 2017 +0100 improve PollenBean --- .../java/org/chorem/pollen/services/bean/PollenBean.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenBean.java index 6fdf6e4..2f94f20 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenBean.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenBean.java @@ -24,6 +24,8 @@ package org.chorem.pollen.services.bean; import com.google.common.base.Preconditions; import org.nuiton.topia.persistence.TopiaEntity; +import java.util.Objects; + /** * Created on 5/15/14. * @@ -47,7 +49,7 @@ public abstract class PollenBean<E extends TopiaEntity> { } public boolean isPersisted() { - return id.isNotEmpty(); + return id != null && id.isNotEmpty(); } public String getEntityId() { @@ -64,17 +66,11 @@ public abstract class PollenBean<E extends TopiaEntity> { @Override public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof PollenBean)) return false; - - PollenBean that = (PollenBean) o; - - return id.equals(that.id); - + return this == o || o instanceof PollenBean && Objects.equals(id, ((PollenBean) o).id); } @Override public int hashCode() { - return id.hashCode(); + return Objects.hashCode(id); } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.