Repository: logging-log4j2 Updated Branches: refs/heads/master df810d76f -> c13e31913
Reuse Objects.toString(). Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c13e3191 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c13e3191 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c13e3191 Branch: refs/heads/master Commit: c13e31913daaa0261184fcb45b382776387383b6 Parents: df810d7 Author: ggregory <[email protected]> Authored: Wed Jul 5 13:49:16 2017 -0700 Committer: ggregory <[email protected]> Committed: Wed Jul 5 13:49:16 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/logging/log4j/core/lookup/JndiLookup.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c13e3191/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 3dbef43..30e65ad 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 @@ -16,6 +16,8 @@ */ package org.apache.logging.log4j.core.lookup; +import java.util.Objects; + import javax.naming.NamingException; import org.apache.logging.log4j.Logger; @@ -51,8 +53,7 @@ public class JndiLookup extends AbstractLookup { } final String jndiName = convertJndiName(key); try (final JndiManager jndiManager = JndiManager.getDefaultManager()) { - final Object value = jndiManager.lookup(jndiName); - return value == null ? null : String.valueOf(value); + return Objects.toString(jndiManager.lookup(jndiName), null); } catch (final NamingException e) { LOGGER.warn(LOOKUP, "Error looking up JNDI resource [{}].", jndiName, e); return null;
