This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository observe. See http://git.codelutin.com/observe.git commit ec418d6f36beb345ab70faf08f7880459cb4ffb5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Nov 3 14:37:55 2015 +0100 Correction du test sur les plages de validité d'une RTP (See #7673) --- .../entities/referentiel/LengthWeightParemeterHelper.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java index c4bc8ec..5c101cc 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java @@ -236,8 +236,10 @@ public class LengthWeightParemeterHelper { for (P parametrageLengthWeight : list) { - if (parametrageLengthWeight.getStartDate().before(startDate) || - parametrageLengthWeight.getStartDate().equals(startDate)) { + // Conversion en date (sinon c'est un timestamp qui est donné et l'égalité ne fonctionne plus) + Date startDate1 = new Date(parametrageLengthWeight.getStartDate().getTime()); + if (startDate1.before(startDate) || + startDate1.equals(startDate)) { result.add(parametrageLengthWeight); } } @@ -265,6 +267,10 @@ public class LengthWeightParemeterHelper { for (P parametrageLengthWeight : list) { Date date = parametrageLengthWeight.getEndDate(); + if (date!=null) { + // Conversion en date (sinon c'est un timestamp qui est donné et l'égalité ne fonctionne plus) + date = new Date(date.getTime()); + } if (date == null || date.after(endDate) || date.equals(endDate)) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.