You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2014/09/21 20:28:57 UTC
[4/4] git commit: Use default JndiManager.
Use default JndiManager.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/cc30d6dd
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/cc30d6dd
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/cc30d6dd
Branch: refs/heads/master
Commit: cc30d6dd629cbf0529ce898d6c25305b2cff9f0e
Parents: a1c6c16
Author: Matt Sicker <ma...@apache.org>
Authored: Sun Sep 21 13:28:49 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Sun Sep 21 13:28:49 2014 -0500
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/lookup/JndiLookup.java | 11 ++++-------
.../logging/log4j/core/selector/JndiContextSelector.java | 2 +-
2 files changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cc30d6dd/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 be97f1f..065c3b7 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,8 +16,6 @@
*/
package org.apache.logging.log4j.core.lookup;
-import javax.naming.Context;
-import javax.naming.InitialContext;
import javax.naming.NamingException;
import org.apache.logging.log4j.Logger;
@@ -25,7 +23,7 @@ import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.MarkerManager;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.util.JndiCloser;
+import org.apache.logging.log4j.core.net.JndiManager;
import org.apache.logging.log4j.status.StatusLogger;
/**
@@ -52,15 +50,14 @@ public class JndiLookup extends AbstractLookup {
return null;
}
final String jndiName = convertJndiName(key);
- Context ctx = null;
+ final JndiManager jndiManager = JndiManager.getDefaultManager();
try {
- ctx = new InitialContext();
- return (String) ctx.lookup(jndiName);
+ return jndiManager.lookup(jndiName);
} catch (final NamingException e) {
LOGGER.warn(LOOKUP, "Error looking up JNDI resource [{}].", jndiName, e);
return null;
} finally {
- JndiCloser.closeSilently(ctx);
+ jndiManager.release();
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cc30d6dd/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 c6f4f05..236d0f5 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,7 +108,7 @@ public class JndiContextSelector implements NamedContextSelector {
String loggingContextName = null;
- final JndiManager jndiManager = JndiManager.getDefaultManager(getClass().getName());
+ final JndiManager jndiManager = JndiManager.getDefaultManager();
try {
loggingContextName = jndiManager.lookup(Constants.JNDI_CONTEXT_NAME);
} catch (final NamingException ne) {