Repository: logging-log4j2 Updated Branches: refs/heads/master 5cb719b5d -> a40ce5818
Use try-with-resources instead of closing in a finally block. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a40ce581 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a40ce581 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a40ce581 Branch: refs/heads/master Commit: a40ce58184c653e040782e8bd09219e0d4291703 Parents: 5cb719b Author: ggregory <[email protected]> Authored: Wed Jul 5 13:30:47 2017 -0700 Committer: ggregory <[email protected]> Committed: Wed Jul 5 13:30:47 2017 -0700 ---------------------------------------------------------------------- .../apache/logging/log4j/core/selector/JndiContextSelector.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a40ce581/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java ---------------------------------------------------------------------- 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 index 87709f0..f6d5c6a 100644 --- 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 @@ -108,13 +108,10 @@ public class JndiContextSelector implements NamedContextSelector { String loggingContextName = null; - final JndiManager jndiManager = JndiManager.getDefaultManager(); - try { + 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); - } finally { - jndiManager.close(); } return loggingContextName == null ? CONTEXT : locateContext(loggingContextName, null, configLocation);
