diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2019-07-18 09:26:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-18 09:26:27 -0700 |
| commit | 509d26db7efafe965f5cc6e1a1fba6b30e9556cf (patch) | |
| tree | a24039c2610bcb59f0af18b6e534787828185abd /src/main/java/org/traccar/BaseProtocolDecoder.java | |
| parent | bba38f9078a1c1455730daf80d76587cf21228cc (diff) | |
| parent | f4bef0008fc6b2562a29017e6eb4272734943311 (diff) | |
| download | trackermap-server-509d26db7efafe965f5cc6e1a1fba6b30e9556cf.tar.gz trackermap-server-509d26db7efafe965f5cc6e1a1fba6b30e9556cf.tar.bz2 trackermap-server-509d26db7efafe965f5cc6e1a1fba6b30e9556cf.zip | |
Merge pull request #4357 from edvalley/proposed2
Make optional server attributes lookup
Diffstat (limited to 'src/main/java/org/traccar/BaseProtocolDecoder.java')
| -rw-r--r-- | src/main/java/org/traccar/BaseProtocolDecoder.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/BaseProtocolDecoder.java b/src/main/java/org/traccar/BaseProtocolDecoder.java index aa5be612e..87d09289f 100644 --- a/src/main/java/org/traccar/BaseProtocolDecoder.java +++ b/src/main/java/org/traccar/BaseProtocolDecoder.java @@ -86,7 +86,7 @@ public abstract class BaseProtocolDecoder extends ExtendedObjectDecoder { protected TimeZone getTimeZone(long deviceId, String defaultTimeZone) { TimeZone result = TimeZone.getTimeZone(defaultTimeZone); - String timeZoneName = identityManager.lookupAttributeString(deviceId, "decoder.timezone", null, true); + String timeZoneName = identityManager.lookupAttributeString(deviceId, "decoder.timezone", null, false, true); if (timeZoneName != null) { result = TimeZone.getTimeZone(timeZoneName); } else { |