Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into jetty-9.1

This commit is contained in:
Jan Bartel 2013-08-12 16:41:15 +10:00
parent 3eeb20f5bd e3e9264a07
commit af98046d13
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jetty-security/src/main/java/org/eclipse/jetty/security/MappedLoginService.java
View File

@ -212,6 +212,9 @@ public abstract class MappedLoginService extends AbstractLifeCycle implements Lo
*/ */
public UserIdentity login(String username, Object credentials) public UserIdentity login(String username, Object credentials)
{ {
if (username == null)
return null;
UserIdentity user = _users.get(username); UserIdentity user = _users.get(username);
if (user==null) if (user==null)

3
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java
View File

@ -117,6 +117,9 @@ public class DeferredAuthentication implements Authentication.Deferred
@Override @Override
public Authentication login(String username, Object password, ServletRequest request) public Authentication login(String username, Object password, ServletRequest request)
{ {
if (username == null)
return null;
UserIdentity identity = _authenticator.login(username, password, request); UserIdentity identity = _authenticator.login(username, password, request);
if (identity != null) if (identity != null)
{ {