Skip to content

pass the classloader in getTypeSystemOnClasspath #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pjfanning wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

pass the classloader in getTypeSystemOnClasspath #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,8 @@ SchemaTypeSystemImpl typeSystemForClassname(String searchdir, String name) {
}

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) {
Expand Down
9 changes: 9 additions & 0 deletions src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,18 @@ public static SchemaTypeSystemImpl forName(String name, ClassLoader loader) {
}

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) {
Expand Down