From 6924a20d4d9dff1e528186c81fdd7a0b960aed45 Mon Sep 17 00:00:00 2001
From: murgatroid99 <mlumish@google.com>
Date: Tue, 4 Apr 2017 16:58:05 -0700
Subject: [PATCH] Fix a couple of issues with the use of the Protobuf.js API

---
 src/protobuf_js_6_common.js | 4 ++--
 test/common_test.js         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/protobuf_js_6_common.js b/src/protobuf_js_6_common.js
index cac0f711..21eddaba 100644
--- a/src/protobuf_js_6_common.js
+++ b/src/protobuf_js_6_common.js
@@ -77,11 +77,11 @@ exports.serializeCls = function serializeCls(cls) {
    * @return {Buffer} The serialized object
    */
   return function serialize(arg) {
-    var message = cls.fromObject(arg);
-    var errMsg = cls.verify(message);
+    var errMsg = cls.verify(arg);
     if (errMsg) {
       throw Error(errMsg);
     }
+    var message = cls.create(arg);
     return cls.encode(message).finish();
   };
 };
diff --git a/test/common_test.js b/test/common_test.js
index 39ff6a5f..e1ce864f 100644
--- a/test/common_test.js
+++ b/test/common_test.js
@@ -176,7 +176,7 @@ describe('Proto message oneof serialize and deserialize', function() {
     var test_message2 = {oneof_choice: 'string_choice', string_choice: 'abc'};
     var serialized2 = oneofSerialize(test_message2);
     var deserialized2 = oneofDeserialize(serialized2);
-    assert.equal(deserialized2.oneof_choice, 'int_choice');
+    assert.equal(deserialized2.oneof_choice, 'string_choice');
   });
 });
 describe('Proto message enum serialize and deserialize', function() {