You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2016/09/20 19:17:28 UTC
logging-log4j2 git commit: [LOG4J2-1601 ]NPE due to
org.apache.logging.log4j.core.layout.ScriptPatternSelector.createSelector(AbstractScript,
PatternMatch[], String, boolean, boolean, Configuration).
Repository: logging-log4j2
Updated Branches:
refs/heads/master 0aae2f16a -> c27136aad
[LOG4J2-1601 ]NPE due to
org.apache.logging.log4j.core.layout.ScriptPatternSelector.createSelector(AbstractScript,
PatternMatch[], String, boolean, boolean, Configuration).
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c27136aa
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c27136aa
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c27136aa
Branch: refs/heads/master
Commit: c27136aad09ae0bf3c46605b6e9508056a06c5a3
Parents: 0aae2f1
Author: Gary Gregory <gg...@apache.org>
Authored: Tue Sep 20 12:17:25 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Tue Sep 20 12:17:25 2016 -0700
----------------------------------------------------------------------
.../apache/logging/log4j/core/layout/ScriptPatternSelector.java | 1 +
src/changes/changes.xml | 3 +++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c27136aa/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java
index b74f3b1..7f926b7 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java
@@ -120,6 +120,7 @@ public class ScriptPatternSelector implements PatternSelector {
}
if (properties == null || properties.length == 0) {
LOGGER.warn("No marker patterns were provided");
+ return null;
}
return new ScriptPatternSelector(script, properties, defaultPattern, alwaysWriteExceptions, noConsoleNoAnsi, config);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c27136aa/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index b99b309..53fbf35 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -162,6 +162,9 @@
<action issue="LOG4J2-1600" dev="ggregory" type="fix">
NPE due to org.apache.logging.log4j.core.layout.MarkerPatternSelector.createSelector(PatternMatch[], String, boolean, boolean, Configuration).
</action>
+ <action issue="LOG4J2-1601" dev="ggregory" type="fix">
+ NPE due to org.apache.logging.log4j.core.layout.ScriptPatternSelector.createSelector(AbstractScript, PatternMatch[], String, boolean, boolean, Configuration).
+ </action>
<action issue="LOG4J2-1578" dev="ggregory" type="add">
RoutingAppender can be configured with scripts. Add Script in a Routes element.
</action>