Repository: bval Updated Branches: refs/heads/master e3023a4a0 -> 7f5df08d6
BVAL-165 tccl should always be preferred over class.getClassLoader since it is always possible to set it right and it enables tree classloading graphs to work (whereas the opposite breaks it by design) Project: http://git-wip-us.apache.org/repos/asf/bval/repo Commit: http://git-wip-us.apache.org/repos/asf/bval/commit/7f5df08d Tree: http://git-wip-us.apache.org/repos/asf/bval/tree/7f5df08d Diff: http://git-wip-us.apache.org/repos/asf/bval/diff/7f5df08d Branch: refs/heads/master Commit: 7f5df08d63e1e5ca9bcd2cbc16486f48cac5d449 Parents: e3023a4 Author: Romain Manni-Bucau <[email protected]> Authored: Tue Oct 30 14:41:59 2018 +0100 Committer: Romain Manni-Bucau <[email protected]> Committed: Tue Oct 30 14:41:59 2018 +0100 ---------------------------------------------------------------------- bval-jsr/src/main/java/org/apache/bval/jsr/xml/SchemaManager.java | 2 +- .../main/java/org/apache/bval/jsr/xml/ValidationMappingParser.java | 2 +- bval-jsr/src/main/java/org/apache/bval/jsr/xml/XmlUtils.java | 2 +- .../src/main/java/org/apache/bval/util/reflection/Reflection.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bval/blob/7f5df08d/bval-jsr/src/main/java/org/apache/bval/jsr/xml/SchemaManager.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/SchemaManager.java b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/SchemaManager.java index 56819fb..6650de5 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/SchemaManager.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/SchemaManager.java @@ -229,7 +229,7 @@ public class SchemaManager { } static Schema loadSchema(String resource) { - final URL schemaUrl = Reflection.loaderFromClassOrThread(XmlUtils.class).getResource(resource); + final URL schemaUrl = Reflection.loaderFromThreadOrClass(XmlUtils.class).getResource(resource); try { return SCHEMA_FACTORY.newSchema(schemaUrl); } catch (SAXException e) { http://git-wip-us.apache.org/repos/asf/bval/blob/7f5df08d/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationMappingParser.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationMappingParser.java b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationMappingParser.java index 9a03896..a3f418e 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationMappingParser.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationMappingParser.java @@ -160,7 +160,7 @@ public class ValidationMappingParser implements MetadataSource { private Class<?> loadClass(final String className) { try { - return Reflection.toClass(className, Reflection.loaderFromClassOrThread(ValidationMappingParser.class)); + return Reflection.toClass(className, Reflection.loaderFromThreadOrClass(ValidationMappingParser.class)); } catch (ClassNotFoundException ex) { throw Exceptions.create(ValidationException::new, ex, "Unable to load class: %s", className); } http://git-wip-us.apache.org/repos/asf/bval/blob/7f5df08d/bval-jsr/src/main/java/org/apache/bval/jsr/xml/XmlUtils.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/XmlUtils.java b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/XmlUtils.java index a517845..00e2933 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/XmlUtils.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/XmlUtils.java @@ -43,7 +43,7 @@ class XmlUtils { private static final SchemaFactory SCHEMA_FACTORY = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); static Schema loadSchema(String resource) { - final URL schemaUrl = Reflection.loaderFromClassOrThread(XmlUtils.class).getResource(resource); + final URL schemaUrl = Reflection.loaderFromThreadOrClass(XmlUtils.class).getResource(resource); try { return SCHEMA_FACTORY.newSchema(schemaUrl); } catch (SAXException e) { http://git-wip-us.apache.org/repos/asf/bval/blob/7f5df08d/bval-jsr/src/main/java/org/apache/bval/util/reflection/Reflection.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/util/reflection/Reflection.java b/bval-jsr/src/main/java/org/apache/bval/util/reflection/Reflection.java index ae03ba3..e8086b7 100644 --- a/bval-jsr/src/main/java/org/apache/bval/util/reflection/Reflection.java +++ b/bval-jsr/src/main/java/org/apache/bval/util/reflection/Reflection.java @@ -245,7 +245,7 @@ public class Reflection { } public static Class<?> toClass(String className) throws ClassNotFoundException { - return toClass(className, loaderFromClassOrThread(Reflection.class)); + return toClass(className, loaderFromThreadOrClass(Reflection.class)); } /**
