You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bval.apache.org by rm...@apache.org on 2018/08/16 07:51:40 UTC
bval git commit: ensure TCCL is preferred over bval loader (OSGi+EE)
Repository: bval
Updated Branches:
refs/heads/bv2 798012ead -> 95560258f
ensure TCCL is preferred over bval loader (OSGi+EE)
Project: http://git-wip-us.apache.org/repos/asf/bval/repo
Commit: http://git-wip-us.apache.org/repos/asf/bval/commit/95560258
Tree: http://git-wip-us.apache.org/repos/asf/bval/tree/95560258
Diff: http://git-wip-us.apache.org/repos/asf/bval/diff/95560258
Branch: refs/heads/bv2
Commit: 95560258f610deea158edd3df83b1166d070cb12
Parents: 798012e
Author: Romain Manni-Bucau <rm...@gmail.com>
Authored: Thu Aug 16 09:51:12 2018 +0200
Committer: Romain Manni-Bucau <rm...@gmail.com>
Committed: Thu Aug 16 09:51:12 2018 +0200
----------------------------------------------------------------------
.../main/java/org/apache/bval/jsr/ConfigurationImpl.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bval/blob/95560258/bval-jsr/src/main/java/org/apache/bval/jsr/ConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/ConfigurationImpl.java b/bval-jsr/src/main/java/org/apache/bval/jsr/ConfigurationImpl.java
index 20ac2f8..aac4824 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/ConfigurationImpl.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/ConfigurationImpl.java
@@ -411,14 +411,20 @@ public class ConfigurationImpl implements ApacheValidatorConfiguration, Configur
private BootstrapConfiguration createBootstrapConfiguration() {
try {
if (!ignoreXmlConfiguration) {
- loader = ValidationParser.class.getClassLoader();
+ loader = Thread.currentThread().getContextClassLoader();
+ if (loader == null) {
+ loader = ValidationParser.class.getClassLoader();
+ }
final BootstrapConfiguration xmlBootstrap =
ValidationParser.processValidationConfig(getProperties().get(Properties.VALIDATION_XML_PATH), this);
if (xmlBootstrap != null) {
return xmlBootstrap;
}
}
- loader = ApacheValidatorFactory.class.getClassLoader();
+ loader = Thread.currentThread().getContextClassLoader();
+ if (loader == null) {
+ loader = ApacheValidatorFactory.class.getClassLoader();
+ }
return BootstrapConfigurationImpl.DEFAULT;
} finally {
participantFactory = new ParticipantFactory(loader);