You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by jo...@apache.org on 2018/07/12 09:53:43 UTC

[1/4] tinkerpop git commit: fix(DriverRemoteConnection): return the promise on close

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 1f15781ac -> bf07f13b5


fix(DriverRemoteConnection): return the promise on close

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

Branch: refs/heads/tp33
Commit: f6e50ae231ebd6cf9e488522967ad1d483de4781
Parents: 309957b
Author: Elliott Foster <el...@codebrews.com>
Authored: Tue Jul 3 12:35:55 2018 -0500
Committer: GitHub <no...@github.com>
Committed: Tue Jul 3 12:35:55 2018 -0500

----------------------------------------------------------------------
 .../lib/driver/driver-remote-connection.js      | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f6e50ae2/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/driver-remote-connection.js
----------------------------------------------------------------------
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/driver-remote-connection.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/driver-remote-connection.js
index d9e6000..0f7cedb 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/driver-remote-connection.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/driver-remote-connection.js
@@ -190,16 +190,16 @@ class DriverRemoteConnection extends RemoteConnection {
    * @return {Promise}
    */
   close() {
-    if (this._closePromise) {
-      return this._closePromise;
-    }
-    this._closePromise = new Promise(resolve => {
-      this._ws.on('close', function () {
-        this.isOpen = false;
-        resolve();
+    if (!this._closePromise) {
+      this._closePromise = new Promise(resolve => {
+        this._ws.on('close', function () {
+          this.isOpen = false;
+          resolve();
+        });
+        this._ws.close();
       });
-      this._ws.close();
-    });
+    }
+    return this._closePromise;
   }
 }
 
@@ -226,4 +226,4 @@ const bufferFromString = (Int8Array.from !== Buffer.from && Buffer.from) || func
   return new Buffer(text, 'utf8');
 };
 
-module.exports = DriverRemoteConnection;
\ No newline at end of file
+module.exports = DriverRemoteConnection;


[2/4] tinkerpop git commit: Merge pull request #888 from elliotttf/fix-close-return-tp32

Posted by jo...@apache.org.
Merge pull request #888 from elliotttf/fix-close-return-tp32


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

Branch: refs/heads/tp33
Commit: 59d2f1048f2041045dff6ff2b546fd3caa9937a2
Parents: 309957b f6e50ae
Author: Jorge Bay Gondra <jo...@gmail.com>
Authored: Thu Jul 12 11:48:43 2018 +0200
Committer: Jorge Bay Gondra <jo...@gmail.com>
Committed: Thu Jul 12 11:48:43 2018 +0200

----------------------------------------------------------------------
 .../lib/driver/driver-remote-connection.js      | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------



[4/4] tinkerpop git commit: Merge branch 'tp32' into tp33

Posted by jo...@apache.org.
Merge branch 'tp32' into tp33


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

Branch: refs/heads/tp33
Commit: bf07f13b50ad9ac49d6815bebc5ab82ed4b2e8a7
Parents: 1f15781 b0c836b
Author: Jorge Bay Gondra <jo...@gmail.com>
Authored: Thu Jul 12 11:52:54 2018 +0200
Committer: Jorge Bay Gondra <jo...@gmail.com>
Committed: Thu Jul 12 11:52:54 2018 +0200

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  1 +
 .../lib/driver/driver-remote-connection.js      | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bf07f13b/CHANGELOG.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bf07f13b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/driver-remote-connection.js
----------------------------------------------------------------------


[3/4] tinkerpop git commit: Include JavaScript GLV DriverRemoteConnection close() fix in CHANGELOG

Posted by jo...@apache.org.
Include JavaScript GLV DriverRemoteConnection close() fix in CHANGELOG


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

Branch: refs/heads/tp33
Commit: b0c836b4e6d13bb973ce84588683d68bb36f92dc
Parents: 59d2f10
Author: Jorge Bay Gondra <jo...@gmail.com>
Authored: Thu Jul 12 11:52:41 2018 +0200
Committer: Jorge Bay Gondra <jo...@gmail.com>
Committed: Thu Jul 12 11:52:41 2018 +0200

----------------------------------------------------------------------
 CHANGELOG.asciidoc | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0c836b4/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 1d05615..ee49c09 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -38,6 +38,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * Fixed bug in `GroovyTranslator` that didn't properly handle empty `Map` objects.
 * Added concrete configuration methods to `SparkGraphComputer` to make a more clear API for configuring it.
 * Fixed a bug in `TinkerGraphCountStrategy`, which didn't consider that certain map steps may not emit an element.
+* Fixed a bug in JavaScript GLV where DriverRemoteConnection close() method didn't returned a Promise instance.
 
 [[release-3-2-9]]
 === TinkerPop 3.2.9 (Release Date: May 8, 2018)