opendev/gerrit
Code Issues Proposed changes

Move change row version bump to commitMessageNotForChange()

Browse Source 
I5d7fb4cc resolved this merge conflict of the change in stable-2.9
(which did not have this helper method) in a slightly more verbose way
than necessary.

Change-Id: I1f09b712ae1a34d2c49f3507e1440373811677f9
This commit is contained in:
Dave Borowitz
2014-06-27 09:24:45 -07:00
parent 44c0d1e906
commit f1e12c70af
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
View File

@@ -201,10 +201,6 @@ public class ChangeInserter {
if(!messageIsForChange()) { if(!messageIsForChange()) {
commitMessageNotForChange(); commitMessageNotForChange();
if (changeMessage != null) {
ChangeUtil.bumpRowVersionNotLastUpdatedOn(
changeMessage.getKey().getParentKey(), db);
}
} }
gitRefUpdated.fire(change.getProject(), patchSet.getRefName(), gitRefUpdated.fire(change.getProject(), patchSet.getRefName(),
ObjectId.zeroId(), commit); ObjectId.zeroId(), commit);
@@ -236,6 +232,8 @@ public class ChangeInserter {
if (changeMessage != null) { if (changeMessage != null) {
Change otherChange = Change otherChange =
db.changes().get(changeMessage.getPatchSetId().getParentKey()); db.changes().get(changeMessage.getPatchSetId().getParentKey());
ChangeUtil.bumpRowVersionNotLastUpdatedOn(
changeMessage.getKey().getParentKey(), db);
ChangeControl otherControl = ChangeControl otherControl =
refControl.getProjectControl().controlFor(otherChange); refControl.getProjectControl().controlFor(otherChange);
ChangeUpdate updateForOtherChange = ChangeUpdate updateForOtherChange =