You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2017/04/11 16:08:08 UTC

logging-log4j2 git commit: LOG4J2-1876 More reliable checking for runtime dependencies

Repository: logging-log4j2
Updated Branches:
  refs/heads/master 4d6be7bef -> b04e5a7ee


LOG4J2-1876 More reliable checking for runtime dependencies


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b04e5a7e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b04e5a7e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b04e5a7e

Branch: refs/heads/master
Commit: b04e5a7eed22a9f1e66c1a378bec6c2d57cd1cbf
Parents: 4d6be7b
Author: Mikael St�ldal <mi...@magine.com>
Authored: Tue Apr 11 18:07:58 2017 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Tue Apr 11 18:07:58 2017 +0200

----------------------------------------------------------------------
 .../src/main/java/org/apache/logging/log4j/util/LoaderUtil.java   | 2 +-
 src/changes/changes.xml                                           | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b04e5a7e/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
index 2553e13..2f8a402 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
@@ -114,7 +114,7 @@ public final class LoaderUtil {
         try {
             final Class<?> clazz = loadClass(className);
             return clazz != null;
-        } catch (final ClassNotFoundException e) {
+        } catch (final ClassNotFoundException | LinkageError e) {
             return false;
         } catch (final Throwable e) {
             LowLevelLogUtil.logException("Unknown error checking for existence of class: " + className, e);

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b04e5a7e/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index ab3a5b0..325dbbb 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -31,6 +31,9 @@
          - "remove" - Removed
     -->
     <release version="2.9.0" date="2017-MM-DD" description="GA Release 2.9.0">
+      <action issue="LOG4J2-1876" dev="mikes" type="fix">
+        More reliable checking for runtime dependencies.
+      </action>
       <action issue="LOG4J2-1851" dev="mikes" type="update">
         Move server components from log4j-core to new log4-server module.
       </action>