From 48a5bd364b496de70a1a3eff8dd5c57c5d8fec9d Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Mon, 22 Jan 2018 19:53:48 +1300
Subject: Optimize date assignment

---
 src/org/traccar/model/Event.java      | 12 ++----------
 src/org/traccar/model/Position.java   | 36 ++++++-----------------------------
 src/org/traccar/model/Statistics.java | 12 ++----------
 src/org/traccar/model/User.java       | 12 ++----------
 4 files changed, 12 insertions(+), 60 deletions(-)

(limited to 'src/org/traccar/model')

diff --git a/src/org/traccar/model/Event.java b/src/org/traccar/model/Event.java
index 47b60af01..465afeb35 100644
--- a/src/org/traccar/model/Event.java
+++ b/src/org/traccar/model/Event.java
@@ -64,19 +64,11 @@ public class Event extends Message {
     private Date serverTime;
 
     public Date getServerTime() {
-        if (serverTime != null) {
-            return new Date(serverTime.getTime());
-        } else {
-            return null;
-        }
+        return serverTime;
     }
 
     public void setServerTime(Date serverTime) {
-        if (serverTime != null) {
-            this.serverTime = new Date(serverTime.getTime());
-        } else {
-            this.serverTime = null;
-        }
+        this.serverTime = serverTime;
     }
 
     private long positionId;
diff --git a/src/org/traccar/model/Position.java b/src/org/traccar/model/Position.java
index 3943c1ef9..981c2292f 100644
--- a/src/org/traccar/model/Position.java
+++ b/src/org/traccar/model/Position.java
@@ -152,55 +152,31 @@ public class Position extends Message {
     private Date serverTime;
 
     public Date getServerTime() {
-        if (serverTime != null) {
-            return new Date(serverTime.getTime());
-        } else {
-            return null;
-        }
+        return serverTime;
     }
 
     public void setServerTime(Date serverTime) {
-        if (serverTime != null) {
-            this.serverTime = new Date(serverTime.getTime());
-        } else {
-            this.serverTime = null;
-        }
+        this.serverTime = serverTime;
     }
 
     private Date deviceTime;
 
     public Date getDeviceTime() {
-        if (deviceTime != null) {
-            return new Date(deviceTime.getTime());
-        } else {
-            return null;
-        }
+        return deviceTime;
     }
 
     public void setDeviceTime(Date deviceTime) {
-        if (deviceTime != null) {
-            this.deviceTime = new Date(deviceTime.getTime());
-        } else {
-            this.deviceTime = null;
-        }
+        this.deviceTime = deviceTime;
     }
 
     private Date fixTime;
 
     public Date getFixTime() {
-        if (fixTime != null) {
-            return new Date(fixTime.getTime());
-        } else {
-            return null;
-        }
+        return fixTime;
     }
 
     public void setFixTime(Date fixTime) {
-        if (fixTime != null) {
-            this.fixTime = new Date(fixTime.getTime());
-        } else {
-            this.fixTime = null;
-        }
+        this.fixTime = fixTime;
     }
 
     public void setTime(Date time) {
diff --git a/src/org/traccar/model/Statistics.java b/src/org/traccar/model/Statistics.java
index 2acf8514f..cb72c91dd 100644
--- a/src/org/traccar/model/Statistics.java
+++ b/src/org/traccar/model/Statistics.java
@@ -22,19 +22,11 @@ public class Statistics extends ExtendedModel {
     private Date captureTime;
 
     public Date getCaptureTime() {
-        if (captureTime != null) {
-            return new Date(captureTime.getTime());
-        } else {
-            return null;
-        }
+        return captureTime;
     }
 
     public void setCaptureTime(Date captureTime) {
-        if (captureTime != null) {
-            this.captureTime = new Date(captureTime.getTime());
-        } else {
-            this.captureTime = null;
-        }
+        this.captureTime = captureTime;
     }
 
     private int activeUsers;
diff --git a/src/org/traccar/model/User.java b/src/org/traccar/model/User.java
index 7f97d4781..1a131a4e8 100644
--- a/src/org/traccar/model/User.java
+++ b/src/org/traccar/model/User.java
@@ -158,19 +158,11 @@ public class User extends ExtendedModel {
     private Date expirationTime;
 
     public Date getExpirationTime() {
-        if (expirationTime != null) {
-            return new Date(expirationTime.getTime());
-        } else {
-            return null;
-        }
+        return expirationTime;
     }
 
     public void setExpirationTime(Date expirationTime) {
-        if (expirationTime != null) {
-            this.expirationTime = new Date(expirationTime.getTime());
-        } else {
-            this.expirationTime = null;
-        }
+        this.expirationTime = expirationTime;
     }
 
     private int deviceLimit;
-- 
cgit v1.2.3