diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-10-23 09:40:20 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-10-23 09:40:20 +1300 |
| commit | b4d3a5de05422b88e518a173359d45ce13ea4b2b (patch) | |
| tree | 827b7545b17645f1fa0598fbf19bef52ca9383eb /src/org/traccar | |
| parent | c585535761dba635dca000f900cc33d4cc5e4631 (diff) | |
| download | trackermap-server-b4d3a5de05422b88e518a173359d45ce13ea4b2b.tar.gz trackermap-server-b4d3a5de05422b88e518a173359d45ce13ea4b2b.tar.bz2 trackermap-server-b4d3a5de05422b88e518a173359d45ce13ea4b2b.zip | |
Fix date builder and unit testing
Diffstat (limited to 'src/org/traccar')
| -rw-r--r-- | src/org/traccar/helper/DateBuilder.java | 1 | ||||
| -rw-r--r-- | src/org/traccar/protocol/Gt06ProtocolDecoder.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/org/traccar/helper/DateBuilder.java b/src/org/traccar/helper/DateBuilder.java index 5d2ee8e0a..094dfff16 100644 --- a/src/org/traccar/helper/DateBuilder.java +++ b/src/org/traccar/helper/DateBuilder.java @@ -31,6 +31,7 @@ public class DateBuilder { public DateBuilder(TimeZone timeZone) { calendar = Calendar.getInstance(timeZone); calendar.clear(); + calendar.setTimeInMillis(0); } public DateBuilder setYear(int year) { diff --git a/src/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/org/traccar/protocol/Gt06ProtocolDecoder.java index 50683d94e..632e71a8f 100644 --- a/src/org/traccar/protocol/Gt06ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gt06ProtocolDecoder.java @@ -193,7 +193,7 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder { offset = -offset; } if (!forceTimeZone) { - timeZone.setRawOffset(offset); + timeZone.setRawOffset(offset * 1000); } } |