From 7ae25336f60a9d023bf1d6ae8cce42c1bc10a89e Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Thu, 7 Apr 2016 14:55:09 -0400 Subject: [PATCH] ChangeRebuilderImpl: Don't execute passed-in update manager When the caller has a NoteDbUpdateManager to pass in, they are responsible for the lifecycle of that object. Change-Id: I2a7830a0a0054ce175cd9599b7731744c8e3cd68 --- .../com/google/gerrit/server/notedb/ChangeRebuilderImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeRebuilderImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeRebuilderImpl.java index d6dfd7650b..d4d0cdd8de 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeRebuilderImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeRebuilderImpl.java @@ -172,10 +172,8 @@ public class ChangeRebuilderImpl extends ChangeRebuilder { OrmException, ConfigInvalidException { Change change = new Change(bundle.getChange()); buildUpdates(manager, bundle); - NoteDbChangeState newState = NoteDbChangeState.applyDelta( + return NoteDbChangeState.applyDelta( change, manager.stage().get(change.getId())); - manager.execute(); - return newState; } private void buildUpdates(NoteDbUpdateManager manager, ChangeBundle bundle)