Skip to content

Fix loading BuildServices for OSGi #616

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

Closed
arjantijms wants to merge 1 commit into from
Closed

Fix loading BuildServices for OSGi #616

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
9 changes: 7 additions & 2 deletions api/src/main/java/jakarta/enterprise/inject/build/compatible/spi/BuildServicesResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Red Hat and others
* Copyright (c) 2021, 2022 Red Hat and others
*
* This program and the accompanying materials are made available under the
* Apache Software License 2.0 which is available at:
Expand Down Expand Up @@ -45,10 +45,15 @@ private static void discoverFactories() {
Comparator.comparingInt(BuildServices::getPriority).reversed());

ServiceLoader<BuildServices> loader = SecurityActions.loadService(
BuildServices.class, Thread.currentThread().getContextClassLoader());

if (!loader.iterator().hasNext()) {
loader = SecurityActions.loadService(
BuildServices.class, BuildServicesResolver.class.getClassLoader());
}

if (!loader.iterator().hasNext()) {
throw new IllegalStateException("Unable to locate AnnotationBuilderFactory implementation");
throw new IllegalStateException("Unable to locate BuildServices implementation");
}

try {
Expand Down