diff options
| author | Parveen Kumar Yadav <parveenkumardeeva@gmail.com> | 2018-04-13 10:47:42 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-13 10:47:42 +0530 |
| commit | d448823edd0e8a7833c79b980cfe9778b849843a (patch) | |
| tree | 50ad1ab51b93915cff422a1834baa5a2c579fce8 /src/org/traccar/BaseProtocol.java | |
| parent | 2c8392a0e16044905d983da56ab0919eadbb3858 (diff) | |
| parent | 617393cf9f052298f7fb35f0c58138c87a6dd5c3 (diff) | |
| download | traccar-server-d448823edd0e8a7833c79b980cfe9778b849843a.tar.gz traccar-server-d448823edd0e8a7833c79b980cfe9778b849843a.tar.bz2 traccar-server-d448823edd0e8a7833c79b980cfe9778b849843a.zip | |
Merge pull request #1 from traccar/master
Bringing Fork Up to Date
Diffstat (limited to 'src/org/traccar/BaseProtocol.java')
| -rw-r--r-- | src/org/traccar/BaseProtocol.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/BaseProtocol.java b/src/org/traccar/BaseProtocol.java index 90b9f21f2..07adbea5e 100644 --- a/src/org/traccar/BaseProtocol.java +++ b/src/org/traccar/BaseProtocol.java @@ -18,9 +18,9 @@ package org.traccar; import org.jboss.netty.buffer.ChannelBuffers; import org.jboss.netty.handler.codec.string.StringEncoder; import org.traccar.database.ActiveDevice; +import org.traccar.helper.DataConverter; import org.traccar.model.Command; -import javax.xml.bind.DatatypeConverter; import java.util.Arrays; import java.util.Collection; import java.util.HashSet; @@ -79,7 +79,7 @@ public abstract class BaseProtocol implements Protocol { if (activeDevice.getChannel().getPipeline().get(StringEncoder.class) != null) { activeDevice.write(data); } else { - activeDevice.write(ChannelBuffers.wrappedBuffer(DatatypeConverter.parseHexBinary(data))); + activeDevice.write(ChannelBuffers.wrappedBuffer(DataConverter.parseHex(data))); } } else { throw new RuntimeException("Command " + command.getType() + " is not supported in protocol " + getName()); |