opendev/gerrit
Code Issues Proposed changes

Use try-with-resources statements

Browse Source 
- instead of finally blocks
- in cases of missing try-finally

Change-Id: I94f481a33d8e6a3180c436245d6e95e4d525280c
This commit is contained in:
Urs Wolfer
2015-06-11 21:44:59 +02:00
parent b17ceb8587
commit 5e90c63dea
112 changed files with 727 additions and 1332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1031,13 +1031,8 @@ public class MergeOp {
@Override
public void run() {
PatchSet patchSet;
try {
ReviewDb reviewDb = schemaFactory.open();
try {
patchSet = reviewDb.patchSets().get(c.currentPatchSetId());
} finally {
reviewDb.close();
}
try (ReviewDb reviewDb = schemaFactory.open()) {
patchSet = reviewDb.patchSets().get(c.currentPatchSetId());
} catch (Exception e) {
logError("Cannot send email for submitted patch set " + c.getId(), e);
return;
@@ -1193,13 +1188,8 @@ public class MergeOp {
@Override
public void run() {
PatchSet patchSet;
try {
ReviewDb reviewDb = schemaFactory.open();
try {
patchSet = reviewDb.patchSets().get(c.currentPatchSetId());
} finally {
reviewDb.close();
}
try (ReviewDb reviewDb = schemaFactory.open()) {
patchSet = reviewDb.patchSets().get(c.currentPatchSetId());
} catch (Exception e) {
logError("Cannot send email notifications about merge failure", e);
return;