diff options
author | Kevin Goos <kevingoos@telenet.be> | 2018-03-16 13:24:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-16 13:24:17 +0100 |
commit | 25a36fe2fb8045e455de5e936c286c4db8b40563 (patch) | |
tree | 074a212284fdc3e8779ca55f8694f8e92c24e8a7 /src/org/traccar/ExtendedObjectDecoder.java | |
parent | 1216e3bee2abfecedfe1250a9dd5d45c83a2fc02 (diff) | |
parent | 38c1ff9bccc1c417a0c2b412271aa7240a3b7db7 (diff) | |
download | traccar-server-25a36fe2fb8045e455de5e936c286c4db8b40563.tar.gz traccar-server-25a36fe2fb8045e455de5e936c286c4db8b40563.tar.bz2 traccar-server-25a36fe2fb8045e455de5e936c286c4db8b40563.zip |
Merge branch 'master' into master
Diffstat (limited to 'src/org/traccar/ExtendedObjectDecoder.java')
-rw-r--r-- | src/org/traccar/ExtendedObjectDecoder.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/ExtendedObjectDecoder.java b/src/org/traccar/ExtendedObjectDecoder.java index 268e6f688..75a24212f 100644 --- a/src/org/traccar/ExtendedObjectDecoder.java +++ b/src/org/traccar/ExtendedObjectDecoder.java @@ -23,9 +23,9 @@ import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.channel.ChannelUpstreamHandler; import org.jboss.netty.channel.Channels; import org.jboss.netty.channel.MessageEvent; +import org.traccar.helper.DataConverter; import org.traccar.model.Position; -import javax.xml.bind.DatatypeConverter; import java.net.SocketAddress; import java.nio.charset.StandardCharsets; import java.util.Collection; @@ -39,7 +39,7 @@ public abstract class ExtendedObjectDecoder implements ChannelUpstreamHandler { ChannelBuffer buf = (ChannelBuffer) originalMessage; position.set(Position.KEY_ORIGINAL, ChannelBuffers.hexDump(buf, 0, buf.writerIndex())); } else if (originalMessage instanceof String) { - position.set(Position.KEY_ORIGINAL, DatatypeConverter.printHexBinary( + position.set(Position.KEY_ORIGINAL, DataConverter.printHex( ((String) originalMessage).getBytes(StandardCharsets.US_ASCII))); } } |