Changeset 13061

Timestamp:

11/27/10 21:25:03 (12 years ago)

Author:

vvoutilainen

Message:

Backport r13059 and r13060 from trunk.

File:

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

branches/0.23.x/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() {
@@ -116 +116 @@
     }
     
-    public ScriptEngine getScriptEngine() {
+    public synchronized ScriptEngine getScriptEngine() {
+        if (THE_ONLY_ONE_ENGINE == null) {
+            THE_ONLY_ONE_ENGINE = new AbclScriptEngine();
+        }
   return THE_ONLY_ONE_ENGINE;
     }