mirror/keycloak
1
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2025-12-20 14:00:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Do not rely on boot module loader for finding module dependencies

Browse Source 
The `Module.getBootModuleLoader()` API may be deprecated at some point, so use a safer alternative.

Closes #28448

Signed-off-by: David M. Lloyd <david.lloyd@redhat.com>
This commit is contained in:
David M. Lloyd
2024-04-04 12:20:43 -05:00
committed by GitHub
parent 54af571f1e
commit b5535ac970
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
adapters/oidc/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/KeycloakDependencyProcessor.java
View File

@@ -61,7 +61,10 @@ public abstract class KeycloakDependencyProcessor implements DeploymentUnitProce
}
final ModuleSpecification moduleSpecification = deploymentUnit.getAttachment(Attachments.MODULE_SPECIFICATION);
final ModuleLoader moduleLoader = Module.getBootModuleLoader();
ModuleLoader moduleLoader = Module.getCallerModuleLoader();
if (moduleLoader == null) {
moduleLoader = Module.getSystemModuleLoader();
}
addCommonModules(moduleSpecification, moduleLoader);
addPlatformSpecificModules(phaseContext, moduleSpecification, moduleLoader);
}

5
adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeycloakDependencyProcessor.java
View File

@@ -63,7 +63,10 @@ public abstract class KeycloakDependencyProcessor implements DeploymentUnitProce
// Next phase, need to detect if this is a Keycloak deployment. If not, don't add the modules.
final ModuleSpecification moduleSpecification = deploymentUnit.getAttachment(Attachments.MODULE_SPECIFICATION);
final ModuleLoader moduleLoader = Module.getBootModuleLoader();
ModuleLoader moduleLoader = Module.getCallerModuleLoader();
if (moduleLoader == null) {
moduleLoader = Module.getSystemModuleLoader();
}
addCoreModules(moduleSpecification, moduleLoader);
addCommonModules(moduleSpecification, moduleLoader);