This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a commit to branch branch-3.2.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.2.3 by this push:
new 0729583 HADOOP-16717. Remove GenericsUtil isLog4jLogger dependency on
Log4jLoggerAdapter. Contributed by Xieming Li.
0729583 is described below
commit 072958324c987bfbe12056e972c8f642b4ce5d22
Author: Akira Ajisaka <[email protected]>
AuthorDate: Mon Nov 25 14:36:27 2019 +0900
HADOOP-16717. Remove GenericsUtil isLog4jLogger dependency on
Log4jLoggerAdapter. Contributed by Xieming Li.
(cherry picked from commit da9435182a8fccec743406e089325655138d9de8)
(cherry picked from commit 06a2e4ccded279381ce65add79e926e6d2679fc0)
---
.../src/main/java/org/apache/hadoop/util/GenericsUtil.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericsUtil.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericsUtil.java
index a53096a..0aba348 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericsUtil.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericsUtil.java
@@ -25,7 +25,6 @@ import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.slf4j.impl.Log4jLoggerAdapter;
/**
* Contains utility methods for dealing with Java Generics.
@@ -85,6 +84,11 @@ public class GenericsUtil {
return false;
}
Logger log = LoggerFactory.getLogger(clazz);
- return log instanceof Log4jLoggerAdapter;
+ try {
+ Class log4jClass = Class.forName("org.slf4j.impl.Log4jLoggerAdapter");
+ return log4jClass.isInstance(log);
+ } catch (ClassNotFoundException e) {
+ return false;
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
