commit 137910ffa92ed94ca0911bf114010f36fc7e71ae
author Romain Manni-Bucau <rmannibucau@gmail.com> Thu Aug 16 09:51:12 2018 +0200
committer Matt Benson <mbenson@apache.org> Tue Oct 16 12:28:20 2018 -0500
tree 6bc454c9dc3319d04cd6aef911d40e72fac228f8
parent 8cd26a8d86107ec40882c8192addd176883c9855

ensure TCCL is preferred over bval loader (OSGi+EE)

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 @@
     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);