Skip to content

Commit cf4b39e

Browse files
committed
Port JndiContextSelector bit from main
1 parent d1e41d2 commit cf4b39e

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,18 +140,12 @@ public LoggerContext getContext(
140140
return lc;
141141
}
142142

143-
String loggingContextName = null;
144-
145-
try (final JndiManager jndiManager = JndiManager.getDefaultManager()) {
146-
loggingContextName = jndiManager.lookup(Constants.JNDI_CONTEXT_NAME);
147-
} catch (final NamingException ne) {
148-
LOGGER.error("Unable to lookup {}", Constants.JNDI_CONTEXT_NAME, ne);
149-
}
143+
String loggingContextName = getContextName();
150144

151145
return loggingContextName == null ? CONTEXT : locateContext(loggingContextName, null, configLocation);
152146
}
153147

154-
private String getContextName() {
148+
private static String getContextName() {
155149
String loggingContextName = null;
156150

157151
try (final JndiManager jndiManager = JndiManager.getDefaultManager()) {

0 commit comments

Comments
 (0)