From 0197eb6f0786c013bb71d4f086d7677625ef2156 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 28 Aug 2012 18:34:24 +0200 Subject: [PATCH] fix npe on wrong password --- scm-webapp/src/main/java/sonia/scm/security/ScmRealm.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scm-webapp/src/main/java/sonia/scm/security/ScmRealm.java b/scm-webapp/src/main/java/sonia/scm/security/ScmRealm.java index 769107ea86..3e7724cd2f 100644 --- a/scm-webapp/src/main/java/sonia/scm/security/ScmRealm.java +++ b/scm-webapp/src/main/java/sonia/scm/security/ScmRealm.java @@ -237,11 +237,12 @@ public class ScmRealm extends AuthorizingRealm authenticator.authenticate(token.getRequest(), token.getResponse(), token.getUsername(), token.getPassword()); - if (result.getState() == AuthenticationState.SUCCESS) + if ((result != null) && (AuthenticationState.SUCCESS == result.getState())) { info = createAuthenticationInfo(token, result); } - else if (result.getState() == AuthenticationState.NOT_FOUND) + else if ((result != null) + && (AuthenticationState.NOT_FOUND == result.getState())) { throw new UnknownAccountException( "unknown account ".concat(token.getUsername()));