mirror/Javascript-Expansion
1
0
Fork 1
mirror of https://github.com/PlaceholderAPI/Javascript-Expansion.git synced 2025-05-23 10:39:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Call ScriptEngineManager with null in constructor (#27)

Browse Source 
* Call ScriptEngineManager with null in constructor

* Call ScriptEngineManager with null in constructor
This commit is contained in:
Matej Pacan 2020-08-17 16:13:24 +02:00 committed by GitHub
parent 538c116410
commit 4e4ff336b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptExpansion.java
View File

@ -79,10 +79,10 @@ public class JavascriptExpansion extends PlaceholderExpansion implements Cacheab
public boolean register() { public boolean register() {
if (globalEngine == null) { if (globalEngine == null) {
try { try {
globalEngine = new ScriptEngineManager().getEngineByName(getString("engine", "nashorn")); globalEngine = new ScriptEngineManager(null).getEngineByName(getString("engine", "nashorn"));
} catch (NullPointerException ex) { } catch (NullPointerException ex) {
getPlaceholderAPI().getLogger().warning("[JavaScript Expansion] Javascript engine type was invalid! Defaulting to 'nashorn'"); 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) { if (debug) {
getPlaceholderAPI().getLogger().info("[JavaScript Expansion] Java version: " + System.getProperty("java.version")); getPlaceholderAPI().getLogger().info("[JavaScript Expansion] Java version: " + System.getProperty("java.version"));
final ScriptEngineManager manager = new ScriptEngineManager(); final ScriptEngineManager manager = new ScriptEngineManager(null);
final List<ScriptEngineFactory> factories = manager.getEngineFactories(); final List<ScriptEngineFactory> factories = manager.getEngineFactories();
getPlaceholderAPI().getLogger().info("Displaying all script engine factories."); getPlaceholderAPI().getLogger().info("Displaying all script engine factories.");

2
src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptPlaceholdersConfig.java
View File

@ -158,7 +158,7 @@ public class JavascriptPlaceholdersConfig {
engine = ex.getGlobalEngine(); engine = ex.getGlobalEngine();
} else { } else {
try { try {
engine = new ScriptEngineManager().getEngineByName(config.getString(identifier + ".engine", "nashorn")); engine = new ScriptEngineManager(null).getEngineByName(config.getString(identifier + ".engine", "nashorn"));
} catch (NullPointerException e) { } catch (NullPointerException e) {
plugin.getLogger().warning("[JavaScript Expansion] ScriptEngine type for javascript placeholder: " + identifier + " is invalid! Defaulting to global"); plugin.getLogger().warning("[JavaScript Expansion] ScriptEngine type for javascript placeholder: " + identifier + " is invalid! Defaulting to global");
engine = ex.getGlobalEngine(); engine = ex.getGlobalEngine();