182812 2018-02-14 14:53:00 -0800 Resource Load Statistics: Make sure WebResourceLoadStatisticsStore::mergeWithDataFromDecoder() can ingest older plist versions and not reset the database 2018-02-15 13:50:21 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wilander wilander bfulgham cdumez commit-queue dbates ews-watchlist japhet jlewis3 webkit-bug-importer oldest_to_newest 1399272 0 wilander 2018-02-14 14:53:00 -0800 We should not drop existing statistics if we come across a plist with an older statistics model version. Instead we should ingest what we have and continue from there. This will re-introduce logic that we had earlier but got lost in the refactoring. And to be fair, it wasn't really needed since all the older versions where internal and never shipped. 1399273 1 wilander 2018-02-14 14:53:20 -0800 rdar://problem/37511406 1399278 2 333849 wilander 2018-02-14 15:02:37 -0800 Created attachment 333849 Patch 1399310 3 333849 bfulgham 2018-02-14 16:25:47 -0800 Comment on attachment 333849 Patch Looks good. r=me. 1399312 4 333849 wilander 2018-02-14 16:29:39 -0800 Comment on attachment 333849 Patch Thanks, Brent! 1399324 5 333849 commit-queue 2018-02-14 16:52:34 -0800 Comment on attachment 333849 Patch Clearing flags on attachment: 333849 Committed r228495: <https://trac.webkit.org/changeset/228495> 1399325 6 commit-queue 2018-02-14 16:52:36 -0800 All reviewed patches have been landed. Closing bug. 1399480 7 ap 2018-02-15 09:11:55 -0800 This broke performance tests with unexpected logging: https://build.webkit.org/builders/Apple%20Sierra%20Release%20WK2%20%28Perf%29/builds/236/steps/perf-test/logs/stdio 1399481 8 jlewis3 2018-02-15 09:16:29 -0800 This caused the Apple Sierra Release WK2 (Perf) testers to fail 183 perf tests consistently: https://build.webkit.org/builders/Apple%20Sierra%20Release%20WK2%20%28Perf%29/builds/231 https://build.webkit.org/builders/Apple%20Sierra%20Release%20WK2%20%28Perf%29/builds/231/steps/perf-test/logs/stdio 1399482 9 jlewis3 2018-02-15 09:19:27 -0800 Reverted r228495 for reason: This caused mulitple perf tests to fail consistently. Committed r228514: <https://trac.webkit.org/changeset/228514> 1399559 10 wilander 2018-02-15 11:54:45 -0800 (In reply to Alexey Proskuryakov from comment #7) > This broke performance tests with unexpected logging: > https://build.webkit.org/builders/ > Apple%20Sierra%20Release%20WK2%20%28Perf%29/builds/236/steps/perf-test/logs/ > stdio I have no idea why perf tests are ingesting statistics of model 1. Either this is some special statistics plist, a super old test, or a workaround for something else. One way to fix this is to avoid model 1. 1399585 11 333934 wilander 2018-02-15 13:15:31 -0800 Created attachment 333934 Patch for landing 1399589 12 wilander 2018-02-15 13:16:52 -0800 Removed logging for model version upgrades all together. It's mostly the early return for skipped ingestion that we need to log. The other one was intended to help with bug investigations since it would tell us if an upgrade had taken place. 1399602 13 333934 commit-queue 2018-02-15 13:50:19 -0800 Comment on attachment 333934 Patch for landing Clearing flags on attachment: 333934 Committed r228532: <https://trac.webkit.org/changeset/228532> 1399603 14 commit-queue 2018-02-15 13:50:21 -0800 All reviewed patches have been landed. Closing bug. 333849 2018-02-14 15:02:37 -0800 2018-02-15 13:15:29 -0800 Patch bug-182812-20180214150236.patch text/plain 7668 wilander SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyODQ4NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE4LTAyLTE0ICBKb2huIFdp bGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlc291cmNlIExvYWQgU3Rh dGlzdGljczogTWFrZSBzdXJlIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6bWVyZ2VX aXRoRGF0YUZyb21EZWNvZGVyKCkgY2FuIGluZ2VzdCBvbGRlciBwbGlzdCB2ZXJzaW9ucyBhbmQg bm90IHJlc2V0IHRoZSBkYXRhYmFzZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTgyODEyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNzUxMTQwNj4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcg dGVzdHMuIFRlc3RlZCBtYW51YWxseSBiZXR3ZWVuIHZlcnNpb25zIG9mIFNhZmFyaS4KKworICAg ICAgICAqIGxvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlc291cmNlTG9hZFN0YXRpc3RpY3M6OmRlY29kZSk6CisgICAgICAgICAgICBOb3cgb25s eSBleHBlY3RzIHRoZXNlIGZpZWxkcyBmb3IgbW9kZWwgdmVyc2lvbiAxMSBvciBoaWdoZXI6Cisg ICAgICAgICAgICAtIHRvcEZyYW1lVW5pcXVlUmVkaXJlY3RzVG8KKyAgICAgICAgICAgIC0gdG9w RnJhbWVVbmlxdWVSZWRpcmVjdHNGcm9tCisgICAgICAgICAgICAtIHN1YnJlc291cmNlVW5pcXVl UmVkaXJlY3RzRnJvbQorICAgICAgICAgICAgLSB0aW1lc0FjY2Vzc2VkQXNGaXJzdFBhcnR5RHVl VG9Vc2VySW50ZXJhY3Rpb24KKyAgICAgICAgICAgIC0gdGltZXNBY2Nlc3NlZEFzRmlyc3RQYXJ0 eUR1ZVRvU3RvcmFnZUFjY2Vzc0FQSQorICAgICAgICAqIGxvYWRlci9SZXNvdXJjZUxvYWRTdGF0 aXN0aWNzLmg6CisKIDIwMTgtMDItMTQgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29t PgogCiAgICAgICAgIERpc2FsbG93IGNyb3NzLW9yaWdpbiBzdWJyZXNvdXJjZXMgZnJvbSBhc2tp bmcgZm9yIGNyZWRlbnRpYWxzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VM b2FkU3RhdGlzdGljcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jl c291cmNlTG9hZFN0YXRpc3RpY3MuY3BwCShyZXZpc2lvbiAyMjg0ODUpCisrKyBTb3VyY2UvV2Vi Q29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljcy5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTExOCw3ICsxMTgsNyBAQCBzdGF0aWMgdm9pZCBkZWNvZGVIYXNoU2V0KEtleWVkRGVjb2RlciYg CiAgICAgfSk7CiB9CiAKLWJvb2wgUmVzb3VyY2VMb2FkU3RhdGlzdGljczo6ZGVjb2RlKEtleWVk RGVjb2RlciYgZGVjb2RlcikKK2Jvb2wgUmVzb3VyY2VMb2FkU3RhdGlzdGljczo6ZGVjb2RlKEtl eWVkRGVjb2RlciYgZGVjb2RlciwgdW5zaWduZWQgbW9kZWxWZXJzaW9uKQogewogICAgIGlmICgh ZGVjb2Rlci5kZWNvZGVTdHJpbmcoIlByZXZhbGVudFJlc291cmNlT3JpZ2luIiwgaGlnaExldmVs RG9tYWluKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMTMxLDggKzEzMSwxMCBAQCBib29s IFJlc291cmNlTG9hZFN0YXRpc3RpY3M6OmRlY29kZShLZXllCiAgICAgZGVjb2RlSGFzaFNldChk ZWNvZGVyLCAic3RvcmFnZUFjY2Vzc1VuZGVyVG9wRnJhbWVPcmlnaW5zIiwgc3RvcmFnZUFjY2Vz c1VuZGVyVG9wRnJhbWVPcmlnaW5zKTsKIAogICAgIC8vIFRvcCBmcmFtZSBzdGF0cwotICAgIGRl Y29kZUhhc2hDb3VudGVkU2V0KGRlY29kZXIsICJ0b3BGcmFtZVVuaXF1ZVJlZGlyZWN0c1RvIiwg dG9wRnJhbWVVbmlxdWVSZWRpcmVjdHNUbyk7Ci0gICAgZGVjb2RlSGFzaENvdW50ZWRTZXQoZGVj b2RlciwgInRvcEZyYW1lVW5pcXVlUmVkaXJlY3RzRnJvbSIsIHRvcEZyYW1lVW5pcXVlUmVkaXJl Y3RzRnJvbSk7CisgICAgaWYgKG1vZGVsVmVyc2lvbiA+PSAxMSkgeworICAgICAgICBkZWNvZGVI YXNoQ291bnRlZFNldChkZWNvZGVyLCAidG9wRnJhbWVVbmlxdWVSZWRpcmVjdHNUbyIsIHRvcEZy YW1lVW5pcXVlUmVkaXJlY3RzVG8pOworICAgICAgICBkZWNvZGVIYXNoQ291bnRlZFNldChkZWNv ZGVyLCAidG9wRnJhbWVVbmlxdWVSZWRpcmVjdHNGcm9tIiwgdG9wRnJhbWVVbmlxdWVSZWRpcmVj dHNGcm9tKTsKKyAgICB9CiAKICAgICAvLyBTdWJmcmFtZSBzdGF0cwogICAgIGRlY29kZUhhc2hD b3VudGVkU2V0KGRlY29kZXIsICJzdWJmcmFtZVVuZGVyVG9wRnJhbWVPcmlnaW5zIiwgc3ViZnJh bWVVbmRlclRvcEZyYW1lT3JpZ2lucyk7CkBAIC0xNDAsNyArMTQyLDggQEAgYm9vbCBSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzOjpkZWNvZGUoS2V5ZQogICAgIC8vIFN1YnJlc291cmNlIHN0YXRzCiAg ICAgZGVjb2RlSGFzaENvdW50ZWRTZXQoZGVjb2RlciwgInN1YnJlc291cmNlVW5kZXJUb3BGcmFt ZU9yaWdpbnMiLCBzdWJyZXNvdXJjZVVuZGVyVG9wRnJhbWVPcmlnaW5zKTsKICAgICBkZWNvZGVI YXNoQ291bnRlZFNldChkZWNvZGVyLCAic3VicmVzb3VyY2VVbmlxdWVSZWRpcmVjdHNUbyIsIHN1 YnJlc291cmNlVW5pcXVlUmVkaXJlY3RzVG8pOwotICAgIGRlY29kZUhhc2hDb3VudGVkU2V0KGRl Y29kZXIsICJzdWJyZXNvdXJjZVVuaXF1ZVJlZGlyZWN0c0Zyb20iLCBzdWJyZXNvdXJjZVVuaXF1 ZVJlZGlyZWN0c0Zyb20pOworICAgIGlmIChtb2RlbFZlcnNpb24gPj0gMTEpCisgICAgICAgIGRl Y29kZUhhc2hDb3VudGVkU2V0KGRlY29kZXIsICJzdWJyZXNvdXJjZVVuaXF1ZVJlZGlyZWN0c0Zy b20iLCBzdWJyZXNvdXJjZVVuaXF1ZVJlZGlyZWN0c0Zyb20pOwogCiAgICAgLy8gUHJldmFsZW50 IFJlc291cmNlCiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZUJvb2woImlzUHJldmFsZW50UmVzb3Vy Y2UiLCBpc1ByZXZhbGVudFJlc291cmNlKSkKQEAgLTE2MiwxMSArMTY1LDEyIEBAIGJvb2wgUmVz b3VyY2VMb2FkU3RhdGlzdGljczo6ZGVjb2RlKEtleWUKICAgICAgICAgcmV0dXJuIGZhbHNlOwog ICAgIGxhc3RTZWVuID0gV2FsbFRpbWU6OmZyb21SYXdTZWNvbmRzKGxhc3RTZWVuVGltZUFzRG91 YmxlKTsKIAotICAgIGlmICghZGVjb2Rlci5kZWNvZGVVSW50MzIoInRpbWVzQWNjZXNzZWRBc0Zp cnN0UGFydHlEdWVUb1VzZXJJbnRlcmFjdGlvbiIsIHRpbWVzQWNjZXNzZWRBc0ZpcnN0UGFydHlE dWVUb1VzZXJJbnRlcmFjdGlvbikpCi0gICAgICAgIHRpbWVzQWNjZXNzZWRBc0ZpcnN0UGFydHlE dWVUb1VzZXJJbnRlcmFjdGlvbiA9IDA7Ci0gICAgaWYgKCFkZWNvZGVyLmRlY29kZVVJbnQzMigi dGltZXNBY2Nlc3NlZEFzRmlyc3RQYXJ0eUR1ZVRvU3RvcmFnZUFjY2Vzc0FQSSIsIHRpbWVzQWNj ZXNzZWRBc0ZpcnN0UGFydHlEdWVUb1N0b3JhZ2VBY2Nlc3NBUEkpKQotICAgICAgICB0aW1lc0Fj Y2Vzc2VkQXNGaXJzdFBhcnR5RHVlVG9TdG9yYWdlQWNjZXNzQVBJID0gMDsKLQorICAgIGlmICht b2RlbFZlcnNpb24gPj0gMTEpIHsKKyAgICAgICAgaWYgKCFkZWNvZGVyLmRlY29kZVVJbnQzMigi dGltZXNBY2Nlc3NlZEFzRmlyc3RQYXJ0eUR1ZVRvVXNlckludGVyYWN0aW9uIiwgdGltZXNBY2Nl c3NlZEFzRmlyc3RQYXJ0eUR1ZVRvVXNlckludGVyYWN0aW9uKSkKKyAgICAgICAgICAgIHRpbWVz QWNjZXNzZWRBc0ZpcnN0UGFydHlEdWVUb1VzZXJJbnRlcmFjdGlvbiA9IDA7CisgICAgICAgIGlm ICghZGVjb2Rlci5kZWNvZGVVSW50MzIoInRpbWVzQWNjZXNzZWRBc0ZpcnN0UGFydHlEdWVUb1N0 b3JhZ2VBY2Nlc3NBUEkiLCB0aW1lc0FjY2Vzc2VkQXNGaXJzdFBhcnR5RHVlVG9TdG9yYWdlQWNj ZXNzQVBJKSkKKyAgICAgICAgICAgIHRpbWVzQWNjZXNzZWRBc0ZpcnN0UGFydHlEdWVUb1N0b3Jh Z2VBY2Nlc3NBUEkgPSAwOworICAgIH0KICAgICByZXR1cm4gdHJ1ZTsKIH0KIApJbmRleDogU291 cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3MuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljcy5oCShyZXZpc2lv biAyMjg0ODUpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGlj cy5oCSh3b3JraW5nIGNvcHkpCkBAIC01NCw3ICs1NCw3IEBAIHN0cnVjdCBSZXNvdXJjZUxvYWRT dGF0aXN0aWNzIHsKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgU3RyaW5nIHByaW1hcnlEb21h aW4oY29uc3QgU3RyaW5nJiBob3N0KTsKIAogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgZW5jb2Rl KEtleWVkRW5jb2RlciYpIGNvbnN0OwotICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgZGVjb2RlKEtl eWVkRGVjb2RlciYpOworICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgZGVjb2RlKEtleWVkRGVjb2Rl ciYsIHVuc2lnbmVkIG1vZGVsVmVyc2lvbik7CiAKICAgICBTdHJpbmcgdG9TdHJpbmcoKSBjb25z dDsKIApJbmRleDogU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdC9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyODQ4NykKKysrIFNvdXJjZS9XZWJLaXQvQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTgtMDItMTQgIEpvaG4g V2lsYW5kZXIgIDx3aWxhbmRlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmVzb3VyY2UgTG9hZCBT dGF0aXN0aWNzOiBNYWtlIHN1cmUgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjptZXJn ZVdpdGhEYXRhRnJvbURlY29kZXIoKSBjYW4gaW5nZXN0IG9sZGVyIHBsaXN0IHZlcnNpb25zIGFu ZCBub3QgcmVzZXQgdGhlIGRhdGFiYXNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xODI4MTIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM3NTExNDA2 PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQ cm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6bWVyZ2VXaXRoRGF0YUZyb21EZWNv ZGVyKToKKyAgICAgICAgICAgIE5vdyBkb2VzIHRoZSBmb2xsb3dpbmc6CisgICAgICAgICAgICAt IExvZ3Mgd2hlbiB0aGVyZSBpcyBhIG1vZGVsIHZlcnNpb24gbWlzbWF0Y2guCisgICAgICAgICAg ICAtIERvZXMgbm90IGluZ2VzdCBzdGF0aXN0aWNzIGlmIHRoZSB2ZXJzaW9uIG9uIGRpc2sgaXMg bmV3ZXIgdGhhbiB0aGUgc3VwcG9ydGVkIG9uZS4KKyAgICAgICAgICAgIC0gRG9lcyBpbmdlc3Qg c3RhdGlzdGljcyBpZiB0aGUgdmVyc2lvbiBvbiBkaXNrIGlzIG9sZGVyIHRoYW4gdGhlIHN1cHBv cnRlZCBvbmUuCisgICAgICAgICAgICAtIFBhc3NlcyBvbiB0aGUgdmVyc2lvbiBmb3VuZCBvbiBk aXNrIHRvIFdlYkNvcmU6OlJlc291cmNlTG9hZFN0YXRpc3RpY3M6OmRlY29kZSgpLgorCiAyMDE4 LTAyLTE0ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBEaXNh bGxvdyBjcm9zcy1vcmlnaW4gc3VicmVzb3VyY2VzIGZyb20gYXNraW5nIGZvciBjcmVkZW50aWFs cwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJSZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCShyZXZpc2lvbiAyMjg0ODUpCisrKyBTb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC04MDMsOCArODAzLDEzIEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlOjptZXIKICAgICBpZiAoIWRlY29kZXIuZGVjb2RlVUludDMyKCJ2ZXJzaW9uIiwg dmVyc2lvbk9uRGlzaykpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmICh2ZXJzaW9uT25EaXNr ICE9IHN0YXRpc3RpY3NNb2RlbFZlcnNpb24pCisgICAgaWYgKHZlcnNpb25PbkRpc2sgPiBzdGF0 aXN0aWNzTW9kZWxWZXJzaW9uKSB7CisgICAgICAgIFdURkxvZ0Fsd2F5cygiRm91bmQgcmVzb3Vy Y2UgbG9hZCBzdGF0aXN0aWNzIG9uIGRpc2sgd2l0aCBtb2RlbCB2ZXJzaW9uICV1IHdoZXJlYXMg dGhlIGhpZ2hlc3Qgc3VwcG9ydGVkIHZlcnNpb24gaXMgJXUuIFJlc2V0dGluZy4iLCB2ZXJzaW9u T25EaXNrLCBzdGF0aXN0aWNzTW9kZWxWZXJzaW9uKTsKICAgICAgICAgcmV0dXJuOworICAgIH0K KworICAgIGlmICh2ZXJzaW9uT25EaXNrIDwgc3RhdGlzdGljc01vZGVsVmVyc2lvbikKKyAgICAg ICAgV1RGTG9nQWx3YXlzKCJGb3VuZCByZXNvdXJjZSBsb2FkIHN0YXRpc3RpY3Mgb24gZGlzayB3 aXRoIG1vZGVsIHZlcnNpb24gJXUgYW5kIHRoZSBjdXJyZW50IHZlcnNpb24gaXMgJXUuIEluZ2Vz dGluZyBvbGQgc3RhdGlzdGljcy4iLCB2ZXJzaW9uT25EaXNrLCBzdGF0aXN0aWNzTW9kZWxWZXJz aW9uKTsKIAogICAgIGRvdWJsZSBlbmRPZkdyYW5kZmF0aGVyaW5nVGltZXN0YW1wOwogICAgIGlm IChkZWNvZGVyLmRlY29kZURvdWJsZSgiZW5kT2ZHcmFuZGZhdGhlcmluZ1RpbWVzdGFtcCIsIGVu ZE9mR3JhbmRmYXRoZXJpbmdUaW1lc3RhbXApKQpAQCAtODEzLDggKzgxOCw4IEBAIHZvaWQgV2Vi UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjptZXIKICAgICAgICAgbV9lbmRPZkdyYW5kZmF0 aGVyaW5nVGltZXN0YW1wID0geyB9OwogCiAgICAgVmVjdG9yPFJlc291cmNlTG9hZFN0YXRpc3Rp Y3M+IGxvYWRlZFN0YXRpc3RpY3M7Ci0gICAgYm9vbCBzdWNjZWVkZWQgPSBkZWNvZGVyLmRlY29k ZU9iamVjdHMoImJyb3dzaW5nU3RhdGlzdGljcyIsIGxvYWRlZFN0YXRpc3RpY3MsIFtdKEtleWVk RGVjb2RlciYgZGVjb2RlcklubmVyLCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzJiBzdGF0aXN0aWNz KSB7Ci0gICAgICAgIHJldHVybiBzdGF0aXN0aWNzLmRlY29kZShkZWNvZGVySW5uZXIpOworICAg IGJvb2wgc3VjY2VlZGVkID0gZGVjb2Rlci5kZWNvZGVPYmplY3RzKCJicm93c2luZ1N0YXRpc3Rp Y3MiLCBsb2FkZWRTdGF0aXN0aWNzLCBbdmVyc2lvbk9uRGlza10oS2V5ZWREZWNvZGVyJiBkZWNv ZGVySW5uZXIsIFJlc291cmNlTG9hZFN0YXRpc3RpY3MmIHN0YXRpc3RpY3MpIHsKKyAgICAgICAg cmV0dXJuIHN0YXRpc3RpY3MuZGVjb2RlKGRlY29kZXJJbm5lciwgdmVyc2lvbk9uRGlzayk7CiAg ICAgfSk7CiAKICAgICBpZiAoIXN1Y2NlZWRlZCkK 333934 2018-02-15 13:15:31 -0800 2018-02-15 13:50:19 -0800 Patch for landing bug-182812-20180215131530.patch text/plain 7468 wilander SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyODUzMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE4LTAyLTE1ICBKb2huIFdp bGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlc291cmNlIExvYWQgU3Rh dGlzdGljczogTWFrZSBzdXJlIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6bWVyZ2VX aXRoRGF0YUZyb21EZWNvZGVyKCkgY2FuIGluZ2VzdCBvbGRlciBwbGlzdCB2ZXJzaW9ucyBhbmQg bm90IHJlc2V0IHRoZSBkYXRhYmFzZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTgyODEyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNzUxMTQwNj4K KworICAgICAgICBSZXZpZXdlZCBieSBCcmVudCBGdWxnaGFtLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cy4gVGVzdGVkIG1hbnVhbGx5IGJldHdlZW4gdmVyc2lvbnMgb2YgU2FmYXJpLgorCisgICAg ICAgICogbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3MuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVzb3VyY2VMb2FkU3RhdGlzdGljczo6ZGVjb2RlKToKKyAgICAgICAgICAgIE5vdyBvbmx5 IGV4cGVjdHMgdGhlc2UgZmllbGRzIGZvciBtb2RlbCB2ZXJzaW9uIDExIG9yIGhpZ2hlcjoKKyAg ICAgICAgICAgIC0gdG9wRnJhbWVVbmlxdWVSZWRpcmVjdHNUbworICAgICAgICAgICAgLSB0b3BG cmFtZVVuaXF1ZVJlZGlyZWN0c0Zyb20KKyAgICAgICAgICAgIC0gc3VicmVzb3VyY2VVbmlxdWVS ZWRpcmVjdHNGcm9tCisgICAgICAgICAgICAtIHRpbWVzQWNjZXNzZWRBc0ZpcnN0UGFydHlEdWVU b1VzZXJJbnRlcmFjdGlvbgorICAgICAgICAgICAgLSB0aW1lc0FjY2Vzc2VkQXNGaXJzdFBhcnR5 RHVlVG9TdG9yYWdlQWNjZXNzQVBJCisgICAgICAgICogbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRp c3RpY3MuaDoKKwogMjAxOC0wMi0xNSAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxl LmNvbT4KIAogICAgICAgICBTdG9wIHVzaW5nIEVYQ0xVREVEX1NPVVJDRV9GSUxFX05BTUVTIGZv ciBhY3R1YWwgc291cmNlIGZpbGVzIGluIFdlYkNvcmUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xv YWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljcy5jcHAJKHJldmlzaW9uIDIyODUyOSkK KysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMTE4LDcgKzExOCw3IEBAIHN0YXRpYyB2b2lkIGRlY29kZUhhc2hTZXQo S2V5ZWREZWNvZGVyJiAKICAgICB9KTsKIH0KIAotYm9vbCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNz OjpkZWNvZGUoS2V5ZWREZWNvZGVyJiBkZWNvZGVyKQorYm9vbCBSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzOjpkZWNvZGUoS2V5ZWREZWNvZGVyJiBkZWNvZGVyLCB1bnNpZ25lZCBtb2RlbFZlcnNpb24p CiB7CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZVN0cmluZygiUHJldmFsZW50UmVzb3VyY2VPcmln aW4iLCBoaWdoTGV2ZWxEb21haW4pKQogICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC0xMzEsOCAr MTMxLDEwIEBAIGJvb2wgUmVzb3VyY2VMb2FkU3RhdGlzdGljczo6ZGVjb2RlKEtleWUKICAgICBk ZWNvZGVIYXNoU2V0KGRlY29kZXIsICJzdG9yYWdlQWNjZXNzVW5kZXJUb3BGcmFtZU9yaWdpbnMi LCBzdG9yYWdlQWNjZXNzVW5kZXJUb3BGcmFtZU9yaWdpbnMpOwogCiAgICAgLy8gVG9wIGZyYW1l IHN0YXRzCi0gICAgZGVjb2RlSGFzaENvdW50ZWRTZXQoZGVjb2RlciwgInRvcEZyYW1lVW5pcXVl UmVkaXJlY3RzVG8iLCB0b3BGcmFtZVVuaXF1ZVJlZGlyZWN0c1RvKTsKLSAgICBkZWNvZGVIYXNo Q291bnRlZFNldChkZWNvZGVyLCAidG9wRnJhbWVVbmlxdWVSZWRpcmVjdHNGcm9tIiwgdG9wRnJh bWVVbmlxdWVSZWRpcmVjdHNGcm9tKTsKKyAgICBpZiAobW9kZWxWZXJzaW9uID49IDExKSB7Cisg ICAgICAgIGRlY29kZUhhc2hDb3VudGVkU2V0KGRlY29kZXIsICJ0b3BGcmFtZVVuaXF1ZVJlZGly ZWN0c1RvIiwgdG9wRnJhbWVVbmlxdWVSZWRpcmVjdHNUbyk7CisgICAgICAgIGRlY29kZUhhc2hD b3VudGVkU2V0KGRlY29kZXIsICJ0b3BGcmFtZVVuaXF1ZVJlZGlyZWN0c0Zyb20iLCB0b3BGcmFt ZVVuaXF1ZVJlZGlyZWN0c0Zyb20pOworICAgIH0KIAogICAgIC8vIFN1YmZyYW1lIHN0YXRzCiAg ICAgZGVjb2RlSGFzaENvdW50ZWRTZXQoZGVjb2RlciwgInN1YmZyYW1lVW5kZXJUb3BGcmFtZU9y aWdpbnMiLCBzdWJmcmFtZVVuZGVyVG9wRnJhbWVPcmlnaW5zKTsKQEAgLTE0MCw3ICsxNDIsOCBA QCBib29sIFJlc291cmNlTG9hZFN0YXRpc3RpY3M6OmRlY29kZShLZXllCiAgICAgLy8gU3VicmVz b3VyY2Ugc3RhdHMKICAgICBkZWNvZGVIYXNoQ291bnRlZFNldChkZWNvZGVyLCAic3VicmVzb3Vy Y2VVbmRlclRvcEZyYW1lT3JpZ2lucyIsIHN1YnJlc291cmNlVW5kZXJUb3BGcmFtZU9yaWdpbnMp OwogICAgIGRlY29kZUhhc2hDb3VudGVkU2V0KGRlY29kZXIsICJzdWJyZXNvdXJjZVVuaXF1ZVJl ZGlyZWN0c1RvIiwgc3VicmVzb3VyY2VVbmlxdWVSZWRpcmVjdHNUbyk7Ci0gICAgZGVjb2RlSGFz aENvdW50ZWRTZXQoZGVjb2RlciwgInN1YnJlc291cmNlVW5pcXVlUmVkaXJlY3RzRnJvbSIsIHN1 YnJlc291cmNlVW5pcXVlUmVkaXJlY3RzRnJvbSk7CisgICAgaWYgKG1vZGVsVmVyc2lvbiA+PSAx MSkKKyAgICAgICAgZGVjb2RlSGFzaENvdW50ZWRTZXQoZGVjb2RlciwgInN1YnJlc291cmNlVW5p cXVlUmVkaXJlY3RzRnJvbSIsIHN1YnJlc291cmNlVW5pcXVlUmVkaXJlY3RzRnJvbSk7CiAKICAg ICAvLyBQcmV2YWxlbnQgUmVzb3VyY2UKICAgICBpZiAoIWRlY29kZXIuZGVjb2RlQm9vbCgiaXNQ cmV2YWxlbnRSZXNvdXJjZSIsIGlzUHJldmFsZW50UmVzb3VyY2UpKQpAQCAtMTYyLDExICsxNjUs MTIgQEAgYm9vbCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzOjpkZWNvZGUoS2V5ZQogICAgICAgICBy ZXR1cm4gZmFsc2U7CiAgICAgbGFzdFNlZW4gPSBXYWxsVGltZTo6ZnJvbVJhd1NlY29uZHMobGFz dFNlZW5UaW1lQXNEb3VibGUpOwogCi0gICAgaWYgKCFkZWNvZGVyLmRlY29kZVVJbnQzMigidGlt ZXNBY2Nlc3NlZEFzRmlyc3RQYXJ0eUR1ZVRvVXNlckludGVyYWN0aW9uIiwgdGltZXNBY2Nlc3Nl ZEFzRmlyc3RQYXJ0eUR1ZVRvVXNlckludGVyYWN0aW9uKSkKLSAgICAgICAgdGltZXNBY2Nlc3Nl ZEFzRmlyc3RQYXJ0eUR1ZVRvVXNlckludGVyYWN0aW9uID0gMDsKLSAgICBpZiAoIWRlY29kZXIu ZGVjb2RlVUludDMyKCJ0aW1lc0FjY2Vzc2VkQXNGaXJzdFBhcnR5RHVlVG9TdG9yYWdlQWNjZXNz QVBJIiwgdGltZXNBY2Nlc3NlZEFzRmlyc3RQYXJ0eUR1ZVRvU3RvcmFnZUFjY2Vzc0FQSSkpCi0g ICAgICAgIHRpbWVzQWNjZXNzZWRBc0ZpcnN0UGFydHlEdWVUb1N0b3JhZ2VBY2Nlc3NBUEkgPSAw OwotCisgICAgaWYgKG1vZGVsVmVyc2lvbiA+PSAxMSkgeworICAgICAgICBpZiAoIWRlY29kZXIu ZGVjb2RlVUludDMyKCJ0aW1lc0FjY2Vzc2VkQXNGaXJzdFBhcnR5RHVlVG9Vc2VySW50ZXJhY3Rp b24iLCB0aW1lc0FjY2Vzc2VkQXNGaXJzdFBhcnR5RHVlVG9Vc2VySW50ZXJhY3Rpb24pKQorICAg ICAgICAgICAgdGltZXNBY2Nlc3NlZEFzRmlyc3RQYXJ0eUR1ZVRvVXNlckludGVyYWN0aW9uID0g MDsKKyAgICAgICAgaWYgKCFkZWNvZGVyLmRlY29kZVVJbnQzMigidGltZXNBY2Nlc3NlZEFzRmly c3RQYXJ0eUR1ZVRvU3RvcmFnZUFjY2Vzc0FQSSIsIHRpbWVzQWNjZXNzZWRBc0ZpcnN0UGFydHlE dWVUb1N0b3JhZ2VBY2Nlc3NBUEkpKQorICAgICAgICAgICAgdGltZXNBY2Nlc3NlZEFzRmlyc3RQ YXJ0eUR1ZVRvU3RvcmFnZUFjY2Vzc0FQSSA9IDA7CisgICAgfQogICAgIHJldHVybiB0cnVlOwog fQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljcy5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0 aWNzLmgJKHJldmlzaW9uIDIyODUyOSkKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJj ZUxvYWRTdGF0aXN0aWNzLmgJKHdvcmtpbmcgY29weSkKQEAgLTU0LDcgKzU0LDcgQEAgc3RydWN0 IFJlc291cmNlTG9hZFN0YXRpc3RpY3MgewogICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBTdHJp bmcgcHJpbWFyeURvbWFpbihjb25zdCBTdHJpbmcmIGhvc3QpOwogCiAgICAgV0VCQ09SRV9FWFBP UlQgdm9pZCBlbmNvZGUoS2V5ZWRFbmNvZGVyJikgY29uc3Q7Ci0gICAgV0VCQ09SRV9FWFBPUlQg Ym9vbCBkZWNvZGUoS2V5ZWREZWNvZGVyJik7CisgICAgV0VCQ09SRV9FWFBPUlQgYm9vbCBkZWNv ZGUoS2V5ZWREZWNvZGVyJiwgdW5zaWduZWQgbW9kZWxWZXJzaW9uKTsKIAogICAgIFN0cmluZyB0 b1N0cmluZygpIGNvbnN0OwogCkluZGV4OiBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkocmV2aXNpb24gMjI4NTMxKQorKysgU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxOSBAQAorMjAx OC0wMi0xNSAgSm9obiBXaWxhbmRlciAgPHdpbGFuZGVyQGFwcGxlLmNvbT4KKworICAgICAgICBS ZXNvdXJjZSBMb2FkIFN0YXRpc3RpY3M6IE1ha2Ugc3VyZSBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzU3RvcmU6Om1lcmdlV2l0aERhdGFGcm9tRGVjb2RlcigpIGNhbiBpbmdlc3Qgb2xkZXIgcGxp c3QgdmVyc2lvbnMgYW5kIG5vdCByZXNldCB0aGUgZGF0YWJhc2UKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjgxMgorICAgICAgICA8cmRhcjovL3By b2JsZW0vMzc1MTE0MDY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQnJlbnQgRnVsZ2hhbS4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6Om1lcmdlV2l0 aERhdGFGcm9tRGVjb2Rlcik6CisgICAgICAgICAgICBOb3cgZG9lcyB0aGUgZm9sbG93aW5nOgor ICAgICAgICAgICAgLSBMb2dzIHdoZW4gdGhlcmUgaXMgYSBtb2RlbCB2ZXJzaW9uIG1pc21hdGNo LgorICAgICAgICAgICAgLSBEb2VzIG5vdCBpbmdlc3Qgc3RhdGlzdGljcyBpZiB0aGUgdmVyc2lv biBvbiBkaXNrIGlzIG5ld2VyIHRoYW4gdGhlIHN1cHBvcnRlZCBvbmUuCisgICAgICAgICAgICAt IERvZXMgaW5nZXN0IHN0YXRpc3RpY3MgaWYgdGhlIHZlcnNpb24gb24gZGlzayBpcyBvbGRlciB0 aGFuIHRoZSBzdXBwb3J0ZWQgb25lLgorICAgICAgICAgICAgLSBQYXNzZXMgb24gdGhlIHZlcnNp b24gZm91bmQgb24gZGlzayB0byBXZWJDb3JlOjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzOjpkZWNv ZGUoKS4KKwogMjAxOC0wMi0xNSAgSmlld2VuIFRhbiAgPGppZXdlbl90YW5AYXBwbGUuY29tPgog CiAgICAgICAgIFtXZWJBdXRoTl0gUmV2aXNpdCB0aGUgd2hvbGUgYXN5bmMgbW9kZWwgb2YgdGFz ayBkaXNwYXRjaGluZywgdGltZW91dCBhbmQgYWJvcnRpbmcKSW5kZXg6IFNvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3Jl LmNwcAkocmV2aXNpb24gMjI4NTI5KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODAzLDggKzgw MywxMCBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6bWVyCiAgICAgaWYg KCFkZWNvZGVyLmRlY29kZVVJbnQzMigidmVyc2lvbiIsIHZlcnNpb25PbkRpc2spKQogICAgICAg ICByZXR1cm47CiAKLSAgICBpZiAodmVyc2lvbk9uRGlzayAhPSBzdGF0aXN0aWNzTW9kZWxWZXJz aW9uKQorICAgIGlmICh2ZXJzaW9uT25EaXNrID4gc3RhdGlzdGljc01vZGVsVmVyc2lvbikgewor ICAgICAgICBXVEZMb2dBbHdheXMoIkZvdW5kIHJlc291cmNlIGxvYWQgc3RhdGlzdGljcyBvbiBk aXNrIHdpdGggbW9kZWwgdmVyc2lvbiAldSB3aGVyZWFzIHRoZSBoaWdoZXN0IHN1cHBvcnRlZCB2 ZXJzaW9uIGlzICV1LiBSZXNldHRpbmcuIiwgdmVyc2lvbk9uRGlzaywgc3RhdGlzdGljc01vZGVs VmVyc2lvbik7CiAgICAgICAgIHJldHVybjsKKyAgICB9CiAKICAgICBkb3VibGUgZW5kT2ZHcmFu ZGZhdGhlcmluZ1RpbWVzdGFtcDsKICAgICBpZiAoZGVjb2Rlci5kZWNvZGVEb3VibGUoImVuZE9m R3JhbmRmYXRoZXJpbmdUaW1lc3RhbXAiLCBlbmRPZkdyYW5kZmF0aGVyaW5nVGltZXN0YW1wKSkK QEAgLTgxMyw4ICs4MTUsOCBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6 bWVyCiAgICAgICAgIG1fZW5kT2ZHcmFuZGZhdGhlcmluZ1RpbWVzdGFtcCA9IHsgfTsKIAogICAg IFZlY3RvcjxSZXNvdXJjZUxvYWRTdGF0aXN0aWNzPiBsb2FkZWRTdGF0aXN0aWNzOwotICAgIGJv b2wgc3VjY2VlZGVkID0gZGVjb2Rlci5kZWNvZGVPYmplY3RzKCJicm93c2luZ1N0YXRpc3RpY3Mi LCBsb2FkZWRTdGF0aXN0aWNzLCBbXShLZXllZERlY29kZXImIGRlY29kZXJJbm5lciwgUmVzb3Vy Y2VMb2FkU3RhdGlzdGljcyYgc3RhdGlzdGljcykgewotICAgICAgICByZXR1cm4gc3RhdGlzdGlj cy5kZWNvZGUoZGVjb2RlcklubmVyKTsKKyAgICBib29sIHN1Y2NlZWRlZCA9IGRlY29kZXIuZGVj b2RlT2JqZWN0cygiYnJvd3NpbmdTdGF0aXN0aWNzIiwgbG9hZGVkU3RhdGlzdGljcywgW3ZlcnNp b25PbkRpc2tdKEtleWVkRGVjb2RlciYgZGVjb2RlcklubmVyLCBSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzJiBzdGF0aXN0aWNzKSB7CisgICAgICAgIHJldHVybiBzdGF0aXN0aWNzLmRlY29kZShkZWNv ZGVySW5uZXIsIHZlcnNpb25PbkRpc2spOwogICAgIH0pOwogCiAgICAgaWYgKCFzdWNjZWVkZWQp Cg==