Fixed #335

orientechnologies · Sep 18, 2018 · 09628ac · 09628ac
1 parent ea9dce6
commit 09628ac
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/lib/client/database/session.js b/lib/client/database/session.js
@@ -4,6 +4,7 @@
 const Promise = require("bluebird");
 const errors = require('../../errors');
 const ConnectionError = require('../../errors').ConnectionError;
+const RequestError = require('../../errors').RequestError;
 
 class SessionManager {
   constructor(client, config) {
@@ -169,7 +170,7 @@ class SessionManager {
         .then(resolve)
         .catch((err) => {
           // TODO Handle retry
-          if (err instanceof ConnectionError || err.isTokenException()) {
+          if (err instanceof ConnectionError || ( err instanceof RequestError && err.isTokenException())) {
             this.currentSession = null;
             this.open().then(this.withSession.bind(this, op, data, acquire, cbk))
               .catch(reject);

diff --git a/lib/client/network/protocol37/serializer-binary.js b/lib/client/network/protocol37/serializer-binary.js
@@ -28,6 +28,10 @@ function writeObject(operation, doc) {
 }
 
 function writeValue(op, value) {
+  if (value == null) {
+    op.writeByte(-1);
+    return;
+  }
   switch (typeof value) {
     case "string":
       op.writeByte(7);
@@ -47,7 +51,7 @@ function writeValue(op, value) {
       if (Number.isInteger(value)) {
         op.writeByte(3);
         op.writeVarint(value);
-      }else {
+      } else {
         op.writeByte(5);
         op.writeDouble(value);
       }