aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/traccar/BaseProtocolDecoder.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2019-08-06 21:33:28 -0700
committerGitHub <noreply@github.com>2019-08-06 21:33:28 -0700
commit5c470d62146b9530119e14211cac1d82c2c03c42 (patch)
treefff6ad309483756f79e92ae41e56a11754d03f42 /src/main/java/org/traccar/BaseProtocolDecoder.java
parent36cab2bf5414af9c7e23da19c0b0f91aba2e0cb6 (diff)
parent5faeac6ee28b86ee1ff72580e4995db92bfff710 (diff)
downloadtrackermap-server-5c470d62146b9530119e14211cac1d82c2c03c42.tar.gz
trackermap-server-5c470d62146b9530119e14211cac1d82c2c03c42.tar.bz2
trackermap-server-5c470d62146b9530119e14211cac1d82c2c03c42.zip
Merge pull request #4374 from 7erg/egts-oid
EGTS protocol support for oid authentication (auto-detect)
Diffstat (limited to 'src/main/java/org/traccar/BaseProtocolDecoder.java')
-rw-r--r--src/main/java/org/traccar/BaseProtocolDecoder.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/java/org/traccar/BaseProtocolDecoder.java b/src/main/java/org/traccar/BaseProtocolDecoder.java
index 87d09289f..9dbe78c9d 100644
--- a/src/main/java/org/traccar/BaseProtocolDecoder.java
+++ b/src/main/java/org/traccar/BaseProtocolDecoder.java
@@ -143,7 +143,13 @@ public abstract class BaseProtocolDecoder extends ExtendedObjectDecoder {
}
public DeviceSession getDeviceSession(Channel channel, SocketAddress remoteAddress, String... uniqueIds) {
+ return getDeviceSession(channel, remoteAddress, false, uniqueIds);
+ }
+
+ public DeviceSession getDeviceSession(
+ Channel channel, SocketAddress remoteAddress, boolean ignoreCache, String... uniqueIds) {
if (channel != null && BasePipelineFactory.getHandler(channel.pipeline(), HttpRequestDecoder.class) != null
+ || ignoreCache
|| config.getBoolean("decoder.ignoreSessionCache")) {
long deviceId = findDeviceId(remoteAddress, uniqueIds);
if (deviceId != 0) {