Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #171 from Athou/jklm

Browse Source 
Use jkeylockmanager for entry update locking
This commit is contained in:
Athou
2013-05-24 03:04:03 -07:00
parent bdd690afb1 1ba5ded090
commit 6aebae56e6
4 changed files with 31 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/commafeed/backend/services/UserService.java
View File

@@ -46,8 +46,9 @@ public class UserService {
PasswordEncryptionService encryptionService;
public User login(String name, String password) {
Preconditions.checkNotNull(name);
Preconditions.checkNotNull(password);
if (name == null || password == null) {
return null;
}
User user = userDAO.findByName(name);
if (user != null && !user.isDisabled()) {