- Rename field to Period

- Remove unnecessary check for null
- Move MaintenanceManager initialization with other event related managers

1 files changed, 3 insertions, 3 deletions

diff --git a/src/org/traccar/events/MaintenanceEventHandler.java b/src/org/traccar/events/MaintenanceEventHandler.java
index b556e1003..4a6122826 100644
--- a/src/org/traccar/events/MaintenanceEventHandler.java
+++ b/src/org/traccar/events/MaintenanceEventHandler.java
@@ -42,12 +42,12 @@ public class MaintenanceEventHandler extends BaseEventHandler {
         Map<Event, Position> events = new HashMap<>();
         for (long maintenanceId : Context.getMaintenancesManager().getAllDeviceItems(position.getDeviceId())) {
             Maintenance maintenance = Context.getMaintenancesManager().getById(maintenanceId);
-            if (maintenance.getLapse() != 0) {
+            if (maintenance.getPeriod() != 0) {
                 double oldValue = lastPosition.getDouble(maintenance.getType());
                 double newValue = position.getDouble(maintenance.getType());
                 if (oldValue != 0.0 && newValue != 0.0
-                        && (long) ((oldValue - maintenance.getStart()) / maintenance.getLapse())
-                        < (long) ((newValue - maintenance.getStart()) / maintenance.getLapse())) {
+                        && (long) ((oldValue - maintenance.getStart()) / maintenance.getPeriod())
+                        < (long) ((newValue - maintenance.getStart()) / maintenance.getPeriod())) {
                     Event event = new Event(Event.TYPE_MAINTENANCE, position.getDeviceId(), position.getId());
                     event.setMaintenanceId(maintenanceId);
                     event.set(maintenance.getType(), newValue);