diff options
| author | Shawn Pearce <sop@google.com> | 2014-04-24 14:07:58 -0700 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@sonymobile.com> | 2014-04-25 09:40:45 +0900 |
| commit | 9fa4975b821dc92d35219037d02629795fd3e3c8 (patch) | |
| tree | f43c1acc64c7d02ee33b8fbd8ea51d0b5160ece1 | |
| parent | a1ffd908d7bce959f1026300e406e7f735117c4f (diff) | |
Fix log spew caused by DeleteBranch constructor
Every time branches are accessed the server logs a nasty Guice
trace preventing DeleteBranch from being created. The view must
create without enforcing the IdentifiedUser to exist. The solution
throughout the rest of Gerrit REST API code is to use Provider<X>
instead of X to allow Guice to defer this resolution.
Change-Id: If7fd7f4c38bcbc685d4f9451479da7a9ed432564
| -rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteBranch.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteBranch.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteBranch.java index a41c197cb8..382d68c62b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteBranch.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteBranch.java @@ -41,16 +41,16 @@ public class DeleteBranch implements RestModifyView<BranchResource, Input>{ static class Input { } - private final IdentifiedUser identifiedUser; + private final Provider<IdentifiedUser> identifiedUser; private final GitRepositoryManager repoManager; private final Provider<ReviewDb> dbProvider; private final GitReferenceUpdated referenceUpdated; private final ChangeHooks hooks; @Inject - DeleteBranch(IdentifiedUser identifiedUser, GitRepositoryManager repoManager, - Provider<ReviewDb> dbProvider, GitReferenceUpdated referenceUpdated, - ChangeHooks hooks) { + DeleteBranch(Provider<IdentifiedUser> identifiedUser, + GitRepositoryManager repoManager, Provider<ReviewDb> dbProvider, + GitReferenceUpdated referenceUpdated, ChangeHooks hooks) { this.identifiedUser = identifiedUser; this.repoManager = repoManager; this.dbProvider = dbProvider; @@ -89,7 +89,7 @@ public class DeleteBranch implements RestModifyView<BranchResource, Input>{ case FAST_FORWARD: case FORCED: referenceUpdated.fire(rsrc.getNameKey(), u); - hooks.doRefUpdatedHook(rsrc.getBranchKey(), u, identifiedUser.getAccount()); + hooks.doRefUpdatedHook(rsrc.getBranchKey(), u, identifiedUser.get().getAccount()); break; case REJECTED_CURRENT_BRANCH: |