diff options
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/org/traccar/database/NotificationManager.java | 2 | ||||
| -rw-r--r-- | src/main/java/org/traccar/model/Event.java | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/org/traccar/database/NotificationManager.java b/src/main/java/org/traccar/database/NotificationManager.java index ccad192f6..c4fc48ebf 100644 --- a/src/main/java/org/traccar/database/NotificationManager.java +++ b/src/main/java/org/traccar/database/NotificationManager.java @@ -90,7 +90,7 @@ public class NotificationManager extends ExtendedObjectManager<Notification> { usersToForward.add(userId); } final Set<String> notificators = new HashSet<>(); - for (long notificationId : getEffectiveNotifications(userId, deviceId, event.getServerTime())) { + for (long notificationId : getEffectiveNotifications(userId, deviceId, event.getEventTime())) { Notification notification = getById(notificationId); if (getById(notificationId).getType().equals(event.getType())) { boolean filter = false; diff --git a/src/main/java/org/traccar/model/Event.java b/src/main/java/org/traccar/model/Event.java index 5eee2a0a0..47b74811a 100644 --- a/src/main/java/org/traccar/model/Event.java +++ b/src/main/java/org/traccar/model/Event.java @@ -27,7 +27,7 @@ public class Event extends Message { public Event(String type, long deviceId) { setType(type); setDeviceId(deviceId); - this.serverTime = new Date(); + this.eventTime = new Date(); } public Event() { @@ -62,14 +62,14 @@ public class Event extends Message { public static final String TYPE_DRIVER_CHANGED = "driverChanged"; - private Date serverTime; + private Date eventTime; - public Date getServerTime() { - return serverTime; + public Date getEventTime() { + return eventTime; } - public void setServerTime(Date serverTime) { - this.serverTime = serverTime; + public void setEventTime(Date eventTime) { + this.eventTime = eventTime; } private long positionId; |