commit | f6df7121d2704e73c2a315a660e5cc4e12ab1ab9 | [log] [tgz] |
---|---|---|
author | David Pursehouse <david.pursehouse@sonymobile.com> | Fri Oct 09 15:07:50 2015 +0900 |
committer | David Pursehouse <david.pursehouse@sonymobile.com> | Fri Oct 09 15:07:56 2015 +0900 |
tree | b339182e16f7be37567419e128d257d765608fe2 | |
parent | 6fb010107a7dfdd6baff2b54e65fb74c933d6654 [diff] | |
parent | 691c9c9c4fa6c0a533ee8386e991a41224c87243 [diff] |
Merge branch 'stable-2.11' * stable-2.11: Fix: enable to add a user within a project's ACL using 'user/username' Change-Id: Ied7cd876f5af4eb9a4c31944b42fe61946313434
diff --git a/src/main/java/com/googlesource/gerrit/plugins/singleusergroup/SingleUserGroup.java b/src/main/java/com/googlesource/gerrit/plugins/singleusergroup/SingleUserGroup.java index 3359865..04fe7d6 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/singleusergroup/SingleUserGroup.java +++ b/src/main/java/com/googlesource/gerrit/plugins/singleusergroup/SingleUserGroup.java
@@ -162,8 +162,7 @@ List<GroupReference> matches = Lists.newArrayListWithCapacity(MAX); String a = name; String b = end(a); - ReviewDb db = schemaFactory.open(); - try { + try (ReviewDb db = schemaFactory.open()) { if (name.matches(ACCOUNT_ID_PATTERN)) { Account.Id id = new Account.Id(Integer.parseInt(name)); if (db.accounts().get(id) != null) { @@ -207,8 +206,6 @@ } return matches; - } finally { - db.close(); } } catch (OrmException err) { log.warn("Cannot suggest users", err);