Changeset 13331 in josm for trunk/src/org/openstreetmap/josm/gui/io/CustomConfigurator.java

Timestamp:

2018-01-16T00:28:24+01:00 (6 years ago)

Author:

Don-vip

Message:

see #14097, see #15783 - robustness to situations where JavaScript engine cannot be retrieved, for whatever reason

File:

• trunk/src/org/openstreetmap/josm/gui/io/CustomConfigurator.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/io/CustomConfigurator.java

@@ -26 +26 @@
 
 import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 import javax.swing.JOptionPane;
@@ -421 +420 @@
                 this.mainPrefs = mainPrefs;
                 PreferencesUtils.resetLog();
-                engine = new ScriptEngineManager(null).getEngineByName("JavaScript");
+                engine = Utils.getJavaScriptEngine();
+                if (engine == null) {
+                    throw new ScriptException("Failed to retrieve JavaScript engine");
+                }
                 engine.eval("API={}; API.pref={}; API.fragments={};");