Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
c1f46034
by Tony Chemit at 2023-03-16T21:16:47+01:00
1 changed file:
Changes:
| ... | ... | @@ -68,7 +68,11 @@ public class ActivityConsolidateEngine { |
| 68 | 68 | log.debug(String.format("%s Skip activity (No floating object found): %s", activityPrefix, activity.getTopiaId()));
|
| 69 | 69 | return Optional.empty();
|
| 70 | 70 | }
|
| 71 | - activity.setTime(Dates.getDateAndTime(route.getDate(), activity.getTime(), true, true));
|
|
| 71 | + if (activity.getTime() != null) {
|
|
| 72 | + activity.setTime(route.getDate());
|
|
| 73 | + } else {
|
|
| 74 | + activity.setTime(Dates.getDateAndTime(route.getDate(), activity.getTime(), true, true));
|
|
| 75 | + }
|
|
| 72 | 76 | activity.registerDecorator(activityDecorator);
|
| 73 | 77 | |
| 74 | 78 | ActivityConsolidateContext activityContext = new ActivityConsolidateContext(activity);
|