Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## Unreleased

### Fixes

- Use thread context classloader when available ([#4320](https://github.com/getsentry/sentry-java/pull/4320))
- This ensures correct resource loading in environments like Spring Boot where the thread context classloader is used for resource loading.

## 8.7.0

### Features
Expand Down
7 changes: 7 additions & 0 deletions sentry/src/main/java/io/sentry/util/ClassLoaderUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@ public final class ClassLoaderUtils {
public static @NotNull ClassLoader classLoaderOrDefault(final @Nullable ClassLoader classLoader) {
// bootstrap classloader is represented as null, so using system classloader instead
if (classLoader == null) {
// try thread context classloader
final @Nullable ClassLoader contextClassLoader =
Thread.currentThread().getContextClassLoader();
if (contextClassLoader != null) {
return contextClassLoader;
}
// fallback to system classloader
return ClassLoader.getSystemClassLoader();
} else {
return classLoader;
Expand Down
Loading