Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
ReviewersResolver: Log failure to list accounts for group as error
ReviewersResolver: Don't log stack trace when group does not exist
ReviewersResolver: Emit a warning to the log when account is inactive
Update bazlets to latest stable-2.14 and switch to 2.14.8 release API
Change-Id: I36db3315f21d6a38bc3ee8951fc6ed737dc4cfc9
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewers/ReviewersResolver.java b/src/main/java/com/googlesource/gerrit/plugins/reviewers/ReviewersResolver.java
index e8218c3..cd2479a 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewers/ReviewersResolver.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewers/ReviewersResolver.java
@@ -110,11 +110,18 @@
String accountName) {
try {
Account account = accountResolver.find(accountName);
- if (account != null && account.isActive()) {
- if (uploader == null || uploader._accountId != account.getId().get()) {
- reviewers.add(account.getId());
+ if (account != null) {
+ if (account.isActive()) {
+ if (uploader == null || uploader._accountId != account.getId().get()) {
+ reviewers.add(account.getId());
+ }
+ return true;
}
- return true;
+ log.warn(
+ "For the change {} of project {}: account {} is inactive.",
+ changeNumber,
+ project,
+ accountName);
}
} catch (OrmException | IOException | ConfigInvalidException e) {
// If the account doesn't exist, find() will return null. We only
@@ -150,10 +157,9 @@
"For the change {} of project {}: reviewer {} is neither an account nor a group.",
changeNumber,
project,
- group,
- e);
+ group);
} catch (NoSuchProjectException | IOException | OrmException e) {
- log.warn(
+ log.error(
"For the change {} of project {}: failed to list accounts for group {}.",
changeNumber,
project,
