Merge pull request #4 from traccar/master

upgrade to current master

1 files changed, 4 insertions, 20 deletions

diff --git a/src/org/traccar/reports/model/TripReport.java b/src/org/traccar/reports/model/TripReport.java
index 42a4240b7..3140f3019 100644
--- a/src/org/traccar/reports/model/TripReport.java
+++ b/src/org/traccar/reports/model/TripReport.java
@@ -83,19 +83,11 @@ public class TripReport extends BaseReport {
     private Date startTime;
 
     public Date getStartTime() {
-        if (startTime != null) {
-            return new Date(startTime.getTime());
-        } else {
-            return null;
-        }
+        return startTime;
     }
 
     public void setStartTime(Date startTime) {
-        if (startTime != null) {
-            this.startTime = new Date(startTime.getTime());
-        } else {
-            this.startTime = null;
-        }
+        this.startTime = startTime;
     }
 
     private String startAddress;
@@ -111,19 +103,11 @@ public class TripReport extends BaseReport {
     private Date endTime;
 
     public Date getEndTime() {
-        if (endTime != null) {
-            return new Date(endTime.getTime());
-        } else {
-            return null;
-        }
+        return endTime;
     }
 
     public void setEndTime(Date endTime) {
-        if (endTime != null) {
-            this.endTime = new Date(endTime.getTime());
-        } else {
-            this.endTime = null;
-        }
+        this.endTime = endTime;
     }
 
     private String endAddress;