From 2abd2d35b35ad872b2b30bc3b3af531b851b514b Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Fri, 1 Aug 2014 16:06:40 -0700 Subject: [PATCH] BanCommit: Only record timezone from server identity If we really want to use the server identity from a singleton we should use a Provider, which will evaluate to the current time. However, in this case we just need the timezone for constructing an identity from the current user. Make this explicitly the only dependency. Change-Id: Iba29d2a5dddb17eb5a9803fc1bf7bbfc06e0f4d9 --- .../main/java/com/google/gerrit/server/git/BanCommit.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/BanCommit.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/BanCommit.java index 6afa5381b1..123ef0a744 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/BanCommit.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/BanCommit.java @@ -74,7 +74,7 @@ public class BanCommit { private final Provider currentUser; private final GitRepositoryManager repoManager; - private final PersonIdent gerritIdent; + private final TimeZone tz; private NotesBranchUtil.Factory notesBranchUtilFactory; @Inject @@ -84,8 +84,8 @@ public class BanCommit { final NotesBranchUtil.Factory notesBranchUtilFactory) { this.currentUser = currentUser; this.repoManager = repoManager; - this.gerritIdent = gerritIdent; this.notesBranchUtilFactory = notesBranchUtilFactory; + this.tz = gerritIdent.getTimeZone(); } public BanCommitResult ban(final ProjectControl projectControl, @@ -152,7 +152,6 @@ public class BanCommit { private PersonIdent createPersonIdent() { Date now = new Date(); - TimeZone tz = gerritIdent.getTimeZone(); return currentUser.get().newCommitterIdent(now, tz); }