diff options
| author | jon-stumpf <jon.stumpf@gmail.com> | 2017-02-20 10:54:34 -0500 |
|---|---|---|
| committer | jon-stumpf <jon.stumpf@gmail.com> | 2017-02-20 10:54:34 -0500 |
| commit | 888c392af40187f3a0ecc3395495db9acd85b827 (patch) | |
| tree | beb74dff8b8052ffb4a7d3c894b2b4e5a4434973 /src/org/traccar/events | |
| parent | 38249673287b908c0ca55847a35ca16a7b6a0c50 (diff) | |
| parent | 2449895139fa658d082c1085185003a001225bc3 (diff) | |
| download | trackermap-server-888c392af40187f3a0ecc3395495db9acd85b827.tar.gz trackermap-server-888c392af40187f3a0ecc3395495db9acd85b827.tar.bz2 trackermap-server-888c392af40187f3a0ecc3395495db9acd85b827.zip | |
Resolved conflict with master;
Diffstat (limited to 'src/org/traccar/events')
| -rw-r--r-- | src/org/traccar/events/IgnitionEventHandler.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/org/traccar/events/IgnitionEventHandler.java b/src/org/traccar/events/IgnitionEventHandler.java index 187b7ce73..c628cc107 100644 --- a/src/org/traccar/events/IgnitionEventHandler.java +++ b/src/org/traccar/events/IgnitionEventHandler.java @@ -30,10 +30,7 @@ public class IgnitionEventHandler extends BaseEventHandler { @Override protected Collection<Event> analyzePosition(Position position) { Device device = Context.getIdentityManager().getDeviceById(position.getDeviceId()); - if (device == null) { - return null; - } - if (!Context.getIdentityManager().isLatestPosition(position) || !position.getValid()) { + if (device == null || !Context.getIdentityManager().isLatestPosition(position)) { return null; } |