Merge pull request #4 from traccar/master

upgrade to current master

1 files changed, 13 insertions, 11 deletions

diff --git a/src/org/traccar/model/User.java b/src/org/traccar/model/User.java
index b1883213c..1a131a4e8 100644
--- a/src/org/traccar/model/User.java
+++ b/src/org/traccar/model/User.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 - 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2013 - 2018 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -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;
@@ -230,6 +222,16 @@ public class User extends ExtendedModel {
         this.limitCommands = limitCommands;
     }
 
+    private String poiLayer;
+
+    public String getPoiLayer() {
+        return poiLayer;
+    }
+
+    public void setPoiLayer(String poiLayer) {
+        this.poiLayer = poiLayer;
+    }
+
     @QueryIgnore
     public String getPassword() {
         return null;