Repository: logging-log4j2 Updated Branches: refs/heads/LOG4J2-1136 54a54994c -> b69cd4d48
Refactor THREADING into a constant and reuse. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b69cd4d4 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b69cd4d4 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b69cd4d4 Branch: refs/heads/LOG4J2-1136 Commit: b69cd4d4800e405ddf53c0abb0f925434f38bde1 Parents: 54a5499 Author: ggregory <[email protected]> Authored: Mon Sep 28 14:50:27 2015 -0700 Committer: ggregory <[email protected]> Committed: Mon Sep 28 14:50:27 2015 -0700 ---------------------------------------------------------------------- .../org/apache/logging/log4j/core/script/ScriptManager.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b69cd4d4/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java index f735846..9bf868f 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java @@ -35,6 +35,7 @@ import java.util.concurrent.ConcurrentMap; */ public class ScriptManager { + private static final String KEY_THREADING = "THREADING"; private static final Logger logger = StatusLogger.getLogger(); private final ScriptEngineManager manager = new ScriptEngineManager(); private final ConcurrentMap<String, ScriptRunner> scripts = new ConcurrentHashMap<>(); @@ -46,7 +47,7 @@ public class ScriptManager { StringBuilder sb = new StringBuilder(); logger.debug("Installed script engines"); for (ScriptEngineFactory factory : factories) { - String threading = (String) factory.getParameter("THREADING"); + String threading = (String) factory.getParameter(KEY_THREADING); if (threading == null) { threading = "Not Thread Safe"; } @@ -88,7 +89,7 @@ public class ScriptManager { languages); return; } - if (engine.getFactory().getParameter("THREADING") == null) { + if (engine.getFactory().getParameter(KEY_THREADING) == null) { scripts.put(script.getName(), new ThreadLocalScriptRunner(script)); } else { scripts.put(script.getName(), new MainScriptRunner(engine, script));
