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/10/08 04:17:55 UTC
[3/4] git commit: Use WebLoggerContextUtils.getServletContext().
Use WebLoggerContextUtils.getServletContext().
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/975b86a0
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/975b86a0
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/975b86a0
Branch: refs/heads/master
Commit: 975b86a0ed48ec28ac5ff308b9c5d602a823a2d2
Parents: 1a3033a
Author: Matt Sicker <ma...@apache.org>
Authored: Tue Oct 7 21:16:21 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Tue Oct 7 21:16:21 2014 -0500
----------------------------------------------------------------------
.../org/apache/logging/log4j/web/WebLookup.java | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/975b86a0/log4j-web/src/main/java/org/apache/logging/log4j/web/WebLookup.java
----------------------------------------------------------------------
diff --git a/log4j-web/src/main/java/org/apache/logging/log4j/web/WebLookup.java b/log4j-web/src/main/java/org/apache/logging/log4j/web/WebLookup.java
index 935fa1c..fb90cdd 100644
--- a/log4j-web/src/main/java/org/apache/logging/log4j/web/WebLookup.java
+++ b/log4j-web/src/main/java/org/apache/logging/log4j/web/WebLookup.java
@@ -20,33 +20,26 @@ package org.apache.logging.log4j.web;
import javax.servlet.ServletContext;
-import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.impl.ContextAnchor;
import org.apache.logging.log4j.core.lookup.AbstractLookup;
-import org.apache.logging.log4j.spi.LoggerContext;
@Plugin(name = "web", category = "Lookup")
public class WebLookup extends AbstractLookup {
private static final String ATTR_PREFIX = "attr.";
private static final String INIT_PARAM_PREFIX = "initParam.";
+ /**
+ * @deprecated Use {@link WebLoggerContextUtils#getServletContext()}.
+ */
+ @Deprecated
protected ServletContext getServletContext() {
- LoggerContext lc = ContextAnchor.THREAD_CONTEXT.get();
- if (lc == null) {
- lc = LogManager.getContext(false);
- }
- if (lc != null) {
- final Object obj = lc.getExternalContext();
- return obj != null && obj instanceof ServletContext ? (ServletContext) obj : null;
- }
- return null;
+ return WebLoggerContextUtils.getServletContext();
}
@Override
public String lookup(final LogEvent event, final String key) {
- final ServletContext ctx = getServletContext();
+ final ServletContext ctx = WebLoggerContextUtils.getServletContext();
if (ctx == null) {
return null;
}