Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c1f46034 by Tony Chemit at 2023-03-16T21:16:47+01:00 Erreur Calendar.SetTime lors de l'export d'une base locale vers la base centrale - Closes #2651 - - - - - 1 changed file: - core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/ActivityConsolidateEngine.java Changes: ===================================== core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/ActivityConsolidateEngine.java ===================================== @@ -68,7 +68,11 @@ public class ActivityConsolidateEngine { log.debug(String.format("%s Skip activity (No floating object found): %s", activityPrefix, activity.getTopiaId())); return Optional.empty(); } - activity.setTime(Dates.getDateAndTime(route.getDate(), activity.getTime(), true, true)); + if (activity.getTime() != null) { + activity.setTime(route.getDate()); + } else { + activity.setTime(Dates.getDateAndTime(route.getDate(), activity.getTime(), true, true)); + } activity.registerDecorator(activityDecorator); ActivityConsolidateContext activityContext = new ActivityConsolidateContext(activity); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/c1f46034d5e6a4e9f50d306a06... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/c1f46034d5e6a4e9f50d306a06... You're receiving this email because of your account on gitlab.com.