Skip to content

Commit 63daacb

Browse files
committed
release 2.1.1
JSR integration returns the output as string
1 parent a834fb9 commit 63daacb

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.scriptbasic</groupId>
66
<artifactId>jscriptbasic</artifactId>
7-
<version>2.1.0</version>
7+
<version>2.1.1</version>
88
<packaging>jar</packaging>
99

1010
<scm>

src/main/java/com/scriptbasic/script/ScriptEngine.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,15 @@
66
import com.scriptbasic.interfaces.AnalysisException;
77
import com.scriptbasic.spi.Interpreter;
88

9-
import javax.script.*;
9+
import javax.script.AbstractScriptEngine;
10+
import javax.script.Bindings;
11+
import javax.script.ScriptContext;
12+
import javax.script.ScriptException;
13+
import javax.script.SimpleBindings;
1014
import java.io.Reader;
1115
import java.io.StringReader;
16+
import java.io.StringWriter;
17+
import java.io.Writer;
1218

1319
/**
1420
* @author Peter Verhas
@@ -67,10 +73,10 @@ public Object eval(final Reader reader, final ScriptContext context) throws Scri
6773
ctx.interpreter.execute();
6874
unmergeBindings(ctx.interpreter, context.getBindings(ScriptContext.ENGINE_SCOPE));
6975
unmergeBindings(ctx.interpreter, context.getBindings(ScriptContext.GLOBAL_SCOPE));
76+
return context.getWriter().toString();
7077
} catch (final ScriptBasicException | AnalysisException e) {
7178
throw new ScriptException(e);
7279
}
73-
return null;
7480
}
7581

7682
/*

0 commit comments

Comments
 (0)