Optimize date assignment

1 files changed, 6 insertions, 30 deletions

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) {