diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2013-10-17 22:17:53 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2013-10-17 22:17:53 +1300 |
| commit | 4b21619ac3c65368872f130f22b869267220b77d (patch) | |
| tree | 5964ad2ca58a72c06023aec69ca81584e4373eb6 /src/org/traccar | |
| parent | b6cc3e27d03de09d61c9ea8dbf3fce108678d031 (diff) | |
| download | trackermap-server-4b21619ac3c65368872f130f22b869267220b77d.tar.gz trackermap-server-4b21619ac3c65368872f130f22b869267220b77d.tar.bz2 trackermap-server-4b21619ac3c65368872f130f22b869267220b77d.zip | |
More atrack fixes
Diffstat (limited to 'src/org/traccar')
| -rw-r--r-- | src/org/traccar/protocol/AtrackFrameDecoder.java | 2 | ||||
| -rw-r--r-- | src/org/traccar/protocol/AtrackProtocolDecoder.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/AtrackFrameDecoder.java b/src/org/traccar/protocol/AtrackFrameDecoder.java index 267b6de12..90dfa68b6 100644 --- a/src/org/traccar/protocol/AtrackFrameDecoder.java +++ b/src/org/traccar/protocol/AtrackFrameDecoder.java @@ -25,7 +25,7 @@ public class AtrackFrameDecoder extends LengthFieldBasedFrameDecoder { private static final int KEEPALIVE_LENGTH = 12; public AtrackFrameDecoder() { - super(1024, 4, 2, 6, 0); + super(1024, 4, 2); } @Override diff --git a/src/org/traccar/protocol/AtrackProtocolDecoder.java b/src/org/traccar/protocol/AtrackProtocolDecoder.java index ba03e0642..66ef0b322 100644 --- a/src/org/traccar/protocol/AtrackProtocolDecoder.java +++ b/src/org/traccar/protocol/AtrackProtocolDecoder.java @@ -69,6 +69,7 @@ public class AtrackProtocolDecoder extends BaseProtocolDecoder { position.setDeviceId(getDataManager().getDeviceByImei(id).getId()); } catch(Exception error) { Log.warning("Unknown device - " + id); + return null; } // Date and time |