From commits-return-25403-archive-asf-public=cust-asf.ponee.io@tinkerpop.apache.org Mon Jan 8 11:37:35 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 001FE18078F for ; Mon, 8 Jan 2018 11:37:34 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id E49F2160C46; Mon, 8 Jan 2018 10:37:34 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 6D65E160C47 for ; Mon, 8 Jan 2018 11:37:33 +0100 (CET) Received: (qmail 34127 invoked by uid 500); 8 Jan 2018 10:37:32 -0000 Mailing-List: contact commits-help@tinkerpop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tinkerpop.apache.org Delivered-To: mailing list commits@tinkerpop.apache.org Received: (qmail 34077 invoked by uid 99); 8 Jan 2018 10:37:32 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Jan 2018 10:37:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7A71BE178B; Mon, 8 Jan 2018 10:37:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jorgebg@apache.org To: commits@tinkerpop.apache.org Date: Mon, 08 Jan 2018 10:37:45 -0000 Message-Id: <012401da53ea4d22a7e13b36e3af67f9@git.apache.org> In-Reply-To: <3a19363468794bb7a1a254afd6a860d7@git.apache.org> References: <3a19363468794bb7a1a254afd6a860d7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [14/50] [abbrv] tinkerpop git commit: Use null as empty result 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/ca2f349c Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ca2f349c Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ca2f349c Branch: refs/heads/TINKERPOP-1489 Commit: ca2f349c475c51350286f3205898c2aff67f046a Parents: 08bdc0b Author: Jorge Bay Gondra Authored: Thu Nov 3 14:34:28 2016 +0100 Committer: Jorge Bay Gondra Committed: Mon Jan 8 11:28:32 2018 +0100 ---------------------------------------------------------------------- .../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/ca2f349c/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/ca2f349c/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); }); };