opendev/gerrit
Code Issues Proposed changes

Parse body when creating CommitResource

Browse Source 
GetCommit depends on the body of both the commit and parent being
parsed, to get the subject.

Change-Id: Ic33854a129926e4138e21a57e9218969486720be
This commit is contained in:
Dave Borowitz
2014-08-08 13:26:37 -07:00
parent 62d0a15324
commit 68bb9055cf
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-server/src/main/java/com/google/gerrit/server/project/CommitsCollection.java
View File

@@ -70,11 +70,12 @@ public class CommitsCollection implements
RevWalk rw = new RevWalk(repo); RevWalk rw = new RevWalk(repo);
try { try {
RevCommit commit = rw.parseCommit(objectId); RevCommit commit = rw.parseCommit(objectId);
rw.parseBody(commit);
if (!parent.getControl().canReadCommit(db.get(), rw, commit)) { if (!parent.getControl().canReadCommit(db.get(), rw, commit)) {
throw new ResourceNotFoundException(id); throw new ResourceNotFoundException(id);
} }
for (int i = 0; i < commit.getParentCount(); i++) { for (int i = 0; i < commit.getParentCount(); i++) {
rw.parseCommit(commit.getParent(i)); rw.parseBody(rw.parseCommit(commit.getParent(i)));
} }
return new CommitResource(parent, commit); return new CommitResource(parent, commit);
} catch (MissingObjectException | IncorrectObjectTypeException e) { } catch (MissingObjectException | IncorrectObjectTypeException e) {