🐛 Close polyglot Context objects

SoftInstigate · Sep 27, 2024 · 930cb41 · 930cb41
1 parent 4779b8a
commit 930cb41
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/polyglot/src/main/java/org/restheart/polyglot/AbstractJSPlugin.java b/polyglot/src/main/java/org/restheart/polyglot/AbstractJSPlugin.java
@@ -155,7 +155,7 @@ public static void addBindings(Context ctx,
 
     /**
      *
-     * @return the Context associated with this thread. If not existing, it instanitates it.
+     * @return the Context
      */
     protected Context ctx() {
         var ret = context(engine, contextOptions);

diff --git a/polyglot/src/main/java/org/restheart/polyglot/JavaScriptService.java b/polyglot/src/main/java/org/restheart/polyglot/JavaScriptService.java
@@ -180,12 +180,14 @@ export function handle(request, response) {
      */
     @Override
     public void handle(StringRequest request, StringResponse response) {
-        ctx().eval(this.handleSource).executeVoid(request, response);
+        try (final var ctx = ctx()) {
+            ctx.eval(this.handleSource).executeVoid(request, response);
+        }
     }
 
     /**
      *
-     * @return the Context associated with this thread. If not existing, it instanitates it.
+     * @return the Context
      */
     @Override
     protected Context ctx() {

diff --git a/polyglot/src/main/java/org/restheart/polyglot/interceptors/AbstractJSInterceptor.java b/polyglot/src/main/java/org/restheart/polyglot/interceptors/AbstractJSInterceptor.java
@@ -47,8 +47,11 @@ public class AbstractJSInterceptor<R extends Request<?>, S extends Response<?>>
      * @param pluginClass
      * @param description
      * @param interceptPoint
+     * @param handleSource
      * @param mclient
-     * @param modulesReplacements
+     * @param resolveSource
+     * @param contextOptions
+     * @param config
      */
     public AbstractJSInterceptor(String name,
         String pluginClass,
@@ -73,7 +76,9 @@ public AbstractJSInterceptor(String name,
      * @param response */
     @Override
     public void handle(R request, S response) {
-        ctx().eval(this.handleSource).executeVoid(request, response);
+        try (final var ctx = ctx()) {
+            ctx.eval(this.handleSource).executeVoid(request, response);
+        }
     }
 
     @Override