commit 2f864fdfdf18318ef24b02141733adb356508370
author Hao Nguyen <haon@google.com> Wed Mar 20 11:45:01 2019 -0700
committer Hao Nguyen <haon@google.com> Wed Mar 20 11:45:01 2019 -0700
tree e13b6e37f187bf02e913ecbc12777d5df4f23268
parent 59284450fa2a85f9f355b4de5a733323af094dcf

Down integrate to Github

conformance/conformance_test.cc

diff --git a/conformance/conformance_test.cc b/conformance/conformance_test.cc
index 221464c..6325b35 100644
--- a/conformance/conformance_test.cc
+++ b/conformance/conformance_test.cc
@@ -68,6 +68,7 @@
       input_format_(input_format),
       output_format_(output_format),
       prototype_message_(prototype_message),
+      prototype_message_for_compare_(prototype_message.New()),
       test_name_(test_name) {
   switch (input_format) {
     case conformance::PROTOBUF: {
@@ -102,7 +103,7 @@
 
 Message* ConformanceTestSuite::ConformanceRequestSetting::
     GetTestMessage() const {
-  return prototype_message_.New();
+  return prototype_message_for_compare_->New();
 }
 
 string ConformanceTestSuite::ConformanceRequestSetting::