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/08/03 17:14:44 UTC

[1/2] tinkerpop git commit: Modified the message when closing a remote

Repository: tinkerpop
Updated Branches:
  refs/heads/master 81ef19555 -> 613a4ba12


Modified the message when closing a remote

The closing of a remote in yielded a compound message that mentioned the switch to local evaluation first before the close message. That message about the switch didn't seem too useful. Now the switch just happens quietly and user is just informed of the remote closing. TINKERPOP-1377 CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8888a8c3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8888a8c3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8888a8c3

Branch: refs/heads/master
Commit: 8888a8c3c40e086a324804be088b5ae70eeb0941
Parents: 6bf0d3b
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Aug 3 13:06:03 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Aug 3 13:06:03 2016 -0400

----------------------------------------------------------------------
 .../tinkerpop/gremlin/console/commands/RemoteCommand.groovy      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8888a8c3/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.groovy
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.groovy
index 79e4099..dccebd3 100644
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.groovy
+++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.groovy
@@ -113,11 +113,11 @@ class RemoteCommand extends ComplexCommandSupport {
 
         // the console is in remote evaluation mode.  closing at this point will needs to exit that mode and then
         // kill the remote itself
-        def line = !mediator.localEvaluation ? swapEvaluationMode() : ""
+        if (!mediator.localEvaluation) swapEvaluationMode()
 
         def removed = mediator.removeCurrent()
         removed.close()
-        return line.isEmpty() ? "Removed - $removed" : "$line and removed - $removed"
+        return "Removed - $removed"
     }
 
     def Object do_console = {


[2/2] tinkerpop git commit: Merge remote-tracking branch 'origin/tp31'

Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/tp31'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/613a4ba1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/613a4ba1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/613a4ba1

Branch: refs/heads/master
Commit: 613a4ba126c77c8bd546b1dcee615fcafa209162
Parents: 81ef195 8888a8c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Aug 3 13:14:27 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Aug 3 13:14:27 2016 -0400

----------------------------------------------------------------------
 .../tinkerpop/gremlin/console/commands/RemoteCommand.groovy      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------