diff options
| author |  murgatroid99 <mlumish@google.com> | 2017-07-06 10:15:11 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2017-07-06 10:15:11 -0700 |
| commit | 882ba60fcb2cdec28c7d3a2a74914f3a2eeba8e9 (patch) | |
| tree | 03e2251852bf9cc3fafdc7b20cbaf35e1a2f8d52 /src/node/src/protobuf_js_6_common.js | |
| parent | 9796c8a31af5b91e4c98281a0a6cd768d52d5e77 (diff) | |
| parent | 9780f9364664a359ebf6f5fc11dda7782785c20c (diff) | |
Merge remote-tracking branch 'upstream/v1.4.x' into master_1.4.1_upmerge
Diffstat (limited to 'src/node/src/protobuf_js_6_common.js')
| -rw-r--r-- | src/node/src/protobuf_js_6_common.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/node/src/protobuf_js_6_common.js b/src/node/src/protobuf_js_6_common.js index f1e4914fe2..0f07251677 100644 --- a/src/node/src/protobuf_js_6_common.js +++ b/src/node/src/protobuf_js_6_common.js @@ -49,7 +49,7 @@ exports.deserializeCls = function deserializeCls(cls, options) { * @return {cls} The resulting object */ return function deserialize(arg_buf) { - return cls.decode(arg_buf).toObject(conversion_options); + return cls.toObject(cls.decode(arg_buf), conversion_options); }; }; |