Do not use javax.naming namespace in the catch block, so that Logback can be used without requiring the javax.naming module (#1004)

Maran23 · web-flow · commit 00d272f6aeb8 · 2026-01-23T19:16:46.000+01:00
The InsertFromJNDIModelHandler is usually created when using Logback, but only used when JNDI is used in the logging configuration. Catching the javax.naming.NamingException will automatically resolve the class when the InsertFromJNDIModelHandler class is used, throwing an exception when it is not present.

By catching the generic Exception, unless JNDI or SMTP are used, the javax.naming module is not required now.

Signed-off-by: Marius Hanl &lt;mariushanl@web.de&gt;
diff --git a/logback-core/src/main/java/ch/qos/logback/core/model/processor/InsertFromJNDIModelHandler.java b/logback-core/src/main/java/ch/qos/logback/core/model/processor/InsertFromJNDIModelHandler.java
@@ -1,7 +1,5 @@
 package ch.qos.logback.core.model.processor;
 
-import javax.naming.NamingException;
-
 import ch.qos.logback.core.Context;
 import ch.qos.logback.core.joran.action.ActionUtil;
 import ch.qos.logback.core.joran.action.ActionUtil.Scope;
@@ -72,7 +70,7 @@ public void detachedHandle(ContextAwarePropertyContainer capc, InsertFromJNDIMod
                 addInfo("Setting variable [" + asKey + "] to [" + envEntryValue + "] in [" + scope + "] scope");
                 PropertyModelHandlerHelper.setProperty(capc, asKey, envEntryValue, scope);
             }
-        } catch (NamingException e) {
+        } catch (Exception e) {
             addError("Failed to lookup JNDI env-entry [" + envEntryName + "]");
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`package ch.qos.logback.core.model.processor;`
`2`	`2`
`3`		`-import javax.naming.NamingException;`
`4`		`-`
`5`	`3`	`import ch.qos.logback.core.Context;`
`6`	`4`	`import ch.qos.logback.core.joran.action.ActionUtil;`
`7`	`5`	`import ch.qos.logback.core.joran.action.ActionUtil.Scope;`
`@@ -72,7 +70,7 @@ public void detachedHandle(ContextAwarePropertyContainer capc, InsertFromJNDIMod`
`72`	`70`	`addInfo("Setting variable [" + asKey + "] to [" + envEntryValue + "] in [" + scope + "] scope");`
`73`	`71`	`PropertyModelHandlerHelper.setProperty(capc, asKey, envEntryValue, scope);`
`74`	`72`	`}`
`75`		`- } catch (NamingException e) {`
	`73`	`+ } catch (Exception e) {`
`76`	`74`	`addError("Failed to lookup JNDI env-entry [" + envEntryName + "]");`
`77`	`75`	`}`
`78`	`76`