opendev/gerrit
Code Issues Proposed changes

Add missing @Nullabe for Account in SubmoduleOp

Browse Source 
Account can be null which was causing a 'Guice provision errors' and
preventing the Merge operation from completing. Add @Nullable for
account parameter in constructor.

Change-Id: I17103ede239190840eaffdd8aaae0bb71de3609c
This commit is contained in:
Hugo Arès 2014-08-29 12:40:54 -04:00
parent 820e8ddc4a
commit 546d22f0e0
1 changed files with 1 additions and 1 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/git/SubmoduleOp.java
View File

@ -101,7 +101,7 @@ public class SubmoduleOp {
@Assisted final Map<Change.Id, CodeReviewCommit> commits,
@GerritPersonIdent final PersonIdent myIdent,
GitRepositoryManager repoManager, GitReferenceUpdated gitRefUpdated,
@Assisted Account account, ChangeHooks changeHooks) {
@Nullable @Assisted Account account, ChangeHooks changeHooks) {
this.destBranch = destBranch;
this.mergeTip = mergeTip;
this.rw = rw;