Fix issues with external scripts for rhinoJs

wso2 · Jul 9, 2024 · 8bbf011 · 8bbf011
1 parent c743c92
commit 8bbf011
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java
@@ -684,6 +684,8 @@ protected void initScriptEngine() {
             ScriptEngineWrapper sew;
             if (language.equals(NASHORN_JAVA_SCRIPT)) {
                 sew = new ScriptEngineWrapper(engineManager.getEngineByName(NASHORN));
+            } else if (language.equals(RHINO_JAVA_SCRIPT)) {
+                sew = new ScriptEngineWrapper(engineManager.getEngineByExtension("jsEngine"));
             } else {
                 sew = new ScriptEngineWrapper(engineManager.getEngineByExtension(language));
             }
@@ -708,6 +710,9 @@ protected void initScriptEngine() {
 
 
         this.multiThreadedEngine = scriptEngine.getFactory().getParameter("THREADING") != null;
+        if (language.equals(JAVA_SCRIPT)) {
+            this.multiThreadedEngine = true;
+        }
         log.debug("Script mediator for language : " + language +
                 " supports multithreading? : " + multiThreadedEngine);
 
@@ -759,8 +764,10 @@ public ScriptEngineWrapper getNewScriptEngine() {
         if (scriptEngineWrapper == null) {
             if (language.equals(NASHORN_JAVA_SCRIPT)) {
                 scriptEngineWrapper = new ScriptEngineWrapper(engineManager.getEngineByName(NASHORN));
+            } else if (language.equals(RHINO_JAVA_SCRIPT)) {
+                scriptEngineWrapper = new ScriptEngineWrapper(engineManager.getEngineByExtension("jsEngine"));
             } else {
-                scriptEngineWrapper = new ScriptEngineWrapper(engineManager.getEngineByExtension(GRAALVM));
+                scriptEngineWrapper = new ScriptEngineWrapper(engineManager.getEngineByExtension(language));
             }
         }
         // fall back