Repository: logging-log4j2
Updated Branches:
  refs/heads/master 60bcf168d -> 33765882b


[LOG4J2-1597] Fix NPEs.

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

Branch: refs/heads/master
Commit: 33765882bddfd34f8d2913612d3bc2bda9f35e40
Parents: 60bcf16
Author: Gary Gregory <ggreg...@apache.org>
Authored: Tue Sep 20 11:56:23 2016 -0700
Committer: Gary Gregory <ggreg...@apache.org>
Committed: Tue Sep 20 11:56:23 2016 -0700

----------------------------------------------------------------------
 .../logging/log4j/core/appender/ScriptAppenderSelector.java      | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/33765882/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptAppenderSelector.java
----------------------------------------------------------------------
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptAppenderSelector.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptAppenderSelector.java
index ae6da0a..7782b96 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptAppenderSelector.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptAppenderSelector.java
@@ -63,15 +63,19 @@ public class ScriptAppenderSelector extends 
AbstractAppender {
         public Appender build() {
             if (name == null) {
                 LOGGER.error("Name missing.");
+                return null;
             }
             if (script == null) {
                 LOGGER.error("Script missing for ScriptAppenderSelector 
appender {}", name);
+                return null;
             }
             if (appenderSet == null) {
                 LOGGER.error("AppenderSet missing for ScriptAppenderSelector 
appender {}", name);
+                return null;
             }
             if (configuration == null) {
                 LOGGER.error("Configuration missing for ScriptAppenderSelector 
appender {}", name);
+                return null;
             }
             final ScriptManager scriptManager = 
configuration.getScriptManager();
             scriptManager.addScript(script);

Reply via email to