Author: fanningpj
Date: Sat Jun 6 09:12:42 2026
New Revision: 1935059
Log:
[XMLBeans-661] pass the classloader in getTypeSystemOnClasspath
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderImpl.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderImpl.java
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderImpl.java
Sat Jun 6 08:57:25 2026 (r1935058)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderImpl.java
Sat Jun 6 09:12:42 2026 (r1935059)
@@ -314,7 +314,8 @@ public class SchemaTypeLoaderImpl extend
}
SchemaTypeSystemImpl getTypeSystemOnClasspath(String name) {
- return _classpathTypeSystems.computeIfAbsent(name, n -> new
SchemaTypeSystemImpl(_resourceLoader, n, this));
+ return _classpathTypeSystems.computeIfAbsent(name,
+ n -> new SchemaTypeSystemImpl(_resourceLoader, _classLoader,
n, this));
}
SchemaTypeSystemImpl getTypeSystemOnClassloader(String name) {
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java
Sat Jun 6 08:57:25 2026 (r1935058)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java
Sat Jun 6 09:12:42 2026 (r1935059)
@@ -222,9 +222,18 @@ public class SchemaTypeSystemImpl extend
}
public SchemaTypeSystemImpl(ResourceLoader resourceLoader, String name,
SchemaTypeLoader linker) {
+ this(resourceLoader, null, name, linker);
+ }
+
+ /**
+ * @since 5.4.0
+ */
+ public SchemaTypeSystemImpl(ResourceLoader resourceLoader, ClassLoader
classLoader,
+ String name, SchemaTypeLoader linker) {
_name = name;
_linker = linker;
_resourceLoader = resourceLoader;
+ _classloader = classLoader;
try {
initFromHeader();
} catch (RuntimeException | Error e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
