diff options
author | Abyss777 <abyss@fox5.ru> | 2017-08-15 16:04:41 +0500 |
---|---|---|
committer | Abyss777 <abyss@fox5.ru> | 2017-08-15 16:04:41 +0500 |
commit | 4d7805f783f00914a289b2447521a2f467de87bc (patch) | |
tree | 819d1a56dbbdd9c3badb379337da16d9dd487a54 /src/org/traccar/database | |
parent | 9b9c715cf0d9604be71a35e5e6e5428a3a891ba9 (diff) | |
parent | 5606c72b19568ddf50e2fa35f35e05358bb671e4 (diff) | |
download | trackermap-server-4d7805f783f00914a289b2447521a2f467de87bc.tar.gz trackermap-server-4d7805f783f00914a289b2447521a2f467de87bc.tar.bz2 trackermap-server-4d7805f783f00914a289b2447521a2f467de87bc.zip |
Merge remote-tracking branch 'upstream/master' into new_trips_detector
Diffstat (limited to 'src/org/traccar/database')
-rw-r--r-- | src/org/traccar/database/DataManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java index b7d3cb1e4..2e3e68bc9 100644 --- a/src/org/traccar/database/DataManager.java +++ b/src/org/traccar/database/DataManager.java @@ -297,7 +297,7 @@ public class DataManager { public User login(String email, String password) throws SQLException { User user = QueryBuilder.create(dataSource, getQuery("database.loginUser")) - .setString("email", email) + .setString("email", email.trim()) .executeQuerySingle(User.class); if (user != null && user.isPasswordValid(password)) { return user; |