aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/Xt2400ProtocolDecoder.java
diff options
context:
space:
mode:
authorKevin Goos <kevingoos@telenet.be>2018-03-16 13:35:11 +0100
committerKevin Goos <kevingoos@telenet.be>2018-03-16 13:35:11 +0100
commit3b7c9c56e198ce213d3e113a2fbc4148b5d85558 (patch)
treea04b64fc484c6832b8f023412db020e3e5e9a657 /src/org/traccar/protocol/Xt2400ProtocolDecoder.java
parentb34cf25b5ac1f178d783a512d3b95faed4bdb010 (diff)
parent25a36fe2fb8045e455de5e936c286c4db8b40563 (diff)
downloadtrackermap-server-3b7c9c56e198ce213d3e113a2fbc4148b5d85558.tar.gz
trackermap-server-3b7c9c56e198ce213d3e113a2fbc4148b5d85558.tar.bz2
trackermap-server-3b7c9c56e198ce213d3e113a2fbc4148b5d85558.zip
Merge branch 'master' of https://github.com/kevingoos/traccar
Diffstat (limited to 'src/org/traccar/protocol/Xt2400ProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/Xt2400ProtocolDecoder.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/Xt2400ProtocolDecoder.java b/src/org/traccar/protocol/Xt2400ProtocolDecoder.java
index 72be473c1..1be943e98 100644
--- a/src/org/traccar/protocol/Xt2400ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Xt2400ProtocolDecoder.java
@@ -20,10 +20,10 @@ import org.jboss.netty.channel.Channel;
import org.traccar.BaseProtocolDecoder;
import org.traccar.Context;
import org.traccar.DeviceSession;
+import org.traccar.helper.DataConverter;
import org.traccar.helper.UnitsConverter;
import org.traccar.model.Position;
-import javax.xml.bind.DatatypeConverter;
import java.net.SocketAddress;
import java.nio.charset.StandardCharsets;
import java.util.Date;
@@ -95,7 +95,7 @@ public class Xt2400ProtocolDecoder extends BaseProtocolDecoder {
Pattern pattern = Pattern.compile(":wycfg pcr\\[\\d+\\] ([0-9a-fA-F]{2})[0-9a-fA-F]{2}([0-9a-fA-F]+)");
Matcher matcher = pattern.matcher(configString);
while (matcher.find()) {
- formats.put(Short.parseShort(matcher.group(1), 16), DatatypeConverter.parseHexBinary(matcher.group(2)));
+ formats.put(Short.parseShort(matcher.group(1), 16), DataConverter.parseHex(matcher.group(2)));
}
}