GUACAMOLE-394: Map last active date for users to timestamp. Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/adf016a0 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/adf016a0 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/adf016a0
Branch: refs/heads/master Commit: adf016a005cd2c797f7d5e566b4e266770b3e174 Parents: 8694bc8 Author: Michael Jumper <[email protected]> Authored: Tue Sep 12 13:33:29 2017 -0700 Committer: Michael Jumper <[email protected]> Committed: Mon Dec 11 23:51:57 2017 -0800 ---------------------------------------------------------------------- .../java/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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/adf016a0/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUser.java ---------------------------------------------------------------------- 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 7d80fac..b039a4e 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(); } http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/adf016a0/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserModel.java ---------------------------------------------------------------------- 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 a4f9c7a..a6cf997 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; }
