commit 89ad4ede3d57a14e1add9d65fd9f31c5bc193058
author Gustaf Lundh <gustaf.lundh@sonymobile.com> Tue May 21 11:56:23 2013 +0200
committer Gustaf Lundh <gustaf.lundh@sonymobile.com> Tue May 21 09:59:08 2013 +0000
tree a60c2f58fcf5209870c2ac5900e356e5b1b68c00
parent 99ca234e1cf3750e81ddddd062f2fb7b98daf82f

Injecting IdentifiedUser into rebase triggers errors in the MergeQueue

Change-Id: Ibe7d19bded1afebb3af39b9cc692806a26336871

gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java b/gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java
index 37cbdf7..3b43fb0 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java
@@ -75,7 +75,6 @@
   private final ChangeHookRunner hooks;
   private final MergeUtil.Factory mergeUtilFactory;
   private final ProjectCache projectCache;
-  private final IdentifiedUser currentUser;
 
   @Inject
   RebaseChange(final ChangeControl.GenericFactory changeControlFactory,
@@ -86,8 +85,7 @@
       final RebasedPatchSetSender.Factory rebasedPatchSetSenderFactory,
       final ChangeHookRunner hooks,
       final MergeUtil.Factory mergeUtilFactory,
-      final ProjectCache projectCache,
-      final IdentifiedUser currentUser) {
+      final ProjectCache projectCache) {
     this.changeControlFactory = changeControlFactory;
     this.patchSetInfoFactory = patchSetInfoFactory;
     this.db = db;
@@ -98,7 +96,6 @@
     this.hooks = hooks;
     this.mergeUtilFactory = mergeUtilFactory;
     this.projectCache = projectCache;
-    this.currentUser = currentUser;
   }
 
   /**
@@ -156,7 +153,7 @@
           rw.parseCommit(ObjectId.fromString(baseRev));
 
       PersonIdent committerIdent =
-          currentUser.newCommitterIdent(myIdent.getWhen(),
+          uploader.newCommitterIdent(myIdent.getWhen(),
               myIdent.getTimeZone());
 
       final PatchSet newPatchSet =