Switch JSR-223 engine to use persistent local vars. Fixes #5012.

jruby · Feb 26, 2018 · 91278e7 · 91278e7
1 parent d81acb8
commit 91278e7
Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/core/src/main/java/org/jruby/embed/jsr223/JRubyEngineFactory.java b/core/src/main/java/org/jruby/embed/jsr223/JRubyEngineFactory.java
@@ -165,7 +165,7 @@ public String getProgram(String... statements) {
 
     public ScriptEngine getScriptEngine() {
         LocalContextScope scope = SystemPropertyCatcher.getScope(LocalContextScope.SINGLETON);
-        LocalVariableBehavior behavior = SystemPropertyCatcher.getBehavior(LocalVariableBehavior.GLOBAL);
+        LocalVariableBehavior behavior = SystemPropertyCatcher.getBehavior(LocalVariableBehavior.PERSISTENT);
         boolean lazy = SystemPropertyCatcher.isLazy(false);
         ScriptingContainer container = new ScriptingContainer(scope, behavior, lazy);
         SystemPropertyCatcher.setClassLoader(container);

diff --git a/core/src/test/java/org/jruby/embed/jsr223/JRubyEngineFactoryTest.java b/core/src/test/java/org/jruby/embed/jsr223/JRubyEngineFactoryTest.java
@@ -283,10 +283,10 @@ public void testEmbedIntegration() throws ScriptException {
         $this.append("first\n");
         engine.put("this", $this);
 
-        assertSame($this, engine.eval("$this"));
-        engine.eval("$this.append( \"2\n\" )");
+        assertSame($this, engine.eval("this"));
+        engine.eval("this.append( \"2\n\" )");
 
-        Object command = engine.eval("$command = $this.java_method :append, [java.lang.String]");
+        Object command = engine.eval("$command = this.java_method :append, [java.lang.String]");
 
         assertTrue( command instanceof org.jruby.RubyMethod );
         //assertEquals( "append", ((Method) command).getName() );