Use null as empty result
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/46108542 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/46108542 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/46108542 Branch: refs/heads/TINKERPOP-1489 Commit: 4610854277efbe4ec813d7c75288e3b51616694f Parents: af27168 Author: Jorge Bay Gondra <[email protected]> Authored: Thu Nov 3 14:34:28 2016 +0100 Committer: Stephen Mallette <[email protected]> Committed: Wed Jun 28 15:14:02 2017 -0400 ---------------------------------------------------------------------- .../tinkerpop/gremlin/javascript/TraversalSourceGenerator.groovy | 2 +- .../src/main/javascript/gremlin-javascript/process/traversal.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46108542/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/TraversalSourceGenerator.groovy ---------------------------------------------------------------------- diff --git a/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/TraversalSourceGenerator.groovy b/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/TraversalSourceGenerator.groovy index 46f65a4..d5899f0 100644 --- a/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/TraversalSourceGenerator.groovy +++ b/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/TraversalSourceGenerator.groovy @@ -87,7 +87,7 @@ class TraversalSourceGenerator { /** @param {Function} callback */ Traversal.prototype.one = function (callback) { this.list(function (err, result) { - callback(err, result ? result[0] : null); + callback(err, result && result.length > 0 ? result[0] : null); }); }; http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46108542/gremlin-javascript/src/main/javascript/gremlin-javascript/process/traversal.js ---------------------------------------------------------------------- diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/process/traversal.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/process/traversal.js index a7a9bb7..f585161 100644 --- a/gremlin-javascript/src/main/javascript/gremlin-javascript/process/traversal.js +++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/process/traversal.js @@ -50,7 +50,7 @@ /** @param {Function} callback */ Traversal.prototype.one = function (callback) { this.list(function (err, result) { - callback(err, result ? result[0] : null); + callback(err, result && result.length > 0 ? result[0] : null); }); };
