This is an automated email from the git hooks/post-receive script. New commit to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit c923a9fdfe2b4171c5d5a44afea70ee2a73097bc Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Feb 19 09:07:48 2015 +0100 fix Cruises.equals method --- .../fr/ifremer/tutti/persistence/entities/data/Cruises.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/Cruises.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/Cruises.java index f4be34d..19d6d37 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/Cruises.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/Cruises.java @@ -25,6 +25,8 @@ package fr.ifremer.tutti.persistence.entities.data; import fr.ifremer.adagio.core.dao.technical.synchronization.SynchronizationStatus; import org.apache.commons.lang3.builder.EqualsBuilder; +import java.util.Calendar; + public class Cruises extends AbstractCruises { public static boolean isDirty(Cruise cruise) { @@ -45,8 +47,15 @@ public class Cruises extends AbstractCruises { public static boolean equals(Cruise cruise1, Cruise cruise2) { EqualsBuilder equalsBuilder = new EqualsBuilder(); - equalsBuilder.append(cruise1.getBeginDate(), cruise2.getBeginDate()); - equalsBuilder.append(cruise1.getMultirigNumber(), cruise2.getMultirigNumber()); + + Calendar instance = Calendar.getInstance(); + instance.setTime(cruise1.getBeginDate()); + int year1 = instance.get(Calendar.YEAR); + instance.setTime(cruise2.getBeginDate()); + int year2 = instance.get(Calendar.YEAR); + + equalsBuilder.append(year1, year2); + equalsBuilder.append(cruise1.getSurveyPart(), cruise2.getSurveyPart()); equalsBuilder.append(cruise1.getProgram(), cruise2.getProgram()); boolean equals = equalsBuilder.isEquals(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.