Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6e6b1a40 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6e6b1a40 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6e6b1a40 Branch: refs/heads/master Commit: 6e6b1a4027d2129094359019461cfe5c02d5b078 Parents: c04f191 fa2eebc Author: Stephen Mallette <sp...@genoprime.com> Authored: Fri Aug 18 22:22:50 2017 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Fri Aug 18 22:22:50 2017 -0400 ---------------------------------------------------------------------- .../gremlin/hadoop/structure/io/script/ScriptRecordReader.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6e6b1a40/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java ---------------------------------------------------------------------- diff --cc hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java index 7dd4e2b,f119baf..16bc057 --- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java +++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java @@@ -84,10 -87,10 +84,10 @@@ public final class ScriptRecordReader e final FileSystem fs = FileSystem.get(configuration); try (final InputStream stream = fs.open(new Path(configuration.get(SCRIPT_FILE))); final InputStreamReader reader = new InputStreamReader(stream)) { - this.parse = String.join("\n", IOUtils.toString(reader), READ_CALL); - script = ((Compilable) engine).compile(this.parse); + final String parse = String.join("\n", IOUtils.toString(reader), READ_CALL); + script = ((Compilable) engine).compile(parse); } catch (ScriptException e) { - throw new IOException(e.getMessage(), e); + throw new IOException(e.getMessage()); } }
