diff options
| author | Jan Bartel | 2016-02-02 17:23:39 +0000 |
|---|---|---|
| committer | Jan Bartel | 2016-02-02 17:23:39 +0000 |
| commit | 273e87a851669058f364303a206ce9929fe97f4c (patch) | |
| tree | 9e17613f444b3578392197aa4d6b51d3947a7681 /jetty-security/src/main/java | |
| parent | 325cfe3cbf66735f07884e97adc1b784e5c4f890 (diff) | |
| parent | 0f19eda53d9d91902bc5719a8c2c38cb45529ed5 (diff) | |
| download | org.eclipse.jetty.project-273e87a851669058f364303a206ce9929fe97f4c.tar.gz org.eclipse.jetty.project-273e87a851669058f364303a206ce9929fe97f4c.tar.xz org.eclipse.jetty.project-273e87a851669058f364303a206ce9929fe97f4c.zip | |
Merge branch 'master' into session-refactor
Diffstat (limited to 'jetty-security/src/main/java')
| -rw-r--r-- | jetty-security/src/main/java/org/eclipse/jetty/security/AbstractLoginService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/AbstractLoginService.java b/jetty-security/src/main/java/org/eclipse/jetty/security/AbstractLoginService.java index 84deed8609..2ac6781a79 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/AbstractLoginService.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/AbstractLoginService.java @@ -166,7 +166,7 @@ public abstract class AbstractLoginService extends AbstractLifeCycle implements return null; UserPrincipal userPrincipal = loadUserInfo(username); - if (userPrincipal.authenticate(credentials)) + if (userPrincipal != null && userPrincipal.authenticate(credentials)) { //safe to load the roles String[] roles = loadRoleInfo(userPrincipal); |