Skip to content

Commit

Permalink
Handle UnsupportedClassVersionError in ServiceLoader on jdk9 (#7090)
Browse files Browse the repository at this point in the history
Hopefully resolves the issue described in
#7084
  • Loading branch information
laurit committed Nov 8, 2022
1 parent cfb475d commit 0c53d1a
Showing 1 changed file with 44 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,11 @@ public final class SafeServiceLoader {
@SuppressWarnings("ForEachIterable")
public static <T> List<T> load(Class<T> serviceClass) {
List<T> result = new ArrayList<>();
java.util.ServiceLoader<T> services = ServiceLoader.load(serviceClass);
for (Iterator<T> iter = services.iterator(); iter.hasNext(); ) {
try {
result.add(iter.next());
} catch (UnsupportedClassVersionError e) {
logger.log(FINE, "Unable to load instrumentation class: {0}", e.getMessage());
ServiceLoader<T> services = ServiceLoader.load(serviceClass);
for (Iterator<T> iterator = new SafeIterator<>(services.iterator()); iterator.hasNext(); ) {
T service = iterator.next();
if (service != null) {
result.add(service);
}
}
return result;
Expand All @@ -54,4 +53,43 @@ public static <T extends Ordered> List<T> loadOrdered(Class<T> serviceClass) {
}

private SafeServiceLoader() {}

private static class SafeIterator<T> implements Iterator<T> {
private final Iterator<T> delegate;

SafeIterator(Iterator<T> iterator) {
delegate = iterator;
}

private static void handleUnsupportedClassVersionError(
UnsupportedClassVersionError unsupportedClassVersionError) {
logger.log(
FINE,
"Unable to load instrumentation class: {0}",
unsupportedClassVersionError.getMessage());
}

@Override
public boolean hasNext() {
// jdk9 and newer throw UnsupportedClassVersionError in hasNext()
while (true) {
try {
return delegate.hasNext();
} catch (UnsupportedClassVersionError unsupportedClassVersionError) {
handleUnsupportedClassVersionError(unsupportedClassVersionError);
}
}
}

@Override
public T next() {
// jdk8 throws UnsupportedClassVersionError in next()
try {
return delegate.next();
} catch (UnsupportedClassVersionError unsupportedClassVersionError) {
handleUnsupportedClassVersionError(unsupportedClassVersionError);
return null;
}
}
}
}

0 comments on commit 0c53d1a

Please sign in to comment.