diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-11-24 22:58:06 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-11-24 22:58:06 +1300 |
| commit | fcdea01510dc9bf7144c76f4dd3a08c8c4eebaca (patch) | |
| tree | d733534dbf042f26b611269a6649e6b8799376c9 | |
| parent | 89c6edc4b15b9ebebc9699f4740959753ec56bc6 (diff) | |
| download | trackermap-server-fcdea01510dc9bf7144c76f4dd3a08c8c4eebaca.tar.gz trackermap-server-fcdea01510dc9bf7144c76f4dd3a08c8c4eebaca.tar.bz2 trackermap-server-fcdea01510dc9bf7144c76f4dd3a08c8c4eebaca.zip | |
Fix Ulbotech event data decoding
| -rw-r--r-- | src/org/traccar/protocol/UlbotechProtocolDecoder.java | 4 | ||||
| -rw-r--r-- | test/org/traccar/protocol/UlbotechProtocolDecoderTest.java | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/UlbotechProtocolDecoder.java b/src/org/traccar/protocol/UlbotechProtocolDecoder.java index 5d882ffd8..dd6fb1593 100644 --- a/src/org/traccar/protocol/UlbotechProtocolDecoder.java +++ b/src/org/traccar/protocol/UlbotechProtocolDecoder.java @@ -204,7 +204,9 @@ public class UlbotechProtocolDecoder extends BaseProtocolDecoder { case DATA_EVENT: position.set(Event.KEY_EVENT, buf.readUnsignedByte()); - position.set("event-mask", buf.readUnsignedInt()); + if (length > 1) { + position.set("event-mask", buf.readUnsignedInt()); + } break; default: diff --git a/test/org/traccar/protocol/UlbotechProtocolDecoderTest.java b/test/org/traccar/protocol/UlbotechProtocolDecoderTest.java index 30e040e3d..4dd061f1c 100644 --- a/test/org/traccar/protocol/UlbotechProtocolDecoderTest.java +++ b/test/org/traccar/protocol/UlbotechProtocolDecoderTest.java @@ -13,6 +13,9 @@ public class UlbotechProtocolDecoderTest extends ProtocolDecoderTest { UlbotechProtocolDecoder decoder = new UlbotechProtocolDecoder(new UlbotechProtocol()); verifyPosition(decoder, binary( + "f8010108679650230646339de69054010e015ee17506bde2c60000000000ac0304024000000404000009f705060390181422170711310583410c0000310d00312f834131018608040003130a100101136cf8")); + + verifyPosition(decoder, binary( "f8010108679650230651689dc8e45b010e01194a26fbd47fa6001f003c0054030402420000040400024d7b0506037c18692212071131057f410c0ee0310d1b312f41413112ef0804000dd59fcc32f8")); verifyPosition(decoder, binary( |