From 4e4ff336b23191db6f0799933fb6e311634bcbce Mon Sep 17 00:00:00 2001 From: Matej Pacan Date: Mon, 17 Aug 2020 16:13:24 +0200 Subject: [PATCH] Call ScriptEngineManager with null in constructor (#27) * Call ScriptEngineManager with null in constructor * Call ScriptEngineManager with null in constructor --- .../papi/expansion/javascript/JavascriptExpansion.java | 6 +++--- .../expansion/javascript/JavascriptPlaceholdersConfig.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptExpansion.java b/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptExpansion.java index 98930a8..48a8d69 100644 --- a/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptExpansion.java +++ b/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptExpansion.java @@ -79,10 +79,10 @@ public class JavascriptExpansion extends PlaceholderExpansion implements Cacheab public boolean register() { if (globalEngine == null) { try { - globalEngine = new ScriptEngineManager().getEngineByName(getString("engine", "nashorn")); + globalEngine = new ScriptEngineManager(null).getEngineByName(getString("engine", "nashorn")); } catch (NullPointerException ex) { getPlaceholderAPI().getLogger().warning("[JavaScript Expansion] Javascript engine type was invalid! Defaulting to 'nashorn'"); - globalEngine = new ScriptEngineManager().getEngineByName("nashorn"); + globalEngine = new ScriptEngineManager(null).getEngineByName("nashorn"); } } @@ -92,7 +92,7 @@ public class JavascriptExpansion extends PlaceholderExpansion implements Cacheab if (debug) { getPlaceholderAPI().getLogger().info("[JavaScript Expansion] Java version: " + System.getProperty("java.version")); - final ScriptEngineManager manager = new ScriptEngineManager(); + final ScriptEngineManager manager = new ScriptEngineManager(null); final List factories = manager.getEngineFactories(); getPlaceholderAPI().getLogger().info("Displaying all script engine factories."); diff --git a/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptPlaceholdersConfig.java b/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptPlaceholdersConfig.java index 54e97dc..68ff294 100644 --- a/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptPlaceholdersConfig.java +++ b/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptPlaceholdersConfig.java @@ -158,7 +158,7 @@ public class JavascriptPlaceholdersConfig { engine = ex.getGlobalEngine(); } else { try { - engine = new ScriptEngineManager().getEngineByName(config.getString(identifier + ".engine", "nashorn")); + engine = new ScriptEngineManager(null).getEngineByName(config.getString(identifier + ".engine", "nashorn")); } catch (NullPointerException e) { plugin.getLogger().warning("[JavaScript Expansion] ScriptEngine type for javascript placeholder: " + identifier + " is invalid! Defaulting to global"); engine = ex.getGlobalEngine();