5 files changed, 46 insertions, 10 deletions
diff --git a/src/org/traccar/model/Device.java b/src/org/traccar/model/Device.java
index 7622f78cd..698505983 100644
--- a/src/org/traccar/model/Device.java
+++ b/src/org/traccar/model/Device.java
@@ -67,11 +67,19 @@ public class Device implements Factory {
     private Date lastUpdate;
 
     public Date getLastUpdate() {
-        return lastUpdate;
+        if (lastUpdate != null) {
+            return new Date(lastUpdate.getTime());
+        } else {
+            return null;
+        }
     }
 
     public void setLastUpdate(Date lastUpdate) {
-        this.lastUpdate = lastUpdate;
+        if (lastUpdate != null) {
+            this.lastUpdate = new Date(lastUpdate.getTime());
+        } else {
+            this.lastUpdate = null;
+        }
     }
 
     private long positionId;
diff --git a/src/org/traccar/model/Event.java b/src/org/traccar/model/Event.java
index 9ad54adbf..2e4d82c0b 100644
--- a/src/org/traccar/model/Event.java
+++ b/src/org/traccar/model/Event.java
@@ -92,21 +92,37 @@ public abstract class Event extends Extensible {
     private Date serverTime;
 
     public Date getServerTime() {
-        return serverTime;
+        if (serverTime != null) {
+            return new Date(serverTime.getTime());
+        } else {
+            return null;
+        }
     }
 
     public void setServerTime(Date serverTime) {
-        this.serverTime = serverTime;
+        if (serverTime != null) {
+            this.serverTime = new Date(serverTime.getTime());
+        } else {
+            this.serverTime = null;
+        }
     }
 
     private Date deviceTime;
 
     public Date getDeviceTime() {
-        return deviceTime;
+        if (deviceTime != null) {
+            return new Date(deviceTime.getTime());
+        } else {
+            return null;
+        }
     }
 
     public void setDeviceTime(Date deviceTime) {
-        this.deviceTime = deviceTime;
+        if (deviceTime != null) {
+            this.deviceTime = new Date(deviceTime.getTime());
+        } else {
+            this.deviceTime = null;
+        }
     }
 
 }
diff --git a/src/org/traccar/model/MiscFormatter.java b/src/org/traccar/model/MiscFormatter.java
index 725270122..f62e1f42c 100644
--- a/src/org/traccar/model/MiscFormatter.java
+++ b/src/org/traccar/model/MiscFormatter.java
@@ -15,6 +15,7 @@
  */
 package org.traccar.model;
 
+import org.traccar.helper.Log;
 import org.traccar.web.JsonConverter;
 
 import java.text.DecimalFormat;
@@ -108,6 +109,9 @@ public class MiscFormatter {
                 case FALSE:
                     attributes.put(entry.getKey(), false);
                     break;
+                default:
+                    Log.warning(new IllegalArgumentException());
+                    break;
             }
         }
 
diff --git a/src/org/traccar/model/Position.java b/src/org/traccar/model/Position.java
index ab535ba2b..1ed559ecd 100644
--- a/src/org/traccar/model/Position.java
+++ b/src/org/traccar/model/Position.java
@@ -27,11 +27,19 @@ public class Position extends Event implements Factory {
     private Date fixTime;
 
     public Date getFixTime() {
-        return fixTime;
+        if (fixTime != null) {
+            return new Date(fixTime.getTime());
+        } else {
+            return null;
+        }
     }
 
     public void setFixTime(Date fixTime) {
-        this.fixTime = fixTime;
+        if (fixTime != null) {
+            this.fixTime = new Date(fixTime.getTime());
+        } else {
+            this.fixTime = null;
+        }
     }
 
     public void setTime(Date time) {
diff --git a/src/org/traccar/model/User.java b/src/org/traccar/model/User.java
index f9534b87d..8ac9e9d32 100644
--- a/src/org/traccar/model/User.java
+++ b/src/org/traccar/model/User.java
@@ -155,8 +155,8 @@ public class User implements Factory {
         this.password = password;
         if (password != null && !password.isEmpty()) {
             Hashing.HashingResult hashingResult = Hashing.createHash(password);
-            hashedPassword = hashingResult.hash;
-            salt = hashingResult.salt;
+            hashedPassword = hashingResult.getHash();
+            salt = hashingResult.getSalt();
         }
     }