This is an automated email from the git hooks/post-receive script. New commit to branch feature/7520 in repository observe. See http://git.codelutin.com/observe.git commit 9f17d4914216271dd9261cda2fa3b6dc12d67e7e Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Sep 15 10:52:47 2015 +0200 A la sauvegarde d'un DTO, verifier seulement que la date de dernière mise a jour en base n'est pas après la date du DTO (refs #7520) --- .../fr/ird/observe/services/ObserveServiceTopia.java | 2 +- .../service/seine/TripSeineServiceTopiaTest.java | 19 ++++++------------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java index 58dc5fd..034d079 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java @@ -349,7 +349,7 @@ public class ObserveServiceTopia implements ObserveService { Date lasUpdate = ((FollowedUpdateEntity) entity).getLastUpdate(); Date currentUpdate = ((FollowedUpdateDto) dto).getLastUpdate(); - if (lasUpdate != null && ! lasUpdate.equals(currentUpdate)) { + if (lasUpdate != null && lasUpdate.after(currentUpdate)) { throw new ConcurrentModificationException(lasUpdate, currentUpdate); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java index f0aaf94..a991c4c 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java @@ -43,6 +43,7 @@ import org.junit.Assert; import org.junit.Test; import org.nuiton.util.DateUtil; +import java.util.Calendar; import java.util.Collection; import java.util.Date; import java.util.List; @@ -374,20 +375,12 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { tripSeineDto.setDepartureHarbour((ReferentialReferenceDto<HarbourDto>) harbourRefs.getReference(0)); tripSeineDto.setLandingHarbour((ReferentialReferenceDto<HarbourDto>) harbourRefs.getReference(1)); - // première sauvegarde - service.save(formDto); - - tripSeineDto.setErsId("ersid"); - - tripSeineDto.setStartDate(DateUtil.createDate(24, 8, 2015)); - tripSeineDto.setEndDate(DateUtil.createDate(24, 9, 2015)); - - tripSeineDto.setFormsUrl("http://une.url.com/formulaire"); - tripSeineDto.setReportsUrl("http://une.url.com/rapport"); - - tripSeineDto.setComment("Un commentaire"); + // on fait croire que notre version est plus ancienne + Calendar calendar = Calendar.getInstance(); + calendar.setTime(tripSeineDto.getLastUpdate()); + calendar.add(Calendar.HOUR, - 1); + tripSeineDto.setLastUpdate(calendar.getTime()); - // la deuxième sauvegarde doit lever une ConcurrentModificationException service.save(formDto); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.