Fix some FindBugs and style issues

1 files changed, 10 insertions, 2 deletions

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