Use try-with-resources. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/197997ac Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/197997ac Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/197997ac
Branch: refs/heads/LOG4J2-1623 Commit: 197997ac35217369cdcc881c258cfcbd5db6a258 Parents: 8245e54 Author: ggregory <ggreg...@us-l-gg02.rocketsoftware.com> Authored: Mon Oct 10 14:21:49 2016 -0700 Committer: ggregory <ggreg...@us-l-gg02.rocketsoftware.com> Committed: Mon Oct 10 14:21:49 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/logging/log4j/core/lookup/JndiLookup.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/197997ac/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JndiLookup.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JndiLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JndiLookup.java index 35c4f9d..3dbef43 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JndiLookup.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JndiLookup.java @@ -50,15 +50,12 @@ public class JndiLookup extends AbstractLookup { return null; } final String jndiName = convertJndiName(key); - final JndiManager jndiManager = JndiManager.getDefaultManager(); - try { + try (final JndiManager jndiManager = JndiManager.getDefaultManager()) { final Object value = jndiManager.lookup(jndiName); return value == null ? null : String.valueOf(value); } catch (final NamingException e) { LOGGER.warn(LOOKUP, "Error looking up JNDI resource [{}].", jndiName, e); return null; - } finally { - jndiManager.close(); } }
