opendev/gerrit
Code Issues Proposed changes

Merge "Fix potential NPE in mergeOp when abandoning a change"

Browse Source
This commit is contained in:
Saša Živkov
2013-10-11 11:43:47 +00:00
committed by Gerrit Code Review
parent 9eca11e0a8 175c6478a4
commit fa30742c8d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
View File

@@ -1137,10 +1137,10 @@ public class MergeOp {
db.changeMessages().insert(Collections.singleton(msg)); db.changeMessages().insert(Collections.singleton(msg));
new ApprovalsUtil(db).syncChangeStatus(change); new ApprovalsUtil(db).syncChangeStatus(change);
db.commit(); db.commit();
indexer.index(change);
} }
} finally { } finally {
db.rollback(); db.rollback();
} }
indexer.index(change);
} }
} }