From f6e50ae231ebd6cf9e488522967ad1d483de4781 Mon Sep 17 00:00:00 2001
From: Elliott Foster <elliottf@codebrews.com>
Date: Tue, 3 Jul 2018 12:35:55 -0500
Subject: [PATCH] fix(DriverRemoteConnection): return the promise on close

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

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 d9e6000b149..0f7cedb1cc7 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;