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 2018/02/20 18:36:00 UTC
[1/2] tinkerpop git commit: Added correct setting of future
exceptions, pursuant to TINKERPOP-1883
Repository: tinkerpop
Updated Branches:
refs/heads/master 4772d7d02 -> de45df4f3
Added correct setting of future exceptions, pursuant to TINKERPOP-1883
https://issues.apache.org/jira/browse/TINKERPOP-1883
Conflicts:
gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/545f3bf8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/545f3bf8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/545f3bf8
Branch: refs/heads/master
Commit: 545f3bf895a10f5ec76b466f71b93fc1304f88d3
Parents: bcffaad
Author: dancollins34 <da...@gmail.com>
Authored: Sat Feb 3 17:24:44 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Feb 20 13:28:54 2018 -0500
----------------------------------------------------------------------
.../jython/gremlin_python/driver/driver_remote_connection.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/545f3bf8/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py b/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py
index 1f08e2b..d447cbd 100644
--- a/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py
+++ b/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py
@@ -63,13 +63,12 @@ class DriverRemoteConnection(RemoteConnection):
def cb(f):
try:
result_set = f.result()
- except Exception as e:
- future.set_exception(e)
- else:
results = result_set.all().result()
side_effects = RemoteTraversalSideEffects(result_set.request_id,
self._client)
future.set_result(RemoteTraversal(iter(results), side_effects))
+ except Exception as e:
+ future.set_exception(e)
future_result_set.add_done_callback(cb)
return future
[2/2] tinkerpop git commit: Merge branch 'tp32'
Posted by sp...@apache.org.
Merge branch 'tp32'
Conflicts:
gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/de45df4f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/de45df4f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/de45df4f
Branch: refs/heads/master
Commit: de45df4f34138b939d1e818d547707c40869434f
Parents: 4772d7d 545f3bf
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Feb 20 13:35:34 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Feb 20 13:35:34 2018 -0500
----------------------------------------------------------------------
.../jython/gremlin_python/driver/driver_remote_connection.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------