Merge "Remove redundant null check in PostReview"
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java
index 4b6e72c..f4d0082 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java
@@ -146,7 +146,6 @@
input.notify = NotifyHandling.NONE;
}
- ChangeUpdate update = null;
db.get().changes().beginTransaction(revision.getChange().getId());
boolean dirty = false;
try {
@@ -154,7 +153,7 @@
ChangeUtil.updated(change);
timestamp = change.getLastUpdatedOn();
- update = updateFactory.create(revision.getControl(), timestamp);
+ ChangeUpdate update = updateFactory.create(revision.getControl(), timestamp);
update.setPatchSetId(revision.getPatchSet().getId());
dirty |= insertComments(revision, update, input.comments, input.drafts);
dirty |= updateLabels(revision, update, input.labels);
@@ -163,12 +162,10 @@
db.get().changes().update(Collections.singleton(change));
db.get().commit();
}
+ update.commit();
} finally {
db.get().rollback();
}
- if (update != null) {
- update.commit();
- }
CheckedFuture<?, IOException> indexWrite;
if (dirty) {
