Skip to content
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

[EJBCLIENT-539] wrap the call to ContextManager.setGlobalDefaultSupplier with privileged block #736

Merged
merged 1 commit into from
Oct 16, 2024
Merged

[EJBCLIENT-539] wrap the call to ContextManager.setGlobalDefaultSupplier with privileged block #736

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
44 changes: 24 additions & 20 deletions src/main/java/org/jboss/ejb/client/legacy/JBossEJBProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,32 +120,36 @@ public final class JBossEJBProperties implements Contextual<JBossEJBProperties>

static {
final AtomicReference<JBossEJBProperties> onceRef = new AtomicReference<>();
CONTEXT_MANAGER.setGlobalDefaultSupplier(() -> {
JBossEJBProperties value = onceRef.get();
if (value == null) {
synchronized (onceRef) {
value = onceRef.get();
if (value == null) {
try {
if (CONFIGURED_PATH_NAME != null) try {
File propertiesFile = new File(CONFIGURED_PATH_NAME);
if (! propertiesFile.isAbsolute()) {
propertiesFile = new File(SecurityUtils.getString(SystemProperties.USER_DIR), propertiesFile.toString());
doPrivileged((PrivilegedAction<Void>) () -> {
CONTEXT_MANAGER.setGlobalDefaultSupplier(() -> {
JBossEJBProperties value = onceRef.get();
if (value == null) {
synchronized (onceRef) {
value = onceRef.get();
if (value == null) {
try {
if (CONFIGURED_PATH_NAME != null) try {
File propertiesFile = new File(CONFIGURED_PATH_NAME);
if (!propertiesFile.isAbsolute()) {
propertiesFile = new File(SecurityUtils.getString(SystemProperties.USER_DIR), propertiesFile.toString());
}
value = JBossEJBProperties.fromFile(propertiesFile);
} catch (IOException e) {
Logs.MAIN.failedToFindEjbClientConfigFileSpecifiedBySysProp(SystemProperties.PROPERTIES_FILE_PATH, e);
value = JBossEJBProperties.fromClassPath();
}
else {
value = JBossEJBProperties.fromClassPath();
}
value = JBossEJBProperties.fromFile(propertiesFile);
} catch (IOException e) {
Logs.MAIN.failedToFindEjbClientConfigFileSpecifiedBySysProp(SystemProperties.PROPERTIES_FILE_PATH, e);
value = JBossEJBProperties.fromClassPath();
} else {
value = JBossEJBProperties.fromClassPath();
}
} catch (IOException e) {
onceRef.set(value);
}
onceRef.set(value);
}
}
}
return value;
return value;
});
return null; // PrivilegedAction<Void> requires a return value
});
}

Expand Down
Loading