Fix NPE in toString(). Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/14e794b5 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/14e794b5 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/14e794b5
Branch: refs/heads/LOG4J2-1431 Commit: 14e794b5ff233cd1acf44997d6dacb35deed432a Parents: 9c3b8b8 Author: Gary Gregory <[email protected]> Authored: Tue Aug 22 17:31:13 2017 -0600 Committer: Gary Gregory <[email protected]> Committed: Tue Aug 22 17:31:13 2017 -0600 ---------------------------------------------------------------------- .../log4j/core/config/ConfigurationScheduler.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/14e794b5/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java index 301bea7..5341337 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java @@ -259,14 +259,16 @@ public class ConfigurationScheduler extends AbstractLifeCycle { final StringBuilder sb = new StringBuilder("ConfigurationScheduler [name="); sb.append(name); sb.append(", ["); - final Queue<Runnable> queue = ((ScheduledThreadPoolExecutor) executorService).getQueue(); - boolean first = true; - for (final Runnable runnable : queue) { - if (!first) { - sb.append(", "); + if (executorService != null) { + final Queue<Runnable> queue = ((ScheduledThreadPoolExecutor) executorService).getQueue(); + boolean first = true; + for (final Runnable runnable : queue) { + if (!first) { + sb.append(", "); + } + sb.append(runnable.toString()); + first = false; } - sb.append(runnable.toString()); - first = false; } sb.append("]"); return sb.toString();
