Repository: logging-log4j2
Updated Branches:
  refs/heads/master 6d1fc5309 -> 7333573d9


[LOG4J2-2422] Handle some unchecked exceptions while loading plugins.

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

Branch: refs/heads/master
Commit: 7333573d9dd34ec9a0664f2115a0fce432783433
Parents: 6d1fc53
Author: Gary Gregory <[email protected]>
Authored: Tue Aug 28 15:25:34 2018 -0600
Committer: Gary Gregory <[email protected]>
Committed: Tue Aug 28 15:25:34 2018 -0600

----------------------------------------------------------------------
 .../logging/log4j/core/config/plugins/util/PluginRegistry.java | 4 ++--
 src/changes/changes.xml                                        | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7333573d/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginRegistry.java
----------------------------------------------------------------------
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginRegistry.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginRegistry.java
index a657f1a..99fa610 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginRegistry.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginRegistry.java
@@ -184,8 +184,8 @@ public class PluginRegistry {
                     ++pluginCount;
                 } catch (final ClassNotFoundException e) {
                     LOGGER.info("Plugin [{}] could not be loaded due to 
missing classes.", className, e);
-                } catch (final VerifyError e) {
-                    LOGGER.info("Plugin [{}] could not be loaded due to 
verification error.", className, e);
+                } catch (final LinkageError e) {
+                    LOGGER.info("Plugin [{}] could not be loaded due to 
linkage error.", className, e);
                 }
             }
         }

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7333573d/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 59c0643..e7652f9 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -242,6 +242,9 @@
       <action issue="LOG4J2-2418" dev="ggregory" type="fix" due-to="Jonas 
Rutishauser">
         NullPointerException when closing never used 
RollingRandomAccessFileAppender.
       </action>
+      <action issue="LOG4J2-2422" dev="ggregory" type="fix" due-to="rswart, 
Gary Gregory">
+        Handle some unchecked exceptions while loading plugins.
+      </action>
     </release>
     <release version="2.11.2" date="2018-MM-DD" description="GA Release 
2.11.2">
       <action issue="LOG4J2-2391" dev="ckozak" type="update">
@@ -265,6 +268,9 @@
       <action issue="LOG4J2-2418" dev="ggregory" type="fix" due-to="Jonas 
Rutishauser">
         NullPointerException when closing never used 
RollingRandomAccessFileAppender.
       </action>
+      <action issue="LOG4J2-2422" dev="ggregory" type="fix" due-to="rswart, 
Gary Gregory">
+        Handle some unchecked exceptions while loading plugins.
+      </action>
     </release>
     <release version="2.11.1" date="2018-07-22" description="GA Release 
2.11.1">
       <action issue="LOG4J2-2389" dev="rgoers" type="fix" due-to="Liu Wen">

Reply via email to