This is an automated email from the git hooks/post-receive script. New commit to branch feature/7710 in repository observe. See http://git.codelutin.com/observe.git commit 004ab5bb8fad59a3ebd1594adc1c8c5a69bba600 Author: Kevin Morin <morin@codelutin.com> Date: Tue Nov 10 17:22:35 2015 +0100 verification que la route est déjà persistée avant de la récupérer en base (refs #7710) --- .../observe/services/service/seine/RouteServiceTopia.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java index 35041e1..aa49974 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java @@ -198,10 +198,17 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi TripChildSaveResultDto result = new TripChildSaveResultDto(); TripSeine tripSeine = loadEntity(TripSeineDto.class, TripSeine.class, tripSeineId); - Route route = loadEntity(RouteDto.class, Route.class, routeDto.getId()); - Date oldRouteDate = route.getDate(); - route = dtoToEntity(RouteDto.class, Route.class, routeDto); + Date oldRouteDate; + if (routeDto.isPersisted()) { + Route route = loadEntity(RouteDto.class, Route.class, routeDto.getId()); + oldRouteDate = route.getDate(); + + } else { + oldRouteDate = routeDto.getDate(); + } + + Route route = dtoToEntity(RouteDto.class, Route.class, routeDto); route = saveEntity(Route.class, route); result.setId(route.getTopiaId()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.