From b4d3a5de05422b88e518a173359d45ce13ea4b2b Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Fri, 23 Oct 2015 09:40:20 +1300
Subject: Fix date builder and unit testing

---
 src/org/traccar/helper/DateBuilder.java           | 1 +
 src/org/traccar/protocol/Gt06ProtocolDecoder.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/org/traccar')

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);
                 }
             }
 
-- 
cgit v1.2.3