Return-Path: <commits-return-60277-archive-asf-public=cust-asf.ponee.io@commons.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 9ADC1200D59
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Sun, 10 Dec 2017 15:33:12 +0100 (CET)
Received: by cust-asf.ponee.io (Postfix)
	id 99561160C09; Sun, 10 Dec 2017 14:33:12 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id DE941160C00
	for <archive-asf-public@cust-asf.ponee.io>; Sun, 10 Dec 2017 15:33:11 +0100 (CET)
Received: (qmail 2217 invoked by uid 500); 10 Dec 2017 14:33:11 -0000
Mailing-List: contact commits-help@commons.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@commons.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@commons.apache.org>
List-Post: <mailto:commits@commons.apache.org>
List-Id: <commits.commons.apache.org>
Reply-To: dev@commons.apache.org
Delivered-To: mailing list commits@commons.apache.org
Received: (qmail 2208 invoked by uid 99); 10 Dec 2017 14:33:10 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 10 Dec 2017 14:33:10 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id BBA5BE038B; Sun, 10 Dec 2017 14:33:08 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: ate@apache.org
To: commits@commons.apache.org
Message-Id: <8b582bfadf4f4e9fa5895eee599d19b0@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: commons-scxml git commit: SCXML-263 Javascript engine (Nashorn)
 cannot be shared between multiple SCXML instance executions
Date: Sun, 10 Dec 2017 14:33:08 +0000 (UTC)
archived-at: Sun, 10 Dec 2017 14:33:12 -0000

Repository: commons-scxml
Updated Branches:
  refs/heads/master 8da7f06a6 -> b5dd05b28


SCXML-263 Javascript engine (Nashorn) cannot be shared between multiple SCXML instance executions


Project: http://git-wip-us.apache.org/repos/asf/commons-scxml/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-scxml/commit/b5dd05b2
Tree: http://git-wip-us.apache.org/repos/asf/commons-scxml/tree/b5dd05b2
Diff: http://git-wip-us.apache.org/repos/asf/commons-scxml/diff/b5dd05b2

Branch: refs/heads/master
Commit: b5dd05b28613314e66cbd20906daf40424433331
Parents: 8da7f06
Author: Ate Douma <ate@apache.org>
Authored: Sun Dec 10 15:33:02 2017 +0100
Committer: Ate Douma <ate@apache.org>
Committed: Sun Dec 10 15:33:02 2017 +0100

----------------------------------------------------------------------
 src/changes/changes.xml                           |  4 ++++
 .../scxml2/env/javascript/JSEvaluator.java        | 18 ++++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-scxml/blob/b5dd05b2/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 369626e..f5c434c 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -35,6 +35,10 @@
     <release version="2.0" date="In Git master"
       description="Latest unreleased code">
 
+      <action dev="ate" type="update" issue="SCXML-263">
+        [12-10-2017] Javascript engine (Nashorn) cannot be shared between multiple SCXML instance executions
+      </action>
+
       <action dev="ate" type="update" issue="SCXML-262">
         [12-10-2017] Support &lt;script&gt; loaded from external src
       </action>

http://git-wip-us.apache.org/repos/asf/commons-scxml/blob/b5dd05b2/src/main/java/org/apache/commons/scxml2/env/javascript/JSEvaluator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/scxml2/env/javascript/JSEvaluator.java b/src/main/java/org/apache/commons/scxml2/env/javascript/JSEvaluator.java
index 66f829c..b007b62 100644
--- a/src/main/java/org/apache/commons/scxml2/env/javascript/JSEvaluator.java
+++ b/src/main/java/org/apache/commons/scxml2/env/javascript/JSEvaluator.java
@@ -94,8 +94,8 @@ public class JSEvaluator extends AbstractBaseEvaluator {
     private static final String ERR_CTX_TYPE = "Error evaluating JavaScript "
             + "expression, Context must be a org.apache.commons.scxml2.env.javascript.JSContext";
 
-    /** shared singleton Nashorn ScriptEngine **/
-    private static ScriptEngine engine;
+    /** Nashorn ScriptEngine **/
+    private transient ScriptEngine engine;
 
     /** Nashorn Global initialization script, loaded from <code>init_global.js</code> classpath resource */
     private static String initGlobalsScript;
@@ -112,14 +112,16 @@ public class JSEvaluator extends AbstractBaseEvaluator {
      * initialization of a new Javascript (Nashorn) Global.
      * </p>
      */
-    protected synchronized static void initEngine() {
+    protected synchronized void initEngine() {
         if (engine == null) {
             engine = new ScriptEngineManager().getEngineByName("JavaScript");
-            try {
-                initGlobalsScript = IOUtils.toString(JSEvaluator.class.getResourceAsStream("init_global.js"), "UTF-8");
-            }
-            catch (IOException ioe) {
-                throw new RuntimeException("Failed to load init_global.js from classpath", ioe);
+            if (initGlobalsScript == null) {
+                try {
+                    initGlobalsScript = IOUtils.toString(JSEvaluator.class.getResourceAsStream("init_global.js"), "UTF-8");
+                }
+                catch (IOException ioe) {
+                    throw new RuntimeException("Failed to load init_global.js from classpath", ioe);
+                }
             }
         }
     }