You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2021/10/25 15:59:19 UTC
[jackrabbit-filevault] branch master updated: trivial: improve
logging of validator exceptions
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
The following commit(s) were added to refs/heads/master by this push:
new fead49a trivial: improve logging of validator exceptions
new e248893 Merge branch 'master' of git@github.com:apache/jackrabbit-filevault.git
fead49a is described below
commit fead49a63775ec173dd1a03da977ec71f6aefd22
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Mon Oct 25 17:58:45 2021 +0200
trivial: improve logging of validator exceptions
---
.../vault/validation/ValidationExecutorFactory.java | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/ValidationExecutorFactory.java b/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/ValidationExecutorFactory.java
index f729368..732d124 100644
--- a/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/ValidationExecutorFactory.java
+++ b/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/ValidationExecutorFactory.java
@@ -99,20 +99,24 @@ public final class ValidationExecutorFactory {
settings = new ValidatorSettingsImpl();
}
if (!settings.isDisabled()) {
- Validator validator = validatorFactory.createValidator(context, settings);
- if (validator != null) {
- Validator oldValidator = validatorsById.putIfAbsent(validatorId, validator);
- if (oldValidator != null) {
- log.error("Found validators with duplicate id " + validatorId + ": " + oldValidator.getClass().getName() + " and " + validator.getClass().getName() + "(Duplicate, not considered)");
+ try {
+ Validator validator = validatorFactory.createValidator(context, settings);
+ if (validator != null) {
+ Validator oldValidator = validatorsById.putIfAbsent(validatorId, validator);
+ if (oldValidator != null) {
+ log.error("Found validators with duplicate id {}: {} and {} (Duplicate, not considered)", validatorId, oldValidator.getClass().getName(), validator.getClass().getName());
+ }
}
+ } catch (RuntimeException e) {
+ throw new IllegalStateException("Could not create validator " + validatorId + " : " + e.getMessage(), e);
}
} else {
- log.debug("Skip disabled validator " + validatorId);
+ log.debug("Skip disabled validator {}", validatorId);
}
}
}
if (!validatorSettingsIds.isEmpty() && !isSubPackage) {
- log.warn("There are validator settings bound to invalid ids " + StringUtils.join(validatorSettingsIds, ", "));
+ log.warn("There are validator settings bound to invalid ids {}", StringUtils.join(validatorSettingsIds, ", "));
}
return validatorsById;
}