Skip to content

JNDI enablement properties are loaded at most once #650

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
carterkozak merged 1 commit into from
Dec 22, 2021
Merged

JNDI enablement properties are loaded at most once #650

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
10 changes: 7 additions & 3 deletions log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ public class JndiManager extends AbstractManager {
private static final String PREFIX = "log4j2.enableJndi";
private static final String JAVA_SCHEME = "java";

private static final boolean JNDI_CONTEXT_SELECTOR_ENABLED = isJndiEnabled("ContextSelector");
private static final boolean JNDI_JMS_ENABLED = isJndiEnabled("Jms");
private static final boolean JNDI_LOOKUP_ENABLED = isJndiEnabled("Lookup");

private final InitialContext context;

private static boolean isJndiEnabled(final String subKey) {
Expand All @@ -53,15 +57,15 @@ public static boolean isJndiEnabled() {
}

public static boolean isJndiContextSelectorEnabled() {
return isJndiEnabled("ContextSelector");
return JNDI_CONTEXT_SELECTOR_ENABLED;
}

public static boolean isJndiJmsEnabled() {
return isJndiEnabled("Jms");
return JNDI_JMS_ENABLED;
}

public static boolean isJndiLookupEnabled() {
return isJndiEnabled("Lookup");
return JNDI_LOOKUP_ENABLED;
}

private JndiManager(final String name, final InitialContext context) {
Expand Down