commit 7c9bc1dd83423b5d01f3ae796a26bb010a2ca10e
author David Pursehouse <david.pursehouse@sonymobile.com> Wed May 27 16:30:40 2015 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> Wed Mar 09 15:24:13 2016 +0900
tree 8f6ca34d66352f5345a32a003f91558754540897
parent 84b603436203afc179a9f1978a1764445d7015a9

Convert to auto-closeable Repository and RevWalk

Change-Id: If0ca0ef528ea154a69711561eb392d2ae53c02fe

src/main/java/com/googlesource/gerrit/plugins/reviewers/ChangeEventListener.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewers/ChangeEventListener.java b/src/main/java/com/googlesource/gerrit/plugins/reviewers/ChangeEventListener.java
index 861a7a9..14b6031 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewers/ChangeEventListener.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewers/ChangeEventListener.java
@@ -48,7 +48,6 @@
 import com.google.inject.Provider;
 import com.google.inject.ProvisionException;
 
-import org.eclipse.jgit.errors.RepositoryNotFoundException;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevWalk;
 import org.slf4j.Logger;
@@ -125,21 +124,10 @@
       return;
     }
 
-    Repository git;
-    try {
-      git = repoManager.openRepository(projectName);
-    } catch (RepositoryNotFoundException x) {
-      log.error(x.getMessage(), x);
-      return;
-    } catch (IOException x) {
-      log.error(x.getMessage(), x);
-      return;
-    }
+    try (Repository git = repoManager.openRepository(projectName);
+        RevWalk rw = new RevWalk(git)) {
+      final ReviewDb reviewDb;
 
-    final ReviewDb reviewDb;
-    final RevWalk rw = new RevWalk(git);
-
-    try {
       reviewDb = schemaFactory.open();
       try {
         Change.Id changeId = new Change.Id(Integer.parseInt(e.change.number));
@@ -208,11 +196,8 @@
       } finally {
         reviewDb.close();
       }
-    } catch (OrmException x) {
+    } catch (OrmException | IOException x) {
       log.error(x.getMessage(), x);
-    } finally {
-      rw.close();
-      git.close();
     }
   }