diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2018-10-21 16:48:08 +0400 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2018-10-21 16:48:08 +0400 |
| commit | ca3f04d16c16d45d8753d6f84bf83ab8fc44446a (patch) | |
| tree | fa2c15ca304d97385f5473ce08273431a7080365 | |
| parent | 3c4bad1bf1705a94da5f3b74ed36baae66d5c1f1 (diff) | |
| download | trackermap-server-ca3f04d16c16d45d8753d6f84bf83ab8fc44446a.tar.gz trackermap-server-ca3f04d16c16d45d8753d6f84bf83ab8fc44446a.tar.bz2 trackermap-server-ca3f04d16c16d45d8753d6f84bf83ab8fc44446a.zip | |
Handle empty values
| -rw-r--r-- | src/org/traccar/protocol/GoSafeProtocolDecoder.java | 7 | ||||
| -rw-r--r-- | test/org/traccar/protocol/GoSafeProtocolDecoderTest.java | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/GoSafeProtocolDecoder.java b/src/org/traccar/protocol/GoSafeProtocolDecoder.java index 760fcb2fd..06bd0873d 100644 --- a/src/org/traccar/protocol/GoSafeProtocolDecoder.java +++ b/src/org/traccar/protocol/GoSafeProtocolDecoder.java @@ -70,7 +70,12 @@ public class GoSafeProtocolDecoder extends BaseProtocolDecoder { private void decodeFragment(Position position, String fragment) { int dataIndex = fragment.indexOf(':'); int index = 0; - String[] values = fragment.substring(dataIndex + 1).split(";"); + String[] values; + if (fragment.length() == dataIndex + 1) { + values = new String[0]; + } else { + values = fragment.substring(dataIndex + 1).split(";"); + } switch (fragment.substring(0, dataIndex)) { case "GPS": position.setValid(values[index++].equals("A")); diff --git a/test/org/traccar/protocol/GoSafeProtocolDecoderTest.java b/test/org/traccar/protocol/GoSafeProtocolDecoderTest.java index 16ec1e68a..9cd8e4800 100644 --- a/test/org/traccar/protocol/GoSafeProtocolDecoderTest.java +++ b/test/org/traccar/protocol/GoSafeProtocolDecoderTest.java @@ -11,6 +11,9 @@ public class GoSafeProtocolDecoderTest extends ProtocolTest { GoSafeProtocolDecoder decoder = new GoSafeProtocolDecoder(null); verifyPositions(decoder, text( + "*GS06,359568052570135,090349191018,,SYS:G3C;V1.40;V1.0.4,GPS:A;10;S26.112722;E28.078766;0;23;1581;0.80,COT:,ADC:10.86;3.79,DTT:4000;E7;0;0;0;1$090419191018,,SYS:G3C;V1.40;V1.0.4,GPS:A;10;S26.112722;E28.078766;0;23;1581;0.80,COT:,ADC:10.85;3.79,DTT:4000;E7;0;0;0;1#")); + + verifyPositions(decoder, text( "*GS06,359913060650380,152248050718,,SYS:G3C;V1.38;V05,GPS:A;10;N31.914370;E35.914640;0;0,COT:689,ADC:0.18;3.55,DTT:4025;E6;0;0;0;1#")); verifyPositions(decoder, text( |