Skip to content

Fix guards against repeated external sets of SPI implementations #690

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

Merged
manovotn merged 1 commit into from
Aug 30, 2023
+2 −2
Merged

Fix guards against repeated external sets of SPI implementations #690

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
2 changes: 1 addition & 1 deletion 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
Expand Up @@ -82,7 +82,7 @@ public static void setBuildServices(BuildServices instance) {
if (instance == null) {
throw new IllegalArgumentException("BuildServices instance must not be null");
}
if (configuredBuildServices != null) {
if (configuredBuildServices == null) {
configuredBuildServices = instance;
} else {
throw new IllegalStateException("BuildServices cannot be set repeatedly. Existing BuildServices are " + configuredBuildServices);
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/java/jakarta/enterprise/inject/spi/CDI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public static void setCDIProvider(CDIProvider provider) {
if (provider == null) {
throw new IllegalArgumentException("CDIProvider must not be null");
}
if (configuredProvider != null) {
if (configuredProvider == null) {
providerSetManually = true;
configuredProvider = provider;
} else {
Expand Down