Port JndiContextSelector bit from main

apache · Jan 10, 2024 · cf4b39e · cf4b39e
1 parent d1e41d2
commit cf4b39e
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java
@@ -140,18 +140,12 @@ public LoggerContext getContext(
             return lc;
         }
 
-        String loggingContextName = null;
-
-        try (final JndiManager jndiManager = JndiManager.getDefaultManager()) {
-            loggingContextName = jndiManager.lookup(Constants.JNDI_CONTEXT_NAME);
-        } catch (final NamingException ne) {
-            LOGGER.error("Unable to lookup {}", Constants.JNDI_CONTEXT_NAME, ne);
-        }
+        String loggingContextName = getContextName();
 
         return loggingContextName == null ? CONTEXT : locateContext(loggingContextName, null, configLocation);
     }
 
-    private String getContextName() {
+    private static String getContextName() {
         String loggingContextName = null;
 
         try (final JndiManager jndiManager = JndiManager.getDefaultManager()) {