Merge pull request #330 from ibartj/324-nested-errors

adds descriptions to nested errors, should fix #324
codemix · Jun 17, 2015 · 5db8bed · 5db8bed
2 parents addffe3 + 34f6efc
commit 5db8bed
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/lib/transport/binary/protocol19/operation.js b/lib/transport/binary/protocol19/operation.js
@@ -821,12 +821,16 @@ Operation.prototype.parseError = function (buffer, offset, context, fieldName, r
       var prev;
       if (data.hasMore) {
         prev = new errors.Request();
+        prev.type = data.type;
+        prev.message = data.message;
         err.previous.push(prev);
         this.stack.pop();
         this.stack.push(prev);
         readItem.call(this);
       }
       else {
+        err.type = data.type;
+        err.message = data.message;
         this.readBytes('javaStackTrace', function (data) {
           this.readOps.push(function (data) {
             this.stack.pop();

diff --git a/lib/transport/binary/protocol26/operation.js b/lib/transport/binary/protocol26/operation.js
@@ -821,12 +821,16 @@ Operation.prototype.parseError = function (buffer, offset, context, fieldName, r
       var prev;
       if (data.hasMore) {
         prev = new errors.Request();
+        prev.type = data.type;
+        prev.message = data.message;
         err.previous.push(prev);
         this.stack.pop();
         this.stack.push(prev);
         readItem.call(this);
       }
       else {
+        err.type = data.type;
+        err.message = data.message;
         this.readBytes('javaStackTrace', function (data) {
           this.readOps.push(function (data) {
             this.stack.pop();

diff --git a/lib/transport/binary/protocol28/operation.js b/lib/transport/binary/protocol28/operation.js
@@ -898,12 +898,16 @@ Operation.prototype.parseError = function (buffer, offset, context, fieldName, r
       var prev;
       if (data.hasMore) {
         prev = new errors.Request();
+        prev.type = data.type;
+        prev.message = data.message;
         err.previous.push(prev);
         this.stack.pop();
         this.stack.push(prev);
         readItem.call(this);
       }
       else {
+        err.type = data.type;
+        err.message = data.message;
         this.readBytes('javaStackTrace', function (data) {
           this.readOps.push(function (data) {
             this.stack.pop();