opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.11'

Browse Source 
* stable-2.11:
  Fix LDAP authentication for the RFC2307 server type
  Improve performance of ListBranches REST endpoint

Change-Id: I06fa4083e03659cb56ffc0267e8a6d6b6b338ce3
This commit is contained in:
David Pursehouse 2015-03-12 09:20:23 +09:00
commit 7ed32ecde5
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,7 +194,7 @@ import javax.security.auth.login.LoginException;
params.put(LdapRealm.USERNAME, username);
List<LdapQuery> accountQueryList;
if (fetchMemberOf) {
if (fetchMemberOf && schema.type.accountMemberField() != null) {
accountQueryList = schema.accountWithMemberOfQueryList;
} else {
accountQueryList = schema.accountQueryList;

32
gerrit-server/src/main/java/com/google/gerrit/server/project/ListBranches.java
View File

@ -40,11 +40,11 @@ import dk.brics.automaton.RunAutomaton;
import org.eclipse.jgit.errors.RepositoryNotFoundException;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.RefDatabase;
import org.eclipse.jgit.lib.Repository;
import org.kohsuke.args4j.Option;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
@ -96,30 +96,34 @@ public class ListBranches implements RestReadView<ProjectResource> {
}
try {
final Map<String, Ref> all = db.getRefDatabase().getRefs(RefDatabase.ALL);
List<Ref> refs =
new ArrayList<>(db.getRefDatabase().getRefs(Constants.R_HEADS)
.values());
if (!all.containsKey(Constants.HEAD)) {
// The branch pointed to by HEAD doesn't exist yet, so getAllRefs
// filtered it out. If we ask for it individually we can find the
// underlying target and put it into the map anyway.
//
try {
Ref head = db.getRef(Constants.HEAD);
if (head != null) {
all.put(Constants.HEAD, head);
refs.add(head);
}
} catch (IOException e) {
// Ignore the failure reading HEAD.
}
}
try {
Ref config = db.getRef(RefNames.REFS_CONFIG);
if (config != null) {
refs.add(config);
}
} catch (IOException e) {
// Ignore the failure reading refs/meta/config.
}
for (final Ref ref : all.values()) {
for (Ref ref : refs) {
if (ref.isSymbolic()) {
targets.add(ref.getTarget().getName());
}
}
for (final Ref ref : all.values()) {
for (Ref ref : refs) {
if (ref.isSymbolic()) {
// A symbolic reference to another branch, instead of
// showing the resolved value, show the name it references.
@ -146,10 +150,10 @@ public class ListBranches implements RestReadView<ProjectResource> {
final RefControl refControl = rsrc.getControl().controlForRef(ref.getName());
if (refControl.isVisible()) {
if (ref.getName().startsWith(Constants.R_HEADS)) {
branches.add(createBranchInfo(ref, refControl, targets));
} else if (RefNames.REFS_CONFIG.equals(ref.getName())) {
if (RefNames.REFS_CONFIG.equals(ref.getName())) {
configBranch = createBranchInfo(ref, refControl, targets);
} else {
branches.add(createBranchInfo(ref, refControl, targets));
}
}
}