Author: wang
Date: Wed Jan 29 22:40:18 2014
New Revision: 1562618
URL: http://svn.apache.org/r1562618
Log:
HADOOP-10288. Explicit reference to Log4JLogger breaks non-log4j users. Merged
from r1561880 in branch-2.
Modified:
hadoop/common/branches/branch-2.3/hadoop-common-project/ (props changed)
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-auth/
(props changed)
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/
(props changed)
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
(contents, props changed)
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/
(props changed)
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/docs/
(props changed)
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/java/
(props changed)
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpRequestLog.java
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/test/core/
(props changed)
Propchange: hadoop/common/branches/branch-2.3/hadoop-common-project/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-common-project:r1561880
Propchange: hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-auth/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth:r1561880
Propchange:
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common:r1561880
Modified:
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1562618&r1=1562617&r2=1562618&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
Wed Jan 29 22:40:18 2014
@@ -366,6 +366,9 @@ Release 2.3.0 - UNRELEASED
HADOOP-10292. Restore HttpServer from branch-2.2 in branch-2.
(Haohui Mai via suresh)
+ HADOOP-10288. Explicit reference to Log4JLogger breaks non-log4j users
+ (todd)
+
Release 2.2.0 - 2013-10-13
INCOMPATIBLE CHANGES
Propchange:
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt:r1561880
Propchange:
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src:r1561880
Propchange:
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/docs/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/docs:r1561880
Propchange:
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java:r1561880
Modified:
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpRequestLog.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpRequestLog.java?rev=1562618&r1=1562617&r2=1562618&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpRequestLog.java
(original)
+++
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpRequestLog.java
Wed Jan 29 22:40:18 2014
@@ -53,7 +53,17 @@ public class HttpRequestLog {
String appenderName = name + "requestlog";
Log logger = LogFactory.getLog(loggerName);
- if (logger instanceof Log4JLogger) {
+ boolean isLog4JLogger;;
+ try {
+ isLog4JLogger = logger instanceof Log4JLogger;
+ } catch (NoClassDefFoundError err) {
+ // In some dependent projects, log4j may not even be on the classpath at
+ // runtime, in which case the above instanceof check will throw
+ // NoClassDefFoundError.
+ LOG.debug("Could not load Log4JLogger class", err);
+ isLog4JLogger = false;
+ }
+ if (isLog4JLogger) {
Log4JLogger httpLog4JLog = (Log4JLogger)logger;
Logger httpLogger = httpLog4JLog.getLogger();
Appender appender = null;
Propchange:
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/test/core/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/core:r1561880
