opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.10'

Browse Source 
* stable-2.10:
  Update 2.10 release notes
  Fix faulty behaviour in BLOCK permission
  Let RefControlTest be responsible for creating own test projects
  Resource exhausted because of unclosed LDAP connection

Conflicts:
	gerrit-server/src/test/java/com/google/gerrit/server/project/Util.java

Change-Id: I5e8a98365ce583cbd62c9289e49af8d5c1e755b1
This commit is contained in:
David Pursehouse
2015-01-09 09:44:33 +09:00
parent 0a7abf367f 7794b9e5e8
commit 31ba7fa943
6 changed files with 74 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapAuthBackend.java
View File

@@ -89,7 +89,7 @@ public class LdapAuthBackend implements AuthBackend {
// We found the user account, but we need to verify
// the password matches it before we can continue.
//
helper.authenticate(m.getDN(), req.getPassword());
helper.authenticate(m.getDN(), req.getPassword()).close();
}
return new AuthUser(new AuthUser.UUID(username), username);
} finally {

2
gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapRealm.java
View File

@@ -221,7 +221,7 @@ public class LdapRealm extends AbstractRealm {
// We found the user account, but we need to verify
// the password matches it before we can continue.
//
helper.authenticate(m.getDN(), who.getPassword());
helper.authenticate(m.getDN(), who.getPassword()).close();
}
who.setDisplayName(apply(schema.accountFullName, m));