You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/03/25 18:32:15 UTC
incubator-tinkerpop git commit: Changed `DriverRemoteAcceptor` to
issue scripts as multi-line.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/tp31 207b0b391 -> fab3473af
Changed `DriverRemoteAcceptor` to issue scripts as multi-line.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/fab3473a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/fab3473a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/fab3473a
Branch: refs/heads/tp31
Commit: fab3473af98a09bc8cd3b8dfd0dc1ead4a5a9874
Parents: 207b0b3
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Mar 25 13:31:31 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Mar 25 13:32:07 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../gremlin/console/groovy/plugin/DriverRemoteAcceptor.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fab3473a/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index c29a717..8df9c03 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/
TinkerPop 3.1.2 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Changed `DriverRemoteAcceptor` to send scripts as multi-line.
* Fixed a bug in `gremlin-driver` where connections were not returning to the pool after many consecutive errors.
* Fixed a bug where `tree()` did not serialize into GraphSON.
* Bumped to SLF4j 1.7.19.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fab3473a/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptor.java
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptor.java b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptor.java
index c32a593..7733524 100644
--- a/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptor.java
+++ b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptor.java
@@ -28,6 +28,7 @@ import org.apache.tinkerpop.gremlin.groovy.plugin.RemoteException;
import org.apache.commons.lang.exception.ExceptionUtils;
import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
import org.codehaus.groovy.tools.shell.Groovysh;
+import org.codehaus.groovy.tools.shell.Parser;
import javax.security.sasl.SaslException;
import java.io.FileNotFoundException;
@@ -137,7 +138,7 @@ public class DriverRemoteAcceptor implements RemoteAcceptor {
@Override
public Object submit(final List<String> args) throws RemoteException {
- final String line = RemoteAcceptor.getScript(String.join(" ", args), this.shell);
+ final String line = RemoteAcceptor.getScript(String.join(Parser.getNEWLINE(), args), this.shell);
try {
final List<Result> resultSet = send(line);