Repository: logging-log4j2 Updated Branches: refs/heads/release-2.x 4d4743b7c -> 4d76d3e34
[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/4d76d3e3 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4d76d3e3 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4d76d3e3 Branch: refs/heads/release-2.x Commit: 4d76d3e346c34ba32e12199fd70fbf68a9766142 Parents: 4d4743b Author: Gary Gregory <[email protected]> Authored: Tue Aug 28 15:21:55 2018 -0600 Committer: Gary Gregory <[email protected]> Committed: Tue Aug 28 15:21:55 2018 -0600 ---------------------------------------------------------------------- .../logging/log4j/core/config/plugins/util/PluginRegistry.java | 4 ++-- src/changes/changes.xml | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4d76d3e3/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/4d76d3e3/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 6708604..bb7eff6 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -52,6 +52,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">
