diff options
| author | casswarry0 <casswarry0@gmail.com> | 2023-01-17 17:14:53 -0700 |
|---|---|---|
| committer | casswarry0 <casswarry0@gmail.com> | 2023-01-17 17:14:53 -0700 |
| commit | 7338b8730949ed027b3f8b31d7dca20687ebbb8b (patch) | |
| tree | c2d171e6121818ab511460a786f69aab97a2a628 /src/main/java/org/traccar/protocol/AplicomProtocolDecoder.java | |
| parent | cdecd3fa4427a382c0b09f8ad9d69ec14388960a (diff) | |
| parent | 85501f9cf4918d5eee345f83aed7a31eecb26b8d (diff) | |
| download | trackermap-server-7338b8730949ed027b3f8b31d7dca20687ebbb8b.tar.gz trackermap-server-7338b8730949ed027b3f8b31d7dca20687ebbb8b.tar.bz2 trackermap-server-7338b8730949ed027b3f8b31d7dca20687ebbb8b.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'src/main/java/org/traccar/protocol/AplicomProtocolDecoder.java')
| -rw-r--r-- | src/main/java/org/traccar/protocol/AplicomProtocolDecoder.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/org/traccar/protocol/AplicomProtocolDecoder.java b/src/main/java/org/traccar/protocol/AplicomProtocolDecoder.java index f11312428..0cd8ca37e 100644 --- a/src/main/java/org/traccar/protocol/AplicomProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/AplicomProtocolDecoder.java @@ -21,8 +21,7 @@ import io.netty.channel.Channel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.traccar.BaseProtocolDecoder; -import org.traccar.Context; -import org.traccar.DeviceSession; +import org.traccar.session.DeviceSession; import org.traccar.Protocol; import org.traccar.config.Keys; import org.traccar.helper.Checksum; @@ -303,7 +302,7 @@ public class AplicomProtocolDecoder extends BaseProtocolDecoder { decodeEventData(position, buf, event); } - if (Context.getConfig().getBoolean(Keys.PROTOCOL_CAN.withPrefix(getProtocolName())) + if (getConfig().getBoolean(Keys.PROTOCOL_CAN.withPrefix(getProtocolName())) && buf.isReadable() && (selector & 0x1000) != 0 && event == EVENT_DATA) { decodeCanData(buf, position); } |