Changeset 13059 for trunk/abcl/src

Timestamp:

11/27/10 21:08:26 (12 years ago)

Author:

vvoutilainen

Message:

Delay the instantiation of the script engine until it's
actually requested. This will allow jsr-223 clients to
query for the engine metadata without instantiating the
engine. Reported by Martin Hepperle.

File:

• trunk/abcl/src/org/armedbear/lisp/scripting/AbclScriptEngineFactory.java (modified) (2 diffs)

trunk/abcl/src/org/armedbear/lisp/scripting/AbclScriptEngineFactory.java

@@ -30 +30 @@
 public class AbclScriptEngineFactory implements ScriptEngineFactory {
 
-    private static final AbclScriptEngine THE_ONLY_ONE_ENGINE = new AbclScriptEngine();
+    private static AbclScriptEngine THE_ONLY_ONE_ENGINE = null;
   
     public String getEngineName() {
@@ -117 +117 @@
     
     public ScriptEngine getScriptEngine() {
+        if (THE_ONLY_ONE_ENGINE == null) {
+            THE_ONLY_ONE_ENGINE = new AbclScriptEngine();
+        }
   return THE_ONLY_ONE_ENGINE;
     }