This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit aaeb47017c46cfbb0a361704f7fde8014f5891ee Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Mar 27 16:20:53 2015 +0100 problème d'égalite d'une campagne si le surveyPart est vide ou null --- .../tutti/persistence/entities/data/Cruises.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 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 cc26c3a..5c3a5d5 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 @@ -51,22 +51,30 @@ public class Cruises extends AbstractCruises { Calendar instance = Calendar.getInstance(); int year1; - if (cruise1.getBeginDate()==null) { - year1=-1; + if (cruise1.getBeginDate() == null) { + year1 = -1; } else { instance.setTime(cruise1.getBeginDate()); year1 = instance.get(Calendar.YEAR); } int year2; - if (cruise1.getBeginDate()==null) { - year2=-2; + if (cruise1.getBeginDate() == null) { + year2 = -2; } else { instance.setTime(cruise2.getBeginDate()); year2 = instance.get(Calendar.YEAR); } equalsBuilder.append(year1, year2); - equalsBuilder.append(cruise1.getSurveyPart(), cruise2.getSurveyPart()); + String surveyPart1 = cruise1.getSurveyPart(); + if (surveyPart1 == null) { + surveyPart1 = ""; + } + String surveyPart2 = cruise2.getSurveyPart(); + if (surveyPart2 == null) { + surveyPart2 = ""; + } + equalsBuilder.append(surveyPart1, surveyPart2); 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>.