From adf016a005cd2c797f7d5e566b4e266770b3e174 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Tue, 12 Sep 2017 13:33:29 -0700
Subject: [PATCH] GUACAMOLE-394: Map last active date for users to timestamp.

---
 .../org/apache/guacamole/auth/jdbc/user/ModeledUser.java    | 2 +-
 .../java/org/apache/guacamole/auth/jdbc/user/UserModel.java | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUser.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUser.java
index 7d80facb9..b039a4e28 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUser.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUser.java
@@ -795,7 +795,7 @@ public class ModeledUser extends ModeledDirectoryObject<UserModel> implements Us
     }
 
     @Override
-    public Date getLastActive() {
+    public Timestamp getLastActive() {
         return getModel().getLastActive();
     }
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserModel.java
index a4f9c7adf..a6cf997d3 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserModel.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserModel.java
@@ -118,7 +118,7 @@ public class UserModel extends ObjectModel {
      * The date and time that this user was last active, or null if this user
      * has never logged in.
      */
-    private Date lastActive;
+    private Timestamp lastActive;
 
     /**
      * Creates a new, empty user.
@@ -479,7 +479,7 @@ public class UserModel extends ObjectModel {
      *     The date and time that this user was last active, or null if this
      *     user has never logged in.
      */
-    public Date getLastActive() {
+    public Timestamp getLastActive() {
         return lastActive;
     }
 
@@ -493,7 +493,7 @@ public class UserModel extends ObjectModel {
      *     The date and time that this user was last active, or null if this
      *     user has never logged in.
      */
-    public void setLastActive(Date lastActive) {
+    public void setLastActive(Timestamp lastActive) {
         this.lastActive = lastActive;
     }