From adb072c7ae8e11b8e8084ecf077f55d458a95e51 Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Tue, 23 Oct 2012 14:08:48 +0200 Subject: [PATCH] Fix NPE in LDAP Helper class if username is null Bug: issue 1622 Change-Id: Id96d75e40be4605dadba233ed7954363c7ee8812 Signed-off-by: Edwin Kempin --- .../java/com/google/gerrit/server/auth/ldap/Helper.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/Helper.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/Helper.java index ae049a00bd..2df2d1e26e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/Helper.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/Helper.java @@ -111,9 +111,11 @@ import javax.security.auth.login.LoginException; if ("GSSAPI".equals(authentication)) { return kerberosOpen(env); } else { - env.put(Context.SECURITY_PRINCIPAL, username); - env.put(Context.SECURITY_CREDENTIALS, password != null ? password : ""); - return new InitialDirContext(env); + if (username != null) { + env.put(Context.SECURITY_PRINCIPAL, username); + env.put(Context.SECURITY_CREDENTIALS, password != null ? password : ""); + } + return new InitialDirContext(env); } }