commit 9e2e6e704b28832c8a50e8f30e308e74713a9395
author Zach Stein <zstein@webrtc.org> Wed Dec 12 23:09:40 2018
committer Commit Bot <commit-bot@chromium.org> Thu Dec 13 20:40:36 2018
tree 9faa86e3d1067c7272adf105ef78fd124103f70f
parent 3e94557b04124270cace68b702b00f72a3d51359

Set LoggedIceCandidatePairEvent.transaction_id to default value if missing.

Bug: webrtc:9972
Change-Id: I559ccb6799b494a9013523d3960a725ea7fd448e
Reviewed-on: https://webrtc-review.googlesource.com/c/114240
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Commit-Queue: Zach Stein <zstein@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26006}

logging/rtc_event_log/rtc_event_log_parser_new.cc

diff --git a/logging/rtc_event_log/rtc_event_log_parser_new.cc b/logging/rtc_event_log/rtc_event_log_parser_new.cc
index b8beff4..79747b0 100644
--- a/logging/rtc_event_log/rtc_event_log_parser_new.cc
+++ b/logging/rtc_event_log/rtc_event_log_parser_new.cc
@@ -1741,6 +1741,8 @@
   res.type = GetRuntimeIceCandidatePairEventType(event.event_type());
   RTC_CHECK(event.has_candidate_pair_id());
   res.candidate_pair_id = event.candidate_pair_id();
+  // transaction_id is not supported by rtclog::Event
+  res.transaction_id = 0;
   return res;
 }
 
@@ -2420,8 +2422,8 @@
   ice_event.candidate_pair_id = proto.candidate_pair_id();
   // TODO(zstein): Make the transaction_id field required once all old versions
   // of the log (which don't have the field) are obsolete.
-  if (proto.has_transaction_id())
-    ice_event.transaction_id = proto.transaction_id();
+  ice_event.transaction_id =
+      proto.has_transaction_id() ? proto.transaction_id() : 0;
 
   ice_candidate_pair_events_.push_back(ice_event);