opendev/gerrit
Code Issues Proposed changes

Fix NPE in LDAP Helper class if username is null

Browse Source 
Bug: issue 1622
Change-Id: Id96d75e40be4605dadba233ed7954363c7ee8812
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
This commit is contained in:
Edwin Kempin
2012-10-23 14:08:48 +02:00
parent 1a6def9bd7
commit adb072c7ae
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/Helper.java
View File

@@ -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);
}
}