230000 2021-09-07 07:51:11 -0700 Migrate some WPT WebRTC tests off of legacy offerToReceive parameters 2021-09-14 00:41:18 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://github.com/web-platform-tests/wpt/pull/30379 InRadar P2 Normal --- 1 youennf youennf clopez eric.carlson ews-watchlist webkit-bug-importer youennf oldest_to_newest 1791005 0 youennf 2021-09-07 07:51:11 -0700 Migrate some WPT WebRTC tests our of legacy offerToReceive parameters 1791006 1 437502 youennf 2021-09-07 07:52:07 -0700 Created attachment 437502 Patch 1791014 2 437505 youennf 2021-09-07 08:15:42 -0700 Created attachment 437505 Patch 1791016 3 youennf 2021-09-07 08:16:10 -0700 Submitted web-platform-tests pull request: https://github.com/web-platform-tests/wpt/pull/30379 1791137 4 437538 youennf 2021-09-07 11:27:53 -0700 Created attachment 437538 Patch 1791138 5 ews-watchlist 2021-09-07 11:28:50 -0700 This patch modifies the imported WPT tests. Please ensure that any changes on the tests (not coming from a WPT import) are exported to WPT. Please see https://trac.webkit.org/wiki/WPTExportProcess 1793216 6 ews-feeder 2021-09-14 00:40:44 -0700 Committed r282381 (241643@main): <https://commits.webkit.org/241643@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 437538. 1793218 7 webkit-bug-importer 2021-09-14 00:41:18 -0700 <rdar://problem/83091287> 437502 2021-09-07 07:52:07 -0700 2021-09-07 08:15:38 -0700 Patch bug-230000-20210907165205.patch text/plain 16982 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxOTc4CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBv cnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpp bmRleCA5MTc2YWM4MTIwYzMwMWZmODllMmE4NTcyMjY0YTY1ZGVlNWE4YjYwLi4xODdlNzUwMzY4 ZmQ2YzIxMTg0ZDM2NjExOWJiNDJhYzE0MWE5MWIzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9p bXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAyMS0wOS0wNyAgWW91ZW5uIEZhYmxldCAgPHlvdWVu bkBhcHBsZS5jb20+CisKKyAgICAgICAgTWlncmF0ZSBzb21lIFdQVCBXZWJSVEMgdGVzdHMgb3Vy IG9mIGxlZ2FjeSBvZmZlclRvUmVjZWl2ZSBwYXJhbWV0ZXJzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzAwMDAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBtaWdyYXRlLXRlc3RzLXRvT2ZmZXJSZWNlaXZl CisKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJDb25uZWN0aW9u LWV4cGxpY2l0LXJvbGxiYWNrLWljZUdhdGhlcmluZ1N0YXRlLmh0bWw6CisgICAgICAgICogd2Vi LXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1pY2VHYXRoZXJpbmdTdGF0 ZS5odG1sOgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5l Y3Rpb24tc2V0TG9jYWxEZXNjcmlwdGlvbi1hbnN3ZXIuaHRtbDoKKyAgICAgICAgKiB3ZWItcGxh dGZvcm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJDb25uZWN0aW9uLXNldExvY2FsRGVzY3JpcHRpb24t b2ZmZXIuaHRtbDoKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJD b25uZWN0aW9uLXNldExvY2FsRGVzY3JpcHRpb24tcm9sbGJhY2suaHRtbDoKKyAgICAgICAgKiB3 ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJDb25uZWN0aW9uLXNldFJlbW90ZURlc2Ny aXB0aW9uLW9mZmVyLmh0bWw6CisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9S VENQZWVyQ29ubmVjdGlvbi1zZXRSZW1vdGVEZXNjcmlwdGlvbi1yb2xsYmFjay5odG1sOgorICAg ICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tdHJhbnNj ZWl2ZXJzLmh0dHBzLmh0bWw6CisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9w cm90b2NvbC9SVENQZWVyQ29ubmVjdGlvbi1wYXlsb2FkVHlwZXMuaHRtbDoKKwogMjAyMS0wOS0w NyAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIHN1cHBv cnQgZm9yIFJUQ0RhdGFDaGFubmVsIGNsb3NpbmcgZXZlbnQKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJDb25uZWN0 aW9uLWV4cGxpY2l0LXJvbGxiYWNrLWljZUdhdGhlcmluZ1N0YXRlLmh0bWwgYi9MYXlvdXRUZXN0 cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlv bi1leHBsaWNpdC1yb2xsYmFjay1pY2VHYXRoZXJpbmdTdGF0ZS5odG1sCmluZGV4IDljMWZlMDE0 YmQ5ZWUxOGJiNmE5YWI2NWVhN2FhM2VlYmJjZTEyMDAuLmUzOWI5ODViZWYyZmU2NWQzNTllMTYx NTJiOGNmZjMyMjAxNmZkMDggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJDb25uZWN0aW9uLWV4cGxpY2l0LXJvbGxi YWNrLWljZUdhdGhlcmluZ1N0YXRlLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tZXhwbGljaXQtcm9s bGJhY2staWNlR2F0aGVyaW5nU3RhdGUuaHRtbApAQCAtMTIsOCArMTIsOSBAQCBwcm9taXNlX3Rl c3QoYXN5bmMgdCA9PiB7CiAgIHQuYWRkX2NsZWFudXAoKCkgPT4gcGMxLmNsb3NlKCkpOwogICBj b25zdCBwYzIgPSBuZXcgUlRDUGVlckNvbm5lY3Rpb24oKTsKICAgdC5hZGRfY2xlYW51cCgoKSA9 PiBwYzIuY2xvc2UoKSk7CisgIHBjMS5hZGRUcmFuc2NlaXZlcignYXVkaW8nLCB7IGRpcmVjdGlv bjogJ3JlY3Zvbmx5JyB9KTsKICAgYXdhaXQgaW5pdGlhbE9mZmVyQW5zd2VyV2l0aEljZUdhdGhl cmluZ1N0YXRlVHJhbnNpdGlvbnMoCi0gICAgICBwYzEsIHBjMiwge29mZmVyVG9SZWNlaXZlQXVk aW86IHRydWV9KTsKKyAgICAgIHBjMSwgcGMyKTsKICAgYXdhaXQgcGMxLnNldExvY2FsRGVzY3Jp cHRpb24oYXdhaXQgcGMxLmNyZWF0ZU9mZmVyKHtpY2VSZXN0YXJ0OiB0cnVlfSkpOwogICBhd2Fp dCBpY2VHYXRoZXJpbmdTdGF0ZVRyYW5zaXRpb25zKHBjMSwgJ2dhdGhlcmluZycsICdjb21wbGV0 ZScpOwogICBleHBlY3ROb01vcmVHYXRoZXJpbmdTdGF0ZUNoYW5nZXModCwgcGMxKTsKQEAgLTI0 LDggKzI1LDkgQEAgcHJvbWlzZV90ZXN0KGFzeW5jIHQgPT4gewogcHJvbWlzZV90ZXN0KGFzeW5j IHQgPT4gewogICBjb25zdCBwYyA9IG5ldyBSVENQZWVyQ29ubmVjdGlvbigpOwogICB0LmFkZF9j bGVhbnVwKCgpID0+IHBjLmNsb3NlKCkpOworICBwYy5hZGRUcmFuc2NlaXZlcignYXVkaW8nLCB7 IGRpcmVjdGlvbjogJ3JlY3Zvbmx5JyB9KTsKICAgYXdhaXQgcGMuc2V0TG9jYWxEZXNjcmlwdGlv bigKLSAgICBhd2FpdCBwYy5jcmVhdGVPZmZlcih7b2ZmZXJUb1JlY2VpdmVBdWRpbzogdHJ1ZX0p KTsKKyAgICBhd2FpdCBwYy5jcmVhdGVPZmZlcigpKTsKICAgYXdhaXQgaWNlR2F0aGVyaW5nU3Rh dGVUcmFuc2l0aW9ucyhwYywgJ2dhdGhlcmluZycsICdjb21wbGV0ZScpOwogICBhd2FpdCBwYy5z ZXRMb2NhbERlc2NyaXB0aW9uKHt0eXBlOiAncm9sbGJhY2snfSk7CiAgIGF3YWl0IGljZUdhdGhl cmluZ1N0YXRlVHJhbnNpdGlvbnMocGMsICduZXcnKTsKQEAgLTM0LDggKzM2LDkgQEAgcHJvbWlz ZV90ZXN0KGFzeW5jIHQgPT4gewogcHJvbWlzZV90ZXN0KGFzeW5jIHQgPT4gewogICBjb25zdCBw YyA9IG5ldyBSVENQZWVyQ29ubmVjdGlvbigpOwogICB0LmFkZF9jbGVhbnVwKCgpID0+IHBjLmNs b3NlKCkpOworICBwYy5hZGRUcmFuc2NlaXZlcignYXVkaW8nLCB7IGRpcmVjdGlvbjogJ3JlY3Zv bmx5JyB9KTsKICAgYXdhaXQgcGMuc2V0TG9jYWxEZXNjcmlwdGlvbigKLSAgICBhd2FpdCBwYy5j cmVhdGVPZmZlcih7b2ZmZXJUb1JlY2VpdmVBdWRpbzogdHJ1ZX0pKTsKKyAgICBhd2FpdCBwYy5j cmVhdGVPZmZlcigpKTsKICAgYXdhaXQgaWNlR2F0aGVyaW5nU3RhdGVUcmFuc2l0aW9ucyhwYywg J2dhdGhlcmluZycpOwogICBhd2FpdCBwYy5zZXRMb2NhbERlc2NyaXB0aW9uKHt0eXBlOiAncm9s bGJhY2snfSk7CiAgIC8vIFdlIG1pZ2h0IGdvIGRpcmVjdGx5IHRvICduZXcnLCBvciB3ZSBtaWdo dCBnbyB0byAnY29tcGxldGUnIGZpcnN0LApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24taWNlR2F0 aGVyaW5nU3RhdGUuaHRtbCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t dGVzdHMvd2VicnRjL1JUQ1BlZXJDb25uZWN0aW9uLWljZUdhdGhlcmluZ1N0YXRlLmh0bWwKaW5k ZXggODcwZTZhZDcyZWMzNTZlY2VmYmNhNjg4NzhkYTczMWUzNDdlZDE3Yy4uOTMzYTIxY2M3NWVm Y2IxNDkwM2E1ODZkOTkxNjI3OGZkMGM5ZjgyNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24taWNl R2F0aGVyaW5nU3RhdGUuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1pY2VHYXRoZXJpbmdTdGF0ZS5o dG1sCkBAIC04OSw4ICs4OSw5IEBACiAgICAgdC5hZGRfY2xlYW51cCgoKSA9PiBwYzEuY2xvc2Uo KSk7CiAgICAgY29uc3QgcGMyID0gbmV3IFJUQ1BlZXJDb25uZWN0aW9uKCk7CiAgICAgdC5hZGRf Y2xlYW51cCgoKSA9PiBwYzIuY2xvc2UoKSk7CisgICAgcGMxLmFkZFRyYW5zY2VpdmVyKCdhdWRp bycsIHsgZGlyZWN0aW9uOiAncmVjdm9ubHknIH0pOwogICAgIGF3YWl0IGluaXRpYWxPZmZlckFu c3dlcldpdGhJY2VHYXRoZXJpbmdTdGF0ZVRyYW5zaXRpb25zKAotICAgICAgICBwYzEsIHBjMiwg e29mZmVyVG9SZWNlaXZlQXVkaW86IHRydWV9KTsKKyAgICAgICAgcGMxLCBwYzIpOwogCiAgICAg ZXhwZWN0Tm9Nb3JlR2F0aGVyaW5nU3RhdGVDaGFuZ2VzKHQsIHBjMSk7CiAgICAgZXhwZWN0Tm9N b3JlR2F0aGVyaW5nU3RhdGVDaGFuZ2VzKHQsIHBjMik7CkBAIC0xMTcsOCArMTE4LDkgQEAKICAg ICB0LmFkZF9jbGVhbnVwKCgpID0+IHBjMS5jbG9zZSgpKTsKICAgICBjb25zdCBwYzIgPSBuZXcg UlRDUGVlckNvbm5lY3Rpb24oKTsKICAgICB0LmFkZF9jbGVhbnVwKCgpID0+IHBjMi5jbG9zZSgp KTsKKyAgICBwYzEuYWRkVHJhbnNjZWl2ZXIoJ2F1ZGlvJywgeyBkaXJlY3Rpb246ICdyZWN2b25s eScgfSk7CiAgICAgYXdhaXQgaW5pdGlhbE9mZmVyQW5zd2VyV2l0aEljZUdhdGhlcmluZ1N0YXRl VHJhbnNpdGlvbnMoCi0gICAgICAgIHBjMSwgcGMyLCB7b2ZmZXJUb1JlY2VpdmVBdWRpbzp0cnVl fSk7CisgICAgICAgIHBjMSwgcGMyKTsKICAgICBhd2FpdCBwYzEuc2V0TG9jYWxEZXNjcmlwdGlv bihhd2FpdCBwYzEuY3JlYXRlT2ZmZXIoe2ljZVJlc3RhcnQ6IHRydWV9KSk7CiAgICAgYXdhaXQg aWNlR2F0aGVyaW5nU3RhdGVUcmFuc2l0aW9ucyhwYzEsICdnYXRoZXJpbmcnLCAnY29tcGxldGUn KTsKICAgfSwgJ3NldExvY2FsRGVzY3JpcHRpb24ocmVvZmZlcikgd2l0aCBhIG5ldyB0cmFuc3Bv cnQgc2hvdWxkIGNhdXNlIGljZUdhdGhlcmluZ1N0YXRlIHRvIGdvIHRvICJjaGVja2luZyIgYW5k IHRoZW4gImNvbXBsZXRlIicpOwpAQCAtMTI5LDcgKzEzMSw4IEBACiAgICAgY29uc3QgcGMyID0g bmV3IFJUQ1BlZXJDb25uZWN0aW9uKCk7CiAgICAgdC5hZGRfY2xlYW51cCgoKSA9PiBwYzIuY2xv c2UoKSk7CiAgICAgZXhwZWN0Tm9Nb3JlR2F0aGVyaW5nU3RhdGVDaGFuZ2VzKHQsIHBjMik7Ci0g ICAgY29uc3Qgb2ZmZXIgPSBhd2FpdCBwYzEuY3JlYXRlT2ZmZXIoe29mZmVyVG9SZWNlaXZlQXVk aW86IHRydWV9KTsKKyAgICBwYzEuYWRkVHJhbnNjZWl2ZXIoJ2F1ZGlvJywgeyBkaXJlY3Rpb246 ICdyZWN2b25seScgfSk7CisgICAgY29uc3Qgb2ZmZXIgPSBhd2FpdCBwYzEuY3JlYXRlT2ZmZXIo KTsKICAgICBhd2FpdCBwYzIuc2V0UmVtb3RlRGVzY3JpcHRpb24ob2ZmZXIpOwogICAgIGF3YWl0 IHBjMi5zZXRSZW1vdGVEZXNjcmlwdGlvbihvZmZlcik7CiAgICAgYXdhaXQgcGMyLnNldFJlbW90 ZURlc2NyaXB0aW9uKHt0eXBlOiAncm9sbGJhY2snfSk7CkBAIC0xNDEsOCArMTQ0LDkgQEAKICAg ICB0LmFkZF9jbGVhbnVwKCgpID0+IHBjMS5jbG9zZSgpKTsKICAgICBjb25zdCBwYzIgPSBuZXcg UlRDUGVlckNvbm5lY3Rpb24oKTsKICAgICB0LmFkZF9jbGVhbnVwKCgpID0+IHBjMi5jbG9zZSgp KTsKKyAgICBwYzEuYWRkVHJhbnNjZWl2ZXIoJ2F1ZGlvJywgeyBkaXJlY3Rpb246ICdyZWN2b25s eScgfSk7CiAgICAgYXdhaXQgaW5pdGlhbE9mZmVyQW5zd2VyV2l0aEljZUdhdGhlcmluZ1N0YXRl VHJhbnNpdGlvbnMoCi0gICAgICAgIHBjMSwgcGMyLCB7b2ZmZXJUb1JlY2VpdmVBdWRpbzogdHJ1 ZX0pOworICAgICAgICBwYzEsIHBjMik7CiAKICAgICBjb25zdCBwYzF3YWl0ZXIgPSBpY2VHYXRo ZXJpbmdTdGF0ZVRyYW5zaXRpb25zKHBjMSwgJ25ldycpOwogICAgIGNvbnN0IHBjMndhaXRlciA9 IGljZUdhdGhlcmluZ1N0YXRlVHJhbnNpdGlvbnMocGMyLCAnbmV3Jyk7CmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVy Q29ubmVjdGlvbi1zZXRMb2NhbERlc2NyaXB0aW9uLWFuc3dlci5odG1sIGIvTGF5b3V0VGVzdHMv aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24t c2V0TG9jYWxEZXNjcmlwdGlvbi1hbnN3ZXIuaHRtbAppbmRleCA4MjFlZTFkMGIxNWNlMTFhZGI5 YjVjNjg4ZWRhNjNiYWUwMmU0MGRkLi41ZDQ5OTk1NDk2ODQ5MzhiNWQyN2UxN2RjNjkzZGY5YjMx ZWRkYzExIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1zZXRMb2NhbERlc2NyaXB0aW9uLWFuc3dl ci5odG1sCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv d2VicnRjL1JUQ1BlZXJDb25uZWN0aW9uLXNldExvY2FsRGVzY3JpcHRpb24tYW5zd2VyLmh0bWwK QEAgLTE3NywxMSArMTc3LDEzIEBACiAgICAgY29uc3QgcGMyID0gbmV3IFJUQ1BlZXJDb25uZWN0 aW9uKCk7CiAgICAgdC5hZGRfY2xlYW51cCgoKSA9PiBwYzIuY2xvc2UoKSk7CiAKLSAgICBjb25z dCBvZmZlciA9IGF3YWl0IHBjMS5jcmVhdGVPZmZlcih7b2ZmZXJUb1JlY2VpdmVBdWRpbzogdHJ1 ZX0pOworICAgIHBjMS5hZGRUcmFuc2NlaXZlcignYXVkaW8nLCB7IGRpcmVjdGlvbjogJ3JlY3Zv bmx5JyB9KTsKKyAgICBjb25zdCBvZmZlciA9IGF3YWl0IHBjMS5jcmVhdGVPZmZlcigpOwogICAg IGF3YWl0IHBjMi5zZXRSZW1vdGVEZXNjcmlwdGlvbihvZmZlcik7CiAgICAgY29uc3QgYW5zd2Vy ID0gYXdhaXQgcGMyLmNyZWF0ZUFuc3dlcigpOyAvLyBbW0xhc3RBbnN3ZXJdXSBzbG90IHNldAog ICAgIGF3YWl0IHBjMi5zZXRSZW1vdGVEZXNjcmlwdGlvbih7dHlwZTogInJvbGxiYWNrIn0pOwot ICAgIGF3YWl0IHBjMi5jcmVhdGVPZmZlcih7b2ZmZXJUb1JlY2VpdmVWaWRlbzogdHJ1ZX0pOyAv LyBbW0xhc3RPZmZlcl1dIHNsb3Qgc2V0CisgICAgcGMyLmFkZFRyYW5zY2VpdmVyKCd2aWRlbycs IHsgZGlyZWN0aW9uOiAncmVjdm9ubHknIH0pOworICAgIGF3YWl0IHBjMi5jcmVhdGVPZmZlcigp OyAvLyBbW0xhc3RPZmZlcl1dIHNsb3Qgc2V0CiAgICAgYXdhaXQgcGMyLnNldFJlbW90ZURlc2Ny aXB0aW9uKG9mZmVyKTsKICAgICBhd2FpdCBwYzIuc2V0TG9jYWxEZXNjcmlwdGlvbihhbnN3ZXIp OyAvLyBTaG91bGQgY2hlY2sgYWdhaW5zdCBbW0xhc3RBbnN3ZXJdXSwgbm90IFtbTGFzdE9mZmVy XV0KICAgfSwgIlNldHRpbmcgcHJldmlvdXNseSBnZW5lcmF0ZWQgYW5zd2VyIGFmdGVyIGEgY2Fs bCB0byBjcmVhdGVPZmZlciBzaG91bGQgd29yayIpOwpAQCAtMTkyLDcgKzE5NCw4IEBACiAgICAg Y29uc3QgcGMyID0gbmV3IFJUQ1BlZXJDb25uZWN0aW9uKCk7CiAgICAgdC5hZGRfY2xlYW51cCgo KSA9PiBwYzIuY2xvc2UoKSk7CiAKLSAgICBhd2FpdCBwYzIuc2V0UmVtb3RlRGVzY3JpcHRpb24o YXdhaXQgcGMxLmNyZWF0ZU9mZmVyKHtvZmZlclRvUmVjZWl2ZUF1ZGlvOiB0cnVlfSkpOworICAg IHBjMi5hZGRUcmFuc2NlaXZlcignYXVkaW8nLCB7IGRpcmVjdGlvbjogJ3JlY3Zvbmx5JyB9KTsK KyAgICBhd2FpdCBwYzIuc2V0UmVtb3RlRGVzY3JpcHRpb24oYXdhaXQgcGMxLmNyZWF0ZU9mZmVy KCkpOwogICAgIGNvbnN0IGFuc3dlciA9IGF3YWl0IHBjMi5jcmVhdGVBbnN3ZXIoKTsKICAgICBj b25zdCBzbGRQcm9taXNlID0gcGMyLnNldExvY2FsRGVzY3JpcHRpb24oYW5zd2VyKTsKIApkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJy dGMvUlRDUGVlckNvbm5lY3Rpb24tc2V0TG9jYWxEZXNjcmlwdGlvbi1vZmZlci5odG1sIGIvTGF5 b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNv bm5lY3Rpb24tc2V0TG9jYWxEZXNjcmlwdGlvbi1vZmZlci5odG1sCmluZGV4IDdhZjcxNTBkZjYw OGI2MGZhMGUxZDJhZDAxZGI5Y2Q0ZGFlZmIxMjIuLmM0ZjQ3NmIwMDlkNTA0Yjc4MDE2ODgzYmRm YTY4MDM4MDhiNDNhN2IgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJDb25uZWN0aW9uLXNldExvY2FsRGVzY3JpcHRp b24tb2ZmZXIuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1zZXRMb2NhbERlc2NyaXB0aW9uLW9mZmVy Lmh0bWwKQEAgLTE2Myw4ICsxNjMsMTAgQEAKICAgICBjb25zdCBwYzIgPSBuZXcgUlRDUGVlckNv bm5lY3Rpb24oKTsKICAgICB0LmFkZF9jbGVhbnVwKCgpID0+IHBjMi5jbG9zZSgpKTsKIAotICAg IGNvbnN0IG9mZmVyID0gYXdhaXQgcGMxLmNyZWF0ZU9mZmVyKHtvZmZlclRvUmVjZWl2ZUF1ZGlv OiB0cnVlfSk7IC8vIFtbTGFzdE9mZmVyXV0gc2V0Ci0gICAgY29uc3Qgb2ZmZXIyID0gYXdhaXQg cGMyLmNyZWF0ZU9mZmVyKHtvZmZlclRvUmVjZWl2ZVZpZGVvOiB0cnVlfSk7CisgICAgcGMxLmFk ZFRyYW5zY2VpdmVyKCdhdWRpbycsIHsgZGlyZWN0aW9uOiAncmVjdm9ubHknIH0pOworICAgIGNv bnN0IG9mZmVyID0gYXdhaXQgcGMxLmNyZWF0ZU9mZmVyKCk7IC8vIFtbTGFzdE9mZmVyXV0gc2V0 CisgICAgcGMyLmFkZFRyYW5zY2VpdmVyKCd2aWRlbycsIHsgZGlyZWN0aW9uOiAncmVjdm9ubHkn IH0pOworICAgIGNvbnN0IG9mZmVyMiA9IGF3YWl0IHBjMi5jcmVhdGVPZmZlcigpOwogICAgIGF3 YWl0IHBjMS5zZXRSZW1vdGVEZXNjcmlwdGlvbihvZmZlcjIpOwogICAgIGF3YWl0IHBjMS5jcmVh dGVBbnN3ZXIoKTsgLy8gW1tMYXN0QW5zd2VyXV0gc2V0CiAgICAgYXdhaXQgcGMxLnNldFJlbW90 ZURlc2NyaXB0aW9uKHt0eXBlOiAicm9sbGJhY2sifSk7CkBAIC0xNzcsNyArMTc5LDggQEAKICAg ICBjb25zdCBwYzIgPSBuZXcgUlRDUGVlckNvbm5lY3Rpb24oKTsKICAgICB0LmFkZF9jbGVhbnVw KCgpID0+IHBjMi5jbG9zZSgpKTsKIAotICAgIGF3YWl0IHBjMS5zZXRMb2NhbERlc2NyaXB0aW9u KGF3YWl0IHBjMS5jcmVhdGVPZmZlcih7b2ZmZXJUb1JlY2VpdmVBdWRpbzogdHJ1ZX0pKTsKKyAg ICBwYzEuYWRkVHJhbnNjZWl2ZXIoJ2F1ZGlvJywgeyBkaXJlY3Rpb246ICdyZWN2b25seScgfSk7 CisgICAgYXdhaXQgcGMxLnNldExvY2FsRGVzY3JpcHRpb24oYXdhaXQgcGMxLmNyZWF0ZU9mZmVy KCkpOwogCiAgICAgY29uc3Qgb2ZmZXIgPSBhd2FpdCBwYzEuY3JlYXRlT2ZmZXIoKTsKICAgICBh d2FpdCBwYzEuc2V0TG9jYWxEZXNjcmlwdGlvbihvZmZlcik7CkBAIC0xOTYsNyArMTk5LDggQEAK ICAgICBjb25zdCBwYyA9IG5ldyBSVENQZWVyQ29ubmVjdGlvbigpOwogICAgIHQuYWRkX2NsZWFu dXAoKCkgPT4gcGMuY2xvc2UoKSk7CiAKLSAgICBjb25zdCBzbGRQcm9taXNlID0gcGMuc2V0TG9j YWxEZXNjcmlwdGlvbihhd2FpdCBwYy5jcmVhdGVPZmZlcih7b2ZmZXJUb1JlY2VpdmVBdWRpbzog dHJ1ZX0pKTsKKyAgICBwYy5hZGRUcmFuc2NlaXZlcignYXVkaW8nLCB7IGRpcmVjdGlvbjogJ3Jl Y3Zvbmx5JyB9KTsKKyAgICBjb25zdCBzbGRQcm9taXNlID0gcGMuc2V0TG9jYWxEZXNjcmlwdGlv bihhd2FpdCBwYy5jcmVhdGVPZmZlcigpKTsKIAogICAgIGFzc2VydF9lcXVhbHMocGMuc2lnbmFs aW5nU3RhdGUsICJzdGFibGUiLCAic2lnbmFsaW5nU3RhdGUgc2hvdWxkIG5vdCBiZSBzZXQgc3lu Y2hyb25vdXNseSBhZnRlciBhIGNhbGwgdG8gc0xEIik7CiAKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJDb25uZWN0 aW9uLXNldExvY2FsRGVzY3JpcHRpb24tcm9sbGJhY2suaHRtbCBiL0xheW91dFRlc3RzL2ltcG9y dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJDb25uZWN0aW9uLXNldExv Y2FsRGVzY3JpcHRpb24tcm9sbGJhY2suaHRtbAppbmRleCBlMTYwN2I2MzgzNjY3MDc4NDFkNzQz NTJkOWU5ZWUxMGQyMTg1MDRhLi4wNmJiY2Y5YjEwYjU4ZTdlZTc1NWUzMTgzYzcxNzRjZWIzMmYy YzI0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1zZXRMb2NhbERlc2NyaXB0aW9uLXJvbGxiYWNr Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93 ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tc2V0TG9jYWxEZXNjcmlwdGlvbi1yb2xsYmFjay5odG1s CkBAIC0xMzIsNyArMTMyLDggQEAKICAgICBjb25zdCBwYyA9IG5ldyBSVENQZWVyQ29ubmVjdGlv bigpOwogICAgIHQuYWRkX2NsZWFudXAoKCkgPT4gcGMuY2xvc2UoKSk7CiAKLSAgICBhd2FpdCBw Yy5zZXRMb2NhbERlc2NyaXB0aW9uKGF3YWl0IHBjLmNyZWF0ZU9mZmVyKHtvZmZlclRvUmVjZWl2 ZUF1ZGlvOiB0cnVlfSkpOworICAgIHBjLmFkZFRyYW5zY2VpdmVyKCdhdWRpbycsIHsgZGlyZWN0 aW9uOiAncmVjdm9ubHknIH0pOworICAgIGF3YWl0IHBjLnNldExvY2FsRGVzY3JpcHRpb24oYXdh aXQgcGMuY3JlYXRlT2ZmZXIoKSk7CiAgICAgY29uc3Qgc2xkUHJvbWlzZSA9IHBjLnNldExvY2Fs RGVzY3JpcHRpb24oe3R5cGU6ICJyb2xsYmFjayJ9KTsKIAogICAgIGFzc2VydF9lcXVhbHMocGMu c2lnbmFsaW5nU3RhdGUsICJoYXZlLWxvY2FsLW9mZmVyIiwgInNpZ25hbGluZ1N0YXRlIHNob3Vs ZCBub3QgYmUgc2V0IHN5bmNocm9ub3VzbHkgYWZ0ZXIgYSBjYWxsIHRvIHNMRCIpOwpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMv UlRDUGVlckNvbm5lY3Rpb24tc2V0UmVtb3RlRGVzY3JpcHRpb24tb2ZmZXIuaHRtbCBiL0xheW91 dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJDb25u ZWN0aW9uLXNldFJlbW90ZURlc2NyaXB0aW9uLW9mZmVyLmh0bWwKaW5kZXggYTUwZTk2OTYzNzI5 NGFlYzhlZWFmZTY4MmRhNWQyNThlMmE5MGRlNS4uMjQ3ZDZlMGQ0OWVjNjQ0N2NkZTlkNGU3OTEy N2RhN2Y5MTM2Y2UzOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tc2V0UmVtb3RlRGVzY3JpcHRp b24tb2ZmZXIuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1zZXRSZW1vdGVEZXNjcmlwdGlvbi1vZmZl ci5odG1sCkBAIC0xOTMsNyArMTkzLDggQEAKICAgICBjb25zdCBwYzIgPSBuZXcgUlRDUGVlckNv bm5lY3Rpb24oKTsKICAgICB0LmFkZF9jbGVhbnVwKCgpID0+IHBjMi5jbG9zZSgpKTsKIAotICAg IGNvbnN0IHNyZFByb21pc2UgPSBwYzIuc2V0UmVtb3RlRGVzY3JpcHRpb24oYXdhaXQgcGMxLmNy ZWF0ZU9mZmVyKHtvZmZlclRvUmVjZWl2ZUF1ZGlvOiB0cnVlfSkpOworICAgIHBjMS5hZGRUcmFu c2NlaXZlcignYXVkaW8nLCB7IGRpcmVjdGlvbjogJ3JlY3Zvbmx5JyB9KTsKKyAgICBjb25zdCBz cmRQcm9taXNlID0gcGMyLnNldFJlbW90ZURlc2NyaXB0aW9uKGF3YWl0IHBjMS5jcmVhdGVPZmZl cigpKTsKIAogICAgIGFzc2VydF9lcXVhbHMocGMyLnNpZ25hbGluZ1N0YXRlLCAic3RhYmxlIiwg InNpZ25hbGluZ1N0YXRlIHNob3VsZCBub3QgYmUgc2V0IHN5bmNocm9ub3VzbHkgYWZ0ZXIgYSBj YWxsIHRvIHNSRCIpOwogCkBAIC0yMjIsMTAgKzIyMywxMiBAQAogICAgIGNvbnN0IHBjMiA9IG5l dyBSVENQZWVyQ29ubmVjdGlvbigpOwogICAgIHQuYWRkX2NsZWFudXAoKCkgPT4gcGMyLmNsb3Nl KCkpOwogCi0gICAgYXdhaXQgcGMyLnNldExvY2FsRGVzY3JpcHRpb24oYXdhaXQgcGMyLmNyZWF0 ZU9mZmVyKHtvZmZlclRvUmVjZWl2ZUF1ZGlvOiB0cnVlfSkpOworICAgIHBjMi5hZGRUcmFuc2Nl aXZlcignYXVkaW8nLCB7IGRpcmVjdGlvbjogJ3JlY3Zvbmx5JyB9KTsKKyAgICBhd2FpdCBwYzIu c2V0TG9jYWxEZXNjcmlwdGlvbihhd2FpdCBwYzIuY3JlYXRlT2ZmZXIoKSk7CiAKICAgICAvLyBJ bXBsaWNpdCByb2xsYmFjayEKLSAgICBjb25zdCBzcmRQcm9taXNlID0gcGMyLnNldFJlbW90ZURl c2NyaXB0aW9uKGF3YWl0IHBjMS5jcmVhdGVPZmZlcih7b2ZmZXJUb1JlY2VpdmVBdWRpbzogdHJ1 ZX0pKTsKKyAgICBwYzEuYWRkVHJhbnNjZWl2ZXIoJ2F1ZGlvJywgeyBkaXJlY3Rpb246ICdyZWN2 b25seScgfSk7CisgICAgY29uc3Qgc3JkUHJvbWlzZSA9IHBjMi5zZXRSZW1vdGVEZXNjcmlwdGlv bihhd2FpdCBwYzEuY3JlYXRlT2ZmZXIoKSk7CiAKICAgICBhc3NlcnRfZXF1YWxzKHBjMi5zaWdu YWxpbmdTdGF0ZSwgImhhdmUtbG9jYWwtb2ZmZXIiLCAic2lnbmFsaW5nU3RhdGUgc2hvdWxkIG5v dCBiZSBzZXQgc3luY2hyb25vdXNseSBhZnRlciBhIGNhbGwgdG8gc1JEIik7CiAKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JU Q1BlZXJDb25uZWN0aW9uLXNldFJlbW90ZURlc2NyaXB0aW9uLXJvbGxiYWNrLmh0bWwgYi9MYXlv dXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29u bmVjdGlvbi1zZXRSZW1vdGVEZXNjcmlwdGlvbi1yb2xsYmFjay5odG1sCmluZGV4IGEwMzFhNjAx NWY0Mjc0ZDc4M2ZjM2E1YTFiY2UwM2E3ZTIzZGZmZTguLjk0ZWQ3OWNkYjJmMDQyMDY5MGQ1NDdi YjRhNWMyYjc2NjcxY2Q4YTYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJDb25uZWN0aW9uLXNldFJlbW90ZURlc2Ny aXB0aW9uLXJvbGxiYWNrLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tc2V0UmVtb3RlRGVzY3JpcHRp b24tcm9sbGJhY2suaHRtbApAQCAtMTIxLDEwICsxMjEsMTIgQEAKICAgICB0LmFkZF9jbGVhbnVw KCgpID0+IHBjMi5jbG9zZSgpKTsKIAogICAgIC8vIFdlIGRvbid0IHVzZSB0aGlzIHJpZ2h0IGF3 YXkKLSAgICBjb25zdCBvZmZlcjEgPSBhd2FpdCBwYzEuY3JlYXRlT2ZmZXIoe29mZmVyVG9SZWNl aXZlQXVkaW86IHRydWV9KTsKKyAgICBwYzEuYWRkVHJhbnNjZWl2ZXIoJ2F1ZGlvJywgeyBkaXJl Y3Rpb246ICdyZWN2b25seScgfSk7CisgICAgY29uc3Qgb2ZmZXIxID0gYXdhaXQgcGMxLmNyZWF0 ZU9mZmVyKCk7CiAKICAgICAvLyBDcmVhdGUgb2ZmZXIgZnJvbSBwYzIsIGFwcGx5IGFuZCByb2xs YmFjayBvbiBwYzEKLSAgICBjb25zdCBvZmZlcjIgPSBhd2FpdCBwYzIuY3JlYXRlT2ZmZXIoe29m ZmVyVG9SZWNlaXZlQXVkaW86IHRydWV9KTsKKyAgICBwYzIuYWRkVHJhbnNjZWl2ZXIoJ2F1ZGlv JywgeyBkaXJlY3Rpb246ICdyZWN2b25seScgfSk7CisgICAgY29uc3Qgb2ZmZXIyID0gYXdhaXQg cGMyLmNyZWF0ZU9mZmVyKCk7CiAgICAgYXdhaXQgcGMxLnNldFJlbW90ZURlc2NyaXB0aW9uKG9m ZmVyMik7CiAgICAgYXdhaXQgcGMxLnNldFJlbW90ZURlc2NyaXB0aW9uKHt0eXBlOiAicm9sbGJh Y2sifSk7CiAKQEAgLTE0Nyw3ICsxNDksOSBAQAogICAgIGNvbnN0IG9mZmVyMSA9IGF3YWl0IHBj MS5jcmVhdGVPZmZlcigpOwogCiAgICAgLy8gQ3JlYXRlIG9mZmVyIGZyb20gcGMyLCBhcHBseSBh bmQgcm9sbGJhY2sgb24gcGMxCi0gICAgY29uc3Qgb2ZmZXIyID0gYXdhaXQgcGMyLmNyZWF0ZU9m ZmVyKHtvZmZlclRvUmVjZWl2ZUF1ZGlvOiB0cnVlLCBvZmZlclRvUmVjZWl2ZVZpZGVvOiB0cnVl fSk7CisgICAgcGMyLmFkZFRyYW5zY2VpdmVyKCdhdWRpbycsIHsgZGlyZWN0aW9uOiAncmVjdm9u bHknIH0pOworICAgIHBjMi5hZGRUcmFuc2NlaXZlcigndmlkZW8nLCB7IGRpcmVjdGlvbjogJ3Jl Y3Zvbmx5JyB9KTsKKyAgICBjb25zdCBvZmZlcjIgPSBhd2FpdCBwYzIuY3JlYXRlT2ZmZXIoKTsK ICAgICAvLyBwYzEgbm93IHNob3VsZCBjaGFuZ2UgaXRzIG1pbmQgYWJvdXQgd2hhdCBsZXZlbCBp dHMgdmlkZW8gdHJhbnNjZWl2ZXIgaXMKICAgICAvLyBib3VuZCB0by4gSXQgd2FzIDAsIG5vdyBp dCBpcyAxLgogICAgIGF3YWl0IHBjMS5zZXRSZW1vdGVEZXNjcmlwdGlvbihvZmZlcjIpOwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJy dGMvUlRDUGVlckNvbm5lY3Rpb24tdHJhbnNjZWl2ZXJzLmh0dHBzLmh0bWwgYi9MYXlvdXRUZXN0 cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlv bi10cmFuc2NlaXZlcnMuaHR0cHMuaHRtbAppbmRleCAxMTA2MzhjZDc0ZThkOTEwNjVmYjdlZjNh MjhjZTFhODA1MWM2MzcwLi5hNDc0ZjcwOTI4YTY0MGU2MzcyYzMzYTAzM2Y0NjRmZGNjNTdjMmRm IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi10cmFuc2NlaXZlcnMuaHR0cHMuaHRtbAorKysgYi9M YXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVy Q29ubmVjdGlvbi10cmFuc2NlaXZlcnMuaHR0cHMuaHRtbApAQCAtNDc5LDcgKzQ3OSw4IEBAIHBy b21pc2VfdGVzdChhc3luYyB0ID0+IHsKICAgICAudGhlbigob2ZmZXIpID0+IHsgcmV0dXJuIHBj MS5zZXRSZW1vdGVEZXNjcmlwdGlvbihvZmZlcik7IH0pCiAgICAgLnRoZW4oKCkgPT4geyByZXR1 cm4gcGMxLmNyZWF0ZUFuc3dlcigpOyB9KQogICAgIC50aGVuKChhbnN3ZXIpID0+IHsgcmV0dXJu IHBjMS5zZXRMb2NhbERlc2NyaXB0aW9uKGFuc3dlcik7IH0pOwotICBjb25zdCBwYzFQcm9taXNl ID0gcGMxLmNyZWF0ZU9mZmVyKHsgb2ZmZXJUb1JlY2VpdmVBdWRpbzogdHJ1ZX0pCisgIHBjMS5h ZGRUcmFuc2NlaXZlcignYXVkaW8nLCB7IGRpcmVjdGlvbjogJ3JlY3Zvbmx5JyB9KTsKKyAgY29u c3QgcGMxUHJvbWlzZSA9IHBjMS5jcmVhdGVPZmZlcigpCiAgICAgLnRoZW4oKCkgPT4geyBwYzEu YWRkVHJhY2socGMxLmdldFJlY2VpdmVycygpWzBdLnRyYWNrKTsgfSk7CiAgIGF3YWl0IFByb21p c2UuYWxsKFtwYzFQcm9taXNlLCBwYzJQcm9taXNlXSk7CiAgIGFzc2VydF9lcXVhbHMocGMxLmdl dFNlbmRlcnMoKVswXS50cmFjaywgcGMxLmdldFJlY2VpdmVycygpWzBdLnRyYWNrKTsKQEAgLTQ5 NCw3ICs0OTUsOCBAQCBwcm9taXNlX3Rlc3QoYXN5bmMgdCA9PiB7CiAgIGNvbnN0IHBjMlByb21p c2UgPSBwYzIuY3JlYXRlT2ZmZXIoKQogICAgIC50aGVuKChvZmZlcikgPT4geyByZXR1cm4gcGMx LnNldFJlbW90ZURlc2NyaXB0aW9uKG9mZmVyKTsgfSkKICAgICAudGhlbigoKSA9PiB7IHJldHVy biBwYzEuY3JlYXRlQW5zd2VyKCk7IH0pOwotICBjb25zdCBwYzFQcm9taXNlID0gcGMxLmNyZWF0 ZU9mZmVyKHsgb2ZmZXJUb1JlY2VpdmVBdWRpbzogdHJ1ZX0pCisgIHBjMS5hZGRUcmFuc2NlaXZl cignYXVkaW8nLCB7IGRpcmVjdGlvbjogJ3JlY3Zvbmx5JyB9KTsKKyAgY29uc3QgcGMxUHJvbWlz ZSA9IHBjMS5jcmVhdGVPZmZlcigpCiAgICAgLnRoZW4oKCkgPT4geyBwYzEuZ2V0VHJhbnNjZWl2 ZXJzKClbMF0uZGlyZWN0aW9uID0gJ2luYWN0aXZlJzsgfSk7CiAgIGF3YWl0IFByb21pc2UuYWxs KFtwYzFQcm9taXNlLCBwYzJQcm9taXNlXSk7CiAgIGFzc2VydF9lcXVhbHMocGMxLmdldFRyYW5z Y2VpdmVycygpWzBdLmRpcmVjdGlvbiwgJ2luYWN0aXZlJyk7CmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9wcm90b2NvbC9SVENQ ZWVyQ29ubmVjdGlvbi1wYXlsb2FkVHlwZXMuaHRtbCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL3Byb3RvY29sL1JUQ1BlZXJDb25uZWN0aW9uLXBh eWxvYWRUeXBlcy5odG1sCmluZGV4IGVhY2JmMzhhMGY2MTI4ZWZkY2Q1OTdmOTk1YmY4NzJmNTU5 YTg4MmMuLjA2NmZjMmUwODVlMzJkYTVjMjMwODA2YzQ1MTFlZDUyNTc3ZTUwNDggMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL3By b3RvY29sL1JUQ1BlZXJDb25uZWN0aW9uLXBheWxvYWRUeXBlcy5odG1sCisrKyBiL0xheW91dFRl c3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL3Byb3RvY29sL1JUQ1Bl ZXJDb25uZWN0aW9uLXBheWxvYWRUeXBlcy5odG1sCkBAIC0xMyw3ICsxMyw5IEBAIHByb21pc2Vf dGVzdChhc3luYyB0ID0+IHsKICAgY29uc3QgcGMxID0gbmV3IFJUQ1BlZXJDb25uZWN0aW9uKCk7 CiAgIHQuYWRkX2NsZWFudXAoKCkgPT4gcGMxLmNsb3NlKCkpOwogCi0gIGNvbnN0IG9mZmVyID0g YXdhaXQgcGMxLmNyZWF0ZU9mZmVyKHtvZmZlclRvUmVjZWl2ZUF1ZGlvOiB0cnVlLCBvZmZlclRv UmVjZWl2ZVZpZGVvOiB0cnVlfSk7CisgIHBjMS5hZGRUcmFuc2NlaXZlcignYXVkaW8nLCB7IGRp cmVjdGlvbjogJ3JlY3Zvbmx5JyB9KTsKKyAgcGMxLmFkZFRyYW5zY2VpdmVyKCd2aWRlbycsIHsg ZGlyZWN0aW9uOiAncmVjdm9ubHknIH0pOworICBjb25zdCBvZmZlciA9IGF3YWl0IHBjMS5jcmVh dGVPZmZlcigpOwogCiAgIC8vIEV4dHJhY3QgYWxsIHBheWxvYWQgdHlwZXMgZnJvbSB0aGUgbT0g bGluZXMuCiAgIGNvbnN0IHBheWxvYWRUeXBlcyA9IG9mZmVyLnNkcC5zcGxpdCgnXG4nKQo= 437505 2021-09-07 08:15:42 -0700 2021-09-07 11:27:48 -0700 Patch bug-230000-20210907171540.patch text/plain 30788 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMDc1CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBv cnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpp bmRleCBhMjE4NzYyZWUxMjI4ZTQxMTk4MGRmMDE4MDdlYjVjNGVmNGQ0NWFlLi40MmIxNjQ4N2I2 YTE2ZDY2NTllZWZhM2FkOWJhZGNiYmE3MTQyN2ZkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9p bXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAyMS0wOS0wNyAgWW91ZW5uIEZhYmxldCAgPHlvdWVu bkBhcHBsZS5jb20+CisKKyAgICAgICAgTWlncmF0ZSBzb21lIFdQVCBXZWJSVEMgdGVzdHMgb3Vy IG9mIGxlZ2FjeSBvZmZlclRvUmVjZWl2ZSBwYXJhbWV0ZXJzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzAwMDAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBvZmZlclRvUmVjZWl2ZSBvcHRpb25zIGFyZSBs ZWdhY3kgb3B0aW9ucyB0ZXN0ZWQgaW4gV1BUIHdlYnJ0Yy1sZWdhY3kgZm9sZGVyLgorICAgICAg ICBNb3ZlIHRvIGFkZFRyYW5zY2VpdmVyIGluc3RlYWQuCisKKyAgICAgICAgKiB3ZWItcGxhdGZv cm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJDb25uZWN0aW9uLWV4cGxpY2l0LXJvbGxiYWNrLWljZUdh dGhlcmluZ1N0YXRlLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMv d2VicnRjL1JUQ1BlZXJDb25uZWN0aW9uLWV4cGxpY2l0LXJvbGxiYWNrLWljZUdhdGhlcmluZ1N0 YXRlLmh0bWw6CisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29u bmVjdGlvbi1pY2VHYXRoZXJpbmdTdGF0ZS1leHBlY3RlZC50eHQ6CisgICAgICAgICogd2ViLXBs YXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1pY2VHYXRoZXJpbmdTdGF0ZS5o dG1sOgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rp b24tc2V0TG9jYWxEZXNjcmlwdGlvbi1hbnN3ZXItZXhwZWN0ZWQudHh0OgorICAgICAgICAqIHdl Yi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tc2V0TG9jYWxEZXNjcmlw dGlvbi1hbnN3ZXIuaHRtbDoKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JU Q1BlZXJDb25uZWN0aW9uLXNldExvY2FsRGVzY3JpcHRpb24tb2ZmZXItZXhwZWN0ZWQudHh0Ogor ICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tc2V0 TG9jYWxEZXNjcmlwdGlvbi1vZmZlci5odG1sOgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0 cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tc2V0TG9jYWxEZXNjcmlwdGlvbi1yb2xsYmFjay5o dG1sOgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rp b24tc2V0UmVtb3RlRGVzY3JpcHRpb24tb2ZmZXItZXhwZWN0ZWQudHh0OgorICAgICAgICAqIHdl Yi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tc2V0UmVtb3RlRGVzY3Jp cHRpb24tb2ZmZXIuaHRtbDoKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JU Q1BlZXJDb25uZWN0aW9uLXNldFJlbW90ZURlc2NyaXB0aW9uLXJvbGxiYWNrLmh0bWw6CisgICAg ICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi10cmFuc2Nl aXZlcnMuaHR0cHMtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy93 ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tdHJhbnNjZWl2ZXJzLmh0dHBzLmh0bWw6CisgICAgICAg ICogd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9wcm90b2NvbC9SVENQZWVyQ29ubmVjdGlvbi1w YXlsb2FkVHlwZXMuaHRtbDoKKwogMjAyMS0wOS0wNyAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBh cHBsZS5jb20+CiAKICAgICAgICAgSW1wbGVtZW50IFJUQ1BlZXJDb25uZWN0aW9uIGltcGxpY2l0 IHJvbGxiYWNrCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1leHBsaWNpdC1yb2xsYmFjay1pY2VH YXRoZXJpbmdTdGF0ZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1leHBsaWNpdC1yb2xsYmFj ay1pY2VHYXRoZXJpbmdTdGF0ZS1leHBlY3RlZC50eHQKaW5kZXggYjM1ZDcyNGIxOGFkMWFkOWJj YWNkMTQ4YjdlYzNjZWJkNjFhMmQzOC4uNmQ3Yzc4ODdkNTk0ZmM5ZmZhYmI5NDkxNDY5YzMyMzUy MjQ3NTU0MCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tZXhwbGljaXQtcm9sbGJhY2staWNlR2F0 aGVyaW5nU3RhdGUtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJDb25uZWN0aW9uLWV4cGxpY2l0LXJvbGxi YWNrLWljZUdhdGhlcmluZ1N0YXRlLWV4cGVjdGVkLnR4dApAQCAtMSw3ICsxLDUgQEAKIAotSGFy bmVzcyBFcnJvciAoVElNRU9VVCksIG1lc3NhZ2UgPSBudWxsCi0KLVRJTUVPVVQgcm9sbGluZyBi YWNrIGFuIElDRSByZXN0YXJ0IHdoZW4gZ2F0aGVyaW5nIGlzIGNvbXBsZXRlIHNob3VsZCBub3Qg cmVzdWx0IGluIGljZUdhdGhlcmluZ1N0YXRlIGNoYW5nZXMgVGVzdCB0aW1lZCBvdXQKLU5PVFJV TiBzZXRMb2NhbERlc2NyaXB0aW9uKHJvbGxiYWNrKSBvZiBvcmlnaW5hbCBvZmZlciBzaG91bGQg Y2F1c2UgaWNlR2F0aGVyaW5nU3RhdGUgdG8gcmVhY2ggIm5ldyIgd2hlbiBzdGFydGluZyBpbiAi Y29tcGxldGUiCi1OT1RSVU4gc2V0TG9jYWxEZXNjcmlwdGlvbihyb2xsYmFjaykgb2Ygb3JpZ2lu YWwgb2ZmZXIgc2hvdWxkIGNhdXNlIGljZUdhdGhlcmluZ1N0YXRlIHRvIHJlYWNoICJuZXciIHdo ZW4gc3RhcnRpbmcgaW4gImdhdGhlcmluZyIKK1BBU1Mgcm9sbGluZyBiYWNrIGFuIElDRSByZXN0 YXJ0IHdoZW4gZ2F0aGVyaW5nIGlzIGNvbXBsZXRlIHNob3VsZCBub3QgcmVzdWx0IGluIGljZUdh dGhlcmluZ1N0YXRlIGNoYW5nZXMKK0ZBSUwgc2V0TG9jYWxEZXNjcmlwdGlvbihyb2xsYmFjaykg b2Ygb3JpZ2luYWwgb2ZmZXIgc2hvdWxkIGNhdXNlIGljZUdhdGhlcmluZ1N0YXRlIHRvIHJlYWNo ICJuZXciIHdoZW4gc3RhcnRpbmcgaW4gImNvbXBsZXRlIiBwcm9taXNlX3Rlc3Q6IFVuaGFuZGxl ZCByZWplY3Rpb24gd2l0aCB2YWx1ZTogIlVuZXhwZWN0ZWQgZ2F0aGVyaW5nIHN0YXRlOiBjb21w bGV0ZSwgd2FzIGV4cGVjdGluZyBnYXRoZXJpbmciCitGQUlMIHNldExvY2FsRGVzY3JpcHRpb24o cm9sbGJhY2spIG9mIG9yaWdpbmFsIG9mZmVyIHNob3VsZCBjYXVzZSBpY2VHYXRoZXJpbmdTdGF0 ZSB0byByZWFjaCAibmV3IiB3aGVuIHN0YXJ0aW5nIGluICJnYXRoZXJpbmciIHByb21pc2VfdGVz dDogVW5oYW5kbGVkIHJlamVjdGlvbiB3aXRoIHZhbHVlOiAiVW5leHBlY3RlZCBnYXRoZXJpbmcg c3RhdGU6IGNvbXBsZXRlLCB3YXMgZXhwZWN0aW5nIGdhdGhlcmluZyIKIApkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVl ckNvbm5lY3Rpb24tZXhwbGljaXQtcm9sbGJhY2staWNlR2F0aGVyaW5nU3RhdGUuaHRtbCBiL0xh eW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJD b25uZWN0aW9uLWV4cGxpY2l0LXJvbGxiYWNrLWljZUdhdGhlcmluZ1N0YXRlLmh0bWwKaW5kZXgg OWMxZmUwMTRiZDllZTE4YmI2YTlhYjY1ZWE3YWEzZWViYmNlMTIwMC4uZTM5Yjk4NWJlZjJmZTY1 ZDM1OWUxNjE1MmI4Y2ZmMzIyMDE2ZmQwOCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tZXhwbGlj aXQtcm9sbGJhY2staWNlR2F0aGVyaW5nU3RhdGUuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1leHBs aWNpdC1yb2xsYmFjay1pY2VHYXRoZXJpbmdTdGF0ZS5odG1sCkBAIC0xMiw4ICsxMiw5IEBAIHBy b21pc2VfdGVzdChhc3luYyB0ID0+IHsKICAgdC5hZGRfY2xlYW51cCgoKSA9PiBwYzEuY2xvc2Uo KSk7CiAgIGNvbnN0IHBjMiA9IG5ldyBSVENQZWVyQ29ubmVjdGlvbigpOwogICB0LmFkZF9jbGVh bnVwKCgpID0+IHBjMi5jbG9zZSgpKTsKKyAgcGMxLmFkZFRyYW5zY2VpdmVyKCdhdWRpbycsIHsg ZGlyZWN0aW9uOiAncmVjdm9ubHknIH0pOwogICBhd2FpdCBpbml0aWFsT2ZmZXJBbnN3ZXJXaXRo SWNlR2F0aGVyaW5nU3RhdGVUcmFuc2l0aW9ucygKLSAgICAgIHBjMSwgcGMyLCB7b2ZmZXJUb1Jl Y2VpdmVBdWRpbzogdHJ1ZX0pOworICAgICAgcGMxLCBwYzIpOwogICBhd2FpdCBwYzEuc2V0TG9j YWxEZXNjcmlwdGlvbihhd2FpdCBwYzEuY3JlYXRlT2ZmZXIoe2ljZVJlc3RhcnQ6IHRydWV9KSk7 CiAgIGF3YWl0IGljZUdhdGhlcmluZ1N0YXRlVHJhbnNpdGlvbnMocGMxLCAnZ2F0aGVyaW5nJywg J2NvbXBsZXRlJyk7CiAgIGV4cGVjdE5vTW9yZUdhdGhlcmluZ1N0YXRlQ2hhbmdlcyh0LCBwYzEp OwpAQCAtMjQsOCArMjUsOSBAQCBwcm9taXNlX3Rlc3QoYXN5bmMgdCA9PiB7CiBwcm9taXNlX3Rl c3QoYXN5bmMgdCA9PiB7CiAgIGNvbnN0IHBjID0gbmV3IFJUQ1BlZXJDb25uZWN0aW9uKCk7CiAg IHQuYWRkX2NsZWFudXAoKCkgPT4gcGMuY2xvc2UoKSk7CisgIHBjLmFkZFRyYW5zY2VpdmVyKCdh dWRpbycsIHsgZGlyZWN0aW9uOiAncmVjdm9ubHknIH0pOwogICBhd2FpdCBwYy5zZXRMb2NhbERl c2NyaXB0aW9uKAotICAgIGF3YWl0IHBjLmNyZWF0ZU9mZmVyKHtvZmZlclRvUmVjZWl2ZUF1ZGlv OiB0cnVlfSkpOworICAgIGF3YWl0IHBjLmNyZWF0ZU9mZmVyKCkpOwogICBhd2FpdCBpY2VHYXRo ZXJpbmdTdGF0ZVRyYW5zaXRpb25zKHBjLCAnZ2F0aGVyaW5nJywgJ2NvbXBsZXRlJyk7CiAgIGF3 YWl0IHBjLnNldExvY2FsRGVzY3JpcHRpb24oe3R5cGU6ICdyb2xsYmFjayd9KTsKICAgYXdhaXQg aWNlR2F0aGVyaW5nU3RhdGVUcmFuc2l0aW9ucyhwYywgJ25ldycpOwpAQCAtMzQsOCArMzYsOSBA QCBwcm9taXNlX3Rlc3QoYXN5bmMgdCA9PiB7CiBwcm9taXNlX3Rlc3QoYXN5bmMgdCA9PiB7CiAg IGNvbnN0IHBjID0gbmV3IFJUQ1BlZXJDb25uZWN0aW9uKCk7CiAgIHQuYWRkX2NsZWFudXAoKCkg PT4gcGMuY2xvc2UoKSk7CisgIHBjLmFkZFRyYW5zY2VpdmVyKCdhdWRpbycsIHsgZGlyZWN0aW9u OiAncmVjdm9ubHknIH0pOwogICBhd2FpdCBwYy5zZXRMb2NhbERlc2NyaXB0aW9uKAotICAgIGF3 YWl0IHBjLmNyZWF0ZU9mZmVyKHtvZmZlclRvUmVjZWl2ZUF1ZGlvOiB0cnVlfSkpOworICAgIGF3 YWl0IHBjLmNyZWF0ZU9mZmVyKCkpOwogICBhd2FpdCBpY2VHYXRoZXJpbmdTdGF0ZVRyYW5zaXRp b25zKHBjLCAnZ2F0aGVyaW5nJyk7CiAgIGF3YWl0IHBjLnNldExvY2FsRGVzY3JpcHRpb24oe3R5 cGU6ICdyb2xsYmFjayd9KTsKICAgLy8gV2UgbWlnaHQgZ28gZGlyZWN0bHkgdG8gJ25ldycsIG9y IHdlIG1pZ2h0IGdvIHRvICdjb21wbGV0ZScgZmlyc3QsCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlv bi1pY2VHYXRoZXJpbmdTdGF0ZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1pY2VHYXRoZXJp bmdTdGF0ZS1leHBlY3RlZC50eHQKaW5kZXggNjA4NjMyNzljYjU4ZjE1ZDQwMTYyYmQ5ZDMyMDIy YzM0NjU0OTE2ZC4uZmIwYTYwMTkyNGQzMjczYTM4MTJhYTBkMjdmZjg3ZWVkMmM4Mjk3YiAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJy dGMvUlRDUGVlckNvbm5lY3Rpb24taWNlR2F0aGVyaW5nU3RhdGUtZXhwZWN0ZWQudHh0CisrKyBi L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JUQ1Bl ZXJDb25uZWN0aW9uLWljZUdhdGhlcmluZ1N0YXRlLWV4cGVjdGVkLnR4dApAQCAtMSwxMiArMSwx MCBAQAogCi1IYXJuZXNzIEVycm9yIChUSU1FT1VUKSwgbWVzc2FnZSA9IG51bGwKLQogUEFTUyBJ bml0aWFsIGljZUdhdGhlcmluZ1N0YXRlIHNob3VsZCBiZSBuZXcKIFBBU1MgaWNlR2F0aGVyaW5n U3RhdGUgc2hvdWxkIGV2ZW50dWFsbHkgYmVjb21lIGNvbXBsZXRlIGFmdGVyIHNldExvY2FsRGVz Y3JpcHRpb24KLVRJTUVPVVQgc2V0TG9jYWxEZXNjcmlwdGlvbihyZW9mZmVyKSB3aXRoIG5vIG5l dyB0cmFuc3BvcnRzIHNob3VsZCBub3QgY2F1c2UgaWNlR2F0aGVyaW5nU3RhdGUgdG8gY2hhbmdl IFRlc3QgdGltZWQgb3V0Ci1OT1RSVU4gc2V0TG9jYWxEZXNjcmlwdGlvbigpIHdpdGggbm8gdHJh bnNwb3J0cyBzaG91bGQgbm90IGNhdXNlIGljZUdhdGhlcmluZ1N0YXRlIHRvIGNoYW5nZQotTk9U UlVOIHNldExvY2FsRGVzY3JpcHRpb24ocmVvZmZlcikgd2l0aCBhIG5ldyB0cmFuc3BvcnQgc2hv dWxkIGNhdXNlIGljZUdhdGhlcmluZ1N0YXRlIHRvIGdvIHRvICJjaGVja2luZyIgYW5kIHRoZW4g ImNvbXBsZXRlIgotTk9UUlVOIHNSRCBkb2VzIG5vdCBjYXVzZSBJQ0UgZ2F0aGVyaW5nIHN0YXRl IGNoYW5nZXMKLU5PVFJVTiByZW5lZ290aWF0aW9uIHRoYXQgY2xvc2VzIGFsbCB0cmFuc3BvcnRz IHNob3VsZCByZXN1bHQgaW4gSUNFIGdhdGhlcmluZyBzdGF0ZSAibmV3IgorRkFJTCBzZXRMb2Nh bERlc2NyaXB0aW9uKHJlb2ZmZXIpIHdpdGggbm8gbmV3IHRyYW5zcG9ydHMgc2hvdWxkIG5vdCBj YXVzZSBpY2VHYXRoZXJpbmdTdGF0ZSB0byBjaGFuZ2UgcHJvbWlzZV90ZXN0OiBVbmhhbmRsZWQg cmVqZWN0aW9uIHdpdGggdmFsdWU6ICJVbmV4cGVjdGVkIGdhdGhlcmluZyBzdGF0ZTogY29tcGxl dGUsIHdhcyBleHBlY3RpbmcgZ2F0aGVyaW5nIgorUEFTUyBzZXRMb2NhbERlc2NyaXB0aW9uKCkg d2l0aCBubyB0cmFuc3BvcnRzIHNob3VsZCBub3QgY2F1c2UgaWNlR2F0aGVyaW5nU3RhdGUgdG8g Y2hhbmdlCitGQUlMIHNldExvY2FsRGVzY3JpcHRpb24ocmVvZmZlcikgd2l0aCBhIG5ldyB0cmFu c3BvcnQgc2hvdWxkIGNhdXNlIGljZUdhdGhlcmluZ1N0YXRlIHRvIGdvIHRvICJjaGVja2luZyIg YW5kIHRoZW4gImNvbXBsZXRlIiBwcm9taXNlX3Rlc3Q6IFVuaGFuZGxlZCByZWplY3Rpb24gd2l0 aCB2YWx1ZTogIlVuZXhwZWN0ZWQgZ2F0aGVyaW5nIHN0YXRlOiBjb21wbGV0ZSwgd2FzIGV4cGVj dGluZyBnYXRoZXJpbmciCitQQVNTIHNSRCBkb2VzIG5vdCBjYXVzZSBJQ0UgZ2F0aGVyaW5nIHN0 YXRlIGNoYW5nZXMKK0ZBSUwgcmVuZWdvdGlhdGlvbiB0aGF0IGNsb3NlcyBhbGwgdHJhbnNwb3J0 cyBzaG91bGQgcmVzdWx0IGluIElDRSBnYXRoZXJpbmcgc3RhdGUgIm5ldyIgcHJvbWlzZV90ZXN0 OiBVbmhhbmRsZWQgcmVqZWN0aW9uIHdpdGggdmFsdWU6ICJVbmV4cGVjdGVkIGdhdGhlcmluZyBz dGF0ZTogY29tcGxldGUsIHdhcyBleHBlY3RpbmcgZ2F0aGVyaW5nIgogRkFJTCBjb25uZWN0aW9u IHdpdGggb25lIGRhdGEgY2hhbm5lbCBzaG91bGQgZXZlbnR1YWxseSBoYXZlIGNvbm5lY3RlZCBj b25uZWN0aW9uIHN0YXRlIHVuZGVmaW5lZCBpcyBub3QgYW4gb2JqZWN0IChldmFsdWF0aW5nICdw YzIuc2N0cC50cmFuc3BvcnQnKQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1pY2VHYXRoZXJp bmdTdGF0ZS5odG1sIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24taWNlR2F0aGVyaW5nU3RhdGUuaHRtbAppbmRleCA4 NzBlNmFkNzJlYzM1NmVjZWZiY2E2ODg3OGRhNzMxZTM0N2VkMTdjLi45MzNhMjFjYzc1ZWZjYjE0 OTAzYTU4NmQ5OTE2Mjc4ZmQwYzlmODI2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1pY2VHYXRo ZXJpbmdTdGF0ZS5odG1sCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJDb25uZWN0aW9uLWljZUdhdGhlcmluZ1N0YXRlLmh0bWwK QEAgLTg5LDggKzg5LDkgQEAKICAgICB0LmFkZF9jbGVhbnVwKCgpID0+IHBjMS5jbG9zZSgpKTsK ICAgICBjb25zdCBwYzIgPSBuZXcgUlRDUGVlckNvbm5lY3Rpb24oKTsKICAgICB0LmFkZF9jbGVh bnVwKCgpID0+IHBjMi5jbG9zZSgpKTsKKyAgICBwYzEuYWRkVHJhbnNjZWl2ZXIoJ2F1ZGlvJywg eyBkaXJlY3Rpb246ICdyZWN2b25seScgfSk7CiAgICAgYXdhaXQgaW5pdGlhbE9mZmVyQW5zd2Vy V2l0aEljZUdhdGhlcmluZ1N0YXRlVHJhbnNpdGlvbnMoCi0gICAgICAgIHBjMSwgcGMyLCB7b2Zm ZXJUb1JlY2VpdmVBdWRpbzogdHJ1ZX0pOworICAgICAgICBwYzEsIHBjMik7CiAKICAgICBleHBl Y3ROb01vcmVHYXRoZXJpbmdTdGF0ZUNoYW5nZXModCwgcGMxKTsKICAgICBleHBlY3ROb01vcmVH YXRoZXJpbmdTdGF0ZUNoYW5nZXModCwgcGMyKTsKQEAgLTExNyw4ICsxMTgsOSBAQAogICAgIHQu YWRkX2NsZWFudXAoKCkgPT4gcGMxLmNsb3NlKCkpOwogICAgIGNvbnN0IHBjMiA9IG5ldyBSVENQ ZWVyQ29ubmVjdGlvbigpOwogICAgIHQuYWRkX2NsZWFudXAoKCkgPT4gcGMyLmNsb3NlKCkpOwor ICAgIHBjMS5hZGRUcmFuc2NlaXZlcignYXVkaW8nLCB7IGRpcmVjdGlvbjogJ3JlY3Zvbmx5JyB9 KTsKICAgICBhd2FpdCBpbml0aWFsT2ZmZXJBbnN3ZXJXaXRoSWNlR2F0aGVyaW5nU3RhdGVUcmFu c2l0aW9ucygKLSAgICAgICAgcGMxLCBwYzIsIHtvZmZlclRvUmVjZWl2ZUF1ZGlvOnRydWV9KTsK KyAgICAgICAgcGMxLCBwYzIpOwogICAgIGF3YWl0IHBjMS5zZXRMb2NhbERlc2NyaXB0aW9uKGF3 YWl0IHBjMS5jcmVhdGVPZmZlcih7aWNlUmVzdGFydDogdHJ1ZX0pKTsKICAgICBhd2FpdCBpY2VH YXRoZXJpbmdTdGF0ZVRyYW5zaXRpb25zKHBjMSwgJ2dhdGhlcmluZycsICdjb21wbGV0ZScpOwog ICB9LCAnc2V0TG9jYWxEZXNjcmlwdGlvbihyZW9mZmVyKSB3aXRoIGEgbmV3IHRyYW5zcG9ydCBz aG91bGQgY2F1c2UgaWNlR2F0aGVyaW5nU3RhdGUgdG8gZ28gdG8gImNoZWNraW5nIiBhbmQgdGhl biAiY29tcGxldGUiJyk7CkBAIC0xMjksNyArMTMxLDggQEAKICAgICBjb25zdCBwYzIgPSBuZXcg UlRDUGVlckNvbm5lY3Rpb24oKTsKICAgICB0LmFkZF9jbGVhbnVwKCgpID0+IHBjMi5jbG9zZSgp KTsKICAgICBleHBlY3ROb01vcmVHYXRoZXJpbmdTdGF0ZUNoYW5nZXModCwgcGMyKTsKLSAgICBj b25zdCBvZmZlciA9IGF3YWl0IHBjMS5jcmVhdGVPZmZlcih7b2ZmZXJUb1JlY2VpdmVBdWRpbzog dHJ1ZX0pOworICAgIHBjMS5hZGRUcmFuc2NlaXZlcignYXVkaW8nLCB7IGRpcmVjdGlvbjogJ3Jl Y3Zvbmx5JyB9KTsKKyAgICBjb25zdCBvZmZlciA9IGF3YWl0IHBjMS5jcmVhdGVPZmZlcigpOwog ICAgIGF3YWl0IHBjMi5zZXRSZW1vdGVEZXNjcmlwdGlvbihvZmZlcik7CiAgICAgYXdhaXQgcGMy LnNldFJlbW90ZURlc2NyaXB0aW9uKG9mZmVyKTsKICAgICBhd2FpdCBwYzIuc2V0UmVtb3RlRGVz Y3JpcHRpb24oe3R5cGU6ICdyb2xsYmFjayd9KTsKQEAgLTE0MSw4ICsxNDQsOSBAQAogICAgIHQu YWRkX2NsZWFudXAoKCkgPT4gcGMxLmNsb3NlKCkpOwogICAgIGNvbnN0IHBjMiA9IG5ldyBSVENQ ZWVyQ29ubmVjdGlvbigpOwogICAgIHQuYWRkX2NsZWFudXAoKCkgPT4gcGMyLmNsb3NlKCkpOwor ICAgIHBjMS5hZGRUcmFuc2NlaXZlcignYXVkaW8nLCB7IGRpcmVjdGlvbjogJ3JlY3Zvbmx5JyB9 KTsKICAgICBhd2FpdCBpbml0aWFsT2ZmZXJBbnN3ZXJXaXRoSWNlR2F0aGVyaW5nU3RhdGVUcmFu c2l0aW9ucygKLSAgICAgICAgcGMxLCBwYzIsIHtvZmZlclRvUmVjZWl2ZUF1ZGlvOiB0cnVlfSk7 CisgICAgICAgIHBjMSwgcGMyKTsKIAogICAgIGNvbnN0IHBjMXdhaXRlciA9IGljZUdhdGhlcmlu Z1N0YXRlVHJhbnNpdGlvbnMocGMxLCAnbmV3Jyk7CiAgICAgY29uc3QgcGMyd2FpdGVyID0gaWNl R2F0aGVyaW5nU3RhdGVUcmFuc2l0aW9ucyhwYzIsICduZXcnKTsKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJDb25u ZWN0aW9uLXNldExvY2FsRGVzY3JpcHRpb24tYW5zd2VyLWV4cGVjdGVkLnR4dCBiL0xheW91dFRl c3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJDb25uZWN0 aW9uLXNldExvY2FsRGVzY3JpcHRpb24tYW5zd2VyLWV4cGVjdGVkLnR4dAppbmRleCAxY2U2ZWQ5 ZmQ5ZGUxN2I4NTRkYmU0MTUwZTBlYTIxNTgwOGVkNjZhLi42NjEzNGVkNmIwMDZkYjI2Y2MyNmRi NWQ3MGZhYzhkODMyNDgwMWVkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1zZXRMb2NhbERlc2Ny aXB0aW9uLWFuc3dlci1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tc2V0TG9jYWxEZXNj cmlwdGlvbi1hbnN3ZXItZXhwZWN0ZWQudHh0CkBAIC0xLDcgKzEsNyBAQAogCiBQQVNTIHNldExv Y2FsRGVzY3JpcHRpb24oKSB3aXRoIHZhbGlkIGFuc3dlciBzaG91bGQgc3VjY2VlZAogRkFJTCBz ZXRMb2NhbERlc2NyaXB0aW9uKCkgd2l0aCB0eXBlIGFuc3dlciBhbmQgbnVsbCBzZHAgc2hvdWxk IHVzZSBsYXN0QW5zd2VyIGdlbmVyYXRlZCBmcm9tIGNyZWF0ZUFuc3dlciBwcm9taXNlX3Rlc3Q6 IFVuaGFuZGxlZCByZWplY3Rpb24gd2l0aCB2YWx1ZTogb2JqZWN0ICJPcGVyYXRpb25FcnJvcjog RXhwZWN0IGxpbmU6IHY9IgotRkFJTCBzZXRMb2NhbERlc2NyaXB0aW9uKCkgd2l0aCBhbnN3ZXIg bm90IGNyZWF0ZWQgYnkgb3duIGNyZWF0ZUFuc3dlcigpIHNob3VsZCByZWplY3Qgd2l0aCBJbnZh bGlkTW9kaWZpY2F0aW9uRXJyb3IgcHJvbWlzZV9yZWplY3RzX2RvbTogZnVuY3Rpb24gImZ1bmN0 aW9uICgpIHsgdGhyb3cgZSB9IiB0aHJldyBvYmplY3QgIk9wZXJhdGlvbkVycm9yOiBGYWlsZWQg dG8gc2V0IGxvY2FsIGFuc3dlciBzZHA6IEZhaWxlZCB0byBhcHBseSB0aGUgZGVzY3JpcHRpb24g Zm9yIG09IHNlY3Rpb24gd2l0aCBtaWQ9JzAnOiBMb2NhbCBmaW5nZXJwcmludCBkb2VzIG5vdCBt YXRjaCBpZGVudGl0eS4gRXhwZWN0ZWQ6IHNoYS0yNTYgNUE6OTA6RTY6NzY6MkI6Njg6QkE6MDI6 NTc6RkM6MEU6Mzc6QjY6QkY6QTc6MUU6Nzk6NTg6MTI6RDQ6NkM6MEQ6ODQ6Q0I6MDg6RDI6Rjc6 QkI6MDE6OUU6Qjk6Q0IgR290OiBzaGEtMjU2IDA1OjY4OkQ0Ojc5OkQ5OjQ3OjcyOjEwOkYxOjJB OkY4OjgxOkM3OkMwOkM1OjI4OjRDOjlCOkI5OjkwOjlBOjYwOjgxOkU2OjJDOjMxOjM1OkU1OjlE OkM3OkUyOjBBIiB0aGF0IGlzIG5vdCBhIERPTUV4Y2VwdGlvbiBJbnZhbGlkTW9kaWZpY2F0aW9u RXJyb3I6IHByb3BlcnR5ICJjb2RlIiBpcyBlcXVhbCB0byAwLCBleHBlY3RlZCAxMworRkFJTCBz ZXRMb2NhbERlc2NyaXB0aW9uKCkgd2l0aCBhbnN3ZXIgbm90IGNyZWF0ZWQgYnkgb3duIGNyZWF0 ZUFuc3dlcigpIHNob3VsZCByZWplY3Qgd2l0aCBJbnZhbGlkTW9kaWZpY2F0aW9uRXJyb3IgcHJv bWlzZV9yZWplY3RzX2RvbTogZnVuY3Rpb24gImZ1bmN0aW9uICgpIHsgdGhyb3cgZSB9IiB0aHJl dyBvYmplY3QgIk9wZXJhdGlvbkVycm9yOiBGYWlsZWQgdG8gc2V0IGxvY2FsIGFuc3dlciBzZHA6 IEZhaWxlZCB0byBhcHBseSB0aGUgZGVzY3JpcHRpb24gZm9yIG09IHNlY3Rpb24gd2l0aCBtaWQ9 JzAnOiBMb2NhbCBmaW5nZXJwcmludCBkb2VzIG5vdCBtYXRjaCBpZGVudGl0eS4gRXhwZWN0ZWQ6 IHNoYS0yNTYgRjU6NUM6Nzg6NTc6QzM6ODU6QUU6Njg6REY6REY6NzE6OUY6NDE6QzA6MjU6Q0U6 RDE6NDM6OEY6NTg6QjQ6Mzc6Nzg6QzA6ODg6NjY6QjU6NkY6Mjk6NjQ6MjE6MDcgR290OiBzaGEt MjU2IDFBOkZCOjk4OjZDOjdFOjFDOkY2OjU0OjhDOjAxOkEzOjkyOjQ1OkNCOkQyOjQ3Ojg1OjE0 OkVGOkFBOjgwOkJBOkJEOjY0OkYzOjg4OkI1OkEzOkVEOkY0OkVEOjdBIiB0aGF0IGlzIG5vdCBh IERPTUV4Y2VwdGlvbiBJbnZhbGlkTW9kaWZpY2F0aW9uRXJyb3I6IHByb3BlcnR5ICJjb2RlIiBp cyBlcXVhbCB0byAwLCBleHBlY3RlZCAxMwogRkFJTCBDYWxsaW5nIHNldExvY2FsRGVzY3JpcHRp b24oYW5zd2VyKSBmcm9tIHN0YWJsZSBzdGF0ZSBzaG91bGQgcmVqZWN0IHdpdGggSW52YWxpZE1v ZGlmaWNhdGlvbkVycm9yIHByb21pc2VfcmVqZWN0c19kb206IGZ1bmN0aW9uICJmdW5jdGlvbiAo KSB7IHRocm93IGUgfSIgdGhyZXcgb2JqZWN0ICJJbnZhbGlkU3RhdGVFcnJvcjogRmFpbGVkIHRv IHNldCBsb2NhbCBhbnN3ZXIgc2RwOiBubyBwZW5kaW5nIHJlbW90ZSBkZXNjcmlwdGlvbi4iIHRo YXQgaXMgbm90IGEgRE9NRXhjZXB0aW9uIEludmFsaWRNb2RpZmljYXRpb25FcnJvcjogcHJvcGVy dHkgImNvZGUiIGlzIGVxdWFsIHRvIDExLCBleHBlY3RlZCAxMwogRkFJTCBDYWxsaW5nIHNldExv Y2FsRGVzY3JpcHRpb24oYW5zd2VyKSBmcm9tIGhhdmUtbG9jYWwtb2ZmZXIgc3RhdGUgc2hvdWxk IHJlamVjdCB3aXRoIEludmFsaWRNb2RpZmljYXRpb25FcnJvciBwcm9taXNlX3JlamVjdHNfZG9t OiBmdW5jdGlvbiAiZnVuY3Rpb24gKCkgeyB0aHJvdyBlIH0iIHRocmV3IG9iamVjdCAiSW52YWxp ZFN0YXRlRXJyb3I6IEZhaWxlZCB0byBzZXQgbG9jYWwgYW5zd2VyIHNkcDogbm8gcGVuZGluZyBy ZW1vdGUgZGVzY3JpcHRpb24uIiB0aGF0IGlzIG5vdCBhIERPTUV4Y2VwdGlvbiBJbnZhbGlkTW9k aWZpY2F0aW9uRXJyb3I6IHByb3BlcnR5ICJjb2RlIiBpcyBlcXVhbCB0byAxMSwgZXhwZWN0ZWQg MTMKIFBBU1MgU2V0dGluZyBwcmV2aW91c2x5IGdlbmVyYXRlZCBhbnN3ZXIgYWZ0ZXIgYSBjYWxs IHRvIGNyZWF0ZU9mZmVyIHNob3VsZCB3b3JrCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1zZXRM b2NhbERlc2NyaXB0aW9uLWFuc3dlci5odG1sIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tc2V0TG9jYWxEZXNjcmlw dGlvbi1hbnN3ZXIuaHRtbAppbmRleCA4MjFlZTFkMGIxNWNlMTFhZGI5YjVjNjg4ZWRhNjNiYWUw MmU0MGRkLi5hNmEwMjEwOGYxMmI0YTJlZWUzZTMyMzVlMjVjNDNjYWY2N2IxMWQ3IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9S VENQZWVyQ29ubmVjdGlvbi1zZXRMb2NhbERlc2NyaXB0aW9uLWFuc3dlci5odG1sCisrKyBiL0xh eW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJD b25uZWN0aW9uLXNldExvY2FsRGVzY3JpcHRpb24tYW5zd2VyLmh0bWwKQEAgLTE3NywxMSArMTc3 LDEzIEBACiAgICAgY29uc3QgcGMyID0gbmV3IFJUQ1BlZXJDb25uZWN0aW9uKCk7CiAgICAgdC5h ZGRfY2xlYW51cCgoKSA9PiBwYzIuY2xvc2UoKSk7CiAKLSAgICBjb25zdCBvZmZlciA9IGF3YWl0 IHBjMS5jcmVhdGVPZmZlcih7b2ZmZXJUb1JlY2VpdmVBdWRpbzogdHJ1ZX0pOworICAgIHBjMS5h ZGRUcmFuc2NlaXZlcignYXVkaW8nLCB7IGRpcmVjdGlvbjogJ3JlY3Zvbmx5JyB9KTsKKyAgICBj b25zdCBvZmZlciA9IGF3YWl0IHBjMS5jcmVhdGVPZmZlcigpOwogICAgIGF3YWl0IHBjMi5zZXRS ZW1vdGVEZXNjcmlwdGlvbihvZmZlcik7CiAgICAgY29uc3QgYW5zd2VyID0gYXdhaXQgcGMyLmNy ZWF0ZUFuc3dlcigpOyAvLyBbW0xhc3RBbnN3ZXJdXSBzbG90IHNldAogICAgIGF3YWl0IHBjMi5z ZXRSZW1vdGVEZXNjcmlwdGlvbih7dHlwZTogInJvbGxiYWNrIn0pOwotICAgIGF3YWl0IHBjMi5j cmVhdGVPZmZlcih7b2ZmZXJUb1JlY2VpdmVWaWRlbzogdHJ1ZX0pOyAvLyBbW0xhc3RPZmZlcl1d IHNsb3Qgc2V0CisgICAgcGMyLmFkZFRyYW5zY2VpdmVyKCd2aWRlbycsIHsgZGlyZWN0aW9uOiAn cmVjdm9ubHknIH0pOworICAgIGF3YWl0IHBjMi5jcmVhdGVPZmZlcigpOyAvLyBbW0xhc3RPZmZl cl1dIHNsb3Qgc2V0CiAgICAgYXdhaXQgcGMyLnNldFJlbW90ZURlc2NyaXB0aW9uKG9mZmVyKTsK ICAgICBhd2FpdCBwYzIuc2V0TG9jYWxEZXNjcmlwdGlvbihhbnN3ZXIpOyAvLyBTaG91bGQgY2hl Y2sgYWdhaW5zdCBbW0xhc3RBbnN3ZXJdXSwgbm90IFtbTGFzdE9mZmVyXV0KICAgfSwgIlNldHRp bmcgcHJldmlvdXNseSBnZW5lcmF0ZWQgYW5zd2VyIGFmdGVyIGEgY2FsbCB0byBjcmVhdGVPZmZl ciBzaG91bGQgd29yayIpOwpAQCAtMTkyLDcgKzE5NCw4IEBACiAgICAgY29uc3QgcGMyID0gbmV3 IFJUQ1BlZXJDb25uZWN0aW9uKCk7CiAgICAgdC5hZGRfY2xlYW51cCgoKSA9PiBwYzIuY2xvc2Uo KSk7CiAKLSAgICBhd2FpdCBwYzIuc2V0UmVtb3RlRGVzY3JpcHRpb24oYXdhaXQgcGMxLmNyZWF0 ZU9mZmVyKHtvZmZlclRvUmVjZWl2ZUF1ZGlvOiB0cnVlfSkpOworICAgIHBjMS5hZGRUcmFuc2Nl aXZlcignYXVkaW8nLCB7IGRpcmVjdGlvbjogJ3JlY3Zvbmx5JyB9KTsKKyAgICBhd2FpdCBwYzIu c2V0UmVtb3RlRGVzY3JpcHRpb24oYXdhaXQgcGMxLmNyZWF0ZU9mZmVyKCkpOwogICAgIGNvbnN0 IGFuc3dlciA9IGF3YWl0IHBjMi5jcmVhdGVBbnN3ZXIoKTsKICAgICBjb25zdCBzbGRQcm9taXNl ID0gcGMyLnNldExvY2FsRGVzY3JpcHRpb24oYW5zd2VyKTsKIApkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5l Y3Rpb24tc2V0TG9jYWxEZXNjcmlwdGlvbi1vZmZlci1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0 cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlv bi1zZXRMb2NhbERlc2NyaXB0aW9uLW9mZmVyLWV4cGVjdGVkLnR4dAppbmRleCBjMmI4OWI1NzQ0 MGQ3YTcyYjJjMTlkNzY3N2YwMmE2YjQyNjAzN2RjLi4xNWRlMDkwZmRkMDBkZmU4YTQ2ZGU4ZjU3 MWJiM2RjZjFiMGZhODMzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1zZXRMb2NhbERlc2NyaXB0 aW9uLW9mZmVyLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1zZXRMb2NhbERlc2NyaXB0 aW9uLW9mZmVyLWV4cGVjdGVkLnR4dApAQCAtMSwxMCArMSwxMCBAQAogCiBQQVNTIHNldExvY2Fs RGVzY3JpcHRpb24gd2l0aCB2YWxpZCBvZmZlciBzaG91bGQgc3VjY2VlZAogRkFJTCBzZXRMb2Nh bERlc2NyaXB0aW9uIHdpdGggdHlwZSBvZmZlciBhbmQgbnVsbCBzZHAgc2hvdWxkIHVzZSBsYXN0 T2ZmZXIgZ2VuZXJhdGVkIGZyb20gY3JlYXRlT2ZmZXIgcHJvbWlzZV90ZXN0OiBVbmhhbmRsZWQg cmVqZWN0aW9uIHdpdGggdmFsdWU6IG9iamVjdCAiT3BlcmF0aW9uRXJyb3I6IEV4cGVjdCBsaW5l OiB2PSIKLUZBSUwgc2V0TG9jYWxEZXNjcmlwdGlvbigpIHdpdGggb2ZmZXIgbm90IGNyZWF0ZWQg Ynkgb3duIGNyZWF0ZU9mZmVyKCkgc2hvdWxkIHJlamVjdCB3aXRoIEludmFsaWRNb2RpZmljYXRp b25FcnJvciBwcm9taXNlX3JlamVjdHNfZG9tOiBmdW5jdGlvbiAiZnVuY3Rpb24gKCkgeyB0aHJv dyBlIH0iIHRocmV3IG9iamVjdCAiT3BlcmF0aW9uRXJyb3I6IEZhaWxlZCB0byBzZXQgbG9jYWwg b2ZmZXIgc2RwOiBGYWlsZWQgdG8gYXBwbHkgdGhlIGRlc2NyaXB0aW9uIGZvciBtPSBzZWN0aW9u IHdpdGggbWlkPScwJzogTG9jYWwgZmluZ2VycHJpbnQgZG9lcyBub3QgbWF0Y2ggaWRlbnRpdHku IEV4cGVjdGVkOiBzaGEtMjU2IENCOkREOjZDOjE2OkMzOkVCOjJCOjkxOjRCOjQ1OjU1OjRGOkMx OjQ1OkRDOkJGOjUzOjdDOkY0OjRCOkY1OjA3OjgwOjE4OjMxOjhBOjUxOjNBOjM1OjBFOjM2OjRD IEdvdDogc2hhLTI1NiBERDpEOTpFMjpGMzozMzo2ODo5QTo0QzoxRDpGRDpCRTpDQTo0RTowRjoz NTo3ODpGQzpCNToyQTowQTpDODpFNTpDRDpFMjo5Mzo3QjpDNzo3QTo5OTpDMjozMTo2MyIgdGhh dCBpcyBub3QgYSBET01FeGNlcHRpb24gSW52YWxpZE1vZGlmaWNhdGlvbkVycm9yOiBwcm9wZXJ0 eSAiY29kZSIgaXMgZXF1YWwgdG8gMCwgZXhwZWN0ZWQgMTMKK0ZBSUwgc2V0TG9jYWxEZXNjcmlw dGlvbigpIHdpdGggb2ZmZXIgbm90IGNyZWF0ZWQgYnkgb3duIGNyZWF0ZU9mZmVyKCkgc2hvdWxk IHJlamVjdCB3aXRoIEludmFsaWRNb2RpZmljYXRpb25FcnJvciBwcm9taXNlX3JlamVjdHNfZG9t OiBmdW5jdGlvbiAiZnVuY3Rpb24gKCkgeyB0aHJvdyBlIH0iIHRocmV3IG9iamVjdCAiT3BlcmF0 aW9uRXJyb3I6IEZhaWxlZCB0byBzZXQgbG9jYWwgb2ZmZXIgc2RwOiBGYWlsZWQgdG8gYXBwbHkg dGhlIGRlc2NyaXB0aW9uIGZvciBtPSBzZWN0aW9uIHdpdGggbWlkPScwJzogTG9jYWwgZmluZ2Vy cHJpbnQgZG9lcyBub3QgbWF0Y2ggaWRlbnRpdHkuIEV4cGVjdGVkOiBzaGEtMjU2IDlEOkQwOkUw OjNBOjFGOjFCOjcyOjQxOjYzOjVEOjFEOjVGOkRFOjIzOjJEOjFBOjc1OjQ0OkUwOkZFOjg0OjIy OjQwOjk0OkRCOkExOkNFOjQwOkM0OjNGOjZGOkJFIEdvdDogc2hhLTI1NiAxQjoxOTo2NzpDQTpD Qjo1Mjo3MTo5MTpDRTo1RDowMjo4NjpDOTpFRTo2Mzo4ODo4Mzo2QjpFNzpDODowRDo2Rjo2ODpD Qzo3MTo4MToyODpBNDo4OTpDRDpERTowRiIgdGhhdCBpcyBub3QgYSBET01FeGNlcHRpb24gSW52 YWxpZE1vZGlmaWNhdGlvbkVycm9yOiBwcm9wZXJ0eSAiY29kZSIgaXMgZXF1YWwgdG8gMCwgZXhw ZWN0ZWQgMTMKIEZBSUwgU2V0IGNyZWF0ZWQgb2ZmZXIgb3RoZXIgdGhhbiBsYXN0IG9mZmVyIHNo b3VsZCByZWplY3Qgd2l0aCBJbnZhbGlkTW9kaWZpY2F0aW9uRXJyb3IgYXNzZXJ0X3VucmVhY2hl ZDogU2hvdWxkIGhhdmUgcmVqZWN0ZWQ6IHVuZGVmaW5lZCBSZWFjaGVkIHVucmVhY2hhYmxlIGNv ZGUKIFBBU1MgQ3JlYXRpbmcgYW5kIHNldHRpbmcgb2ZmZXIgbXVsdGlwbGUgdGltZXMgc2hvdWxk IHN1Y2NlZWQKIFBBU1MgU2V0dGluZyBwcmV2aW91c2x5IGdlbmVyYXRlZCBvZmZlciBhZnRlciBh IGNhbGwgdG8gY3JlYXRlQW5zd2VyIHNob3VsZCB3b3JrCi1GQUlMIE5lZ290aWF0aW9uIHdvcmtz IHdoZW4gdGhlcmUgaGFzIGJlZW4gYSByZXBlYXRlZCBzZXRMb2NhbERlc2NyaXB0aW9uKG9mZmVy KSBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAxIGJ1dCBnb3QgMAorUEFTUyBOZWdvdGlhdGlvbiB3 b3JrcyB3aGVuIHRoZXJlIGhhcyBiZWVuIGEgcmVwZWF0ZWQgc2V0TG9jYWxEZXNjcmlwdGlvbihv ZmZlcikKIEZBSUwgc2V0TG9jYWxEZXNjcmlwdGlvbihvZmZlcikgc2hvdWxkIHVwZGF0ZSBpbnRl cm5hbCBzdGF0ZSB3aXRoIGEgcXVldWVkIHRhc2ssIGluIHRoZSByaWdodCBvcmRlciBhc3NlcnRf ZXF1YWxzOiBwZW5kaW5nUmVtb3RlRGVzY3JpcHRpb24gc2hvdWxkIG5ldmVyIGJlIHNldCBkdWUg dG8gc0xEIGV4cGVjdGVkIG51bGwgYnV0IGdvdCBvYmplY3QgIltvYmplY3QgUlRDU2Vzc2lvbkRl c2NyaXB0aW9uXSIKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tc2V0TG9jYWxEZXNjcmlwdGlv bi1vZmZlci5odG1sIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tc2V0TG9jYWxEZXNjcmlwdGlvbi1vZmZlci5odG1s CmluZGV4IDdhZjcxNTBkZjYwOGI2MGZhMGUxZDJhZDAxZGI5Y2Q0ZGFlZmIxMjIuLmM0ZjQ3NmIw MDlkNTA0Yjc4MDE2ODgzYmRmYTY4MDM4MDhiNDNhN2IgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJDb25uZWN0aW9u LXNldExvY2FsRGVzY3JpcHRpb24tb2ZmZXIuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1zZXRMb2Nh bERlc2NyaXB0aW9uLW9mZmVyLmh0bWwKQEAgLTE2Myw4ICsxNjMsMTAgQEAKICAgICBjb25zdCBw YzIgPSBuZXcgUlRDUGVlckNvbm5lY3Rpb24oKTsKICAgICB0LmFkZF9jbGVhbnVwKCgpID0+IHBj Mi5jbG9zZSgpKTsKIAotICAgIGNvbnN0IG9mZmVyID0gYXdhaXQgcGMxLmNyZWF0ZU9mZmVyKHtv ZmZlclRvUmVjZWl2ZUF1ZGlvOiB0cnVlfSk7IC8vIFtbTGFzdE9mZmVyXV0gc2V0Ci0gICAgY29u c3Qgb2ZmZXIyID0gYXdhaXQgcGMyLmNyZWF0ZU9mZmVyKHtvZmZlclRvUmVjZWl2ZVZpZGVvOiB0 cnVlfSk7CisgICAgcGMxLmFkZFRyYW5zY2VpdmVyKCdhdWRpbycsIHsgZGlyZWN0aW9uOiAncmVj dm9ubHknIH0pOworICAgIGNvbnN0IG9mZmVyID0gYXdhaXQgcGMxLmNyZWF0ZU9mZmVyKCk7IC8v IFtbTGFzdE9mZmVyXV0gc2V0CisgICAgcGMyLmFkZFRyYW5zY2VpdmVyKCd2aWRlbycsIHsgZGly ZWN0aW9uOiAncmVjdm9ubHknIH0pOworICAgIGNvbnN0IG9mZmVyMiA9IGF3YWl0IHBjMi5jcmVh dGVPZmZlcigpOwogICAgIGF3YWl0IHBjMS5zZXRSZW1vdGVEZXNjcmlwdGlvbihvZmZlcjIpOwog ICAgIGF3YWl0IHBjMS5jcmVhdGVBbnN3ZXIoKTsgLy8gW1tMYXN0QW5zd2VyXV0gc2V0CiAgICAg YXdhaXQgcGMxLnNldFJlbW90ZURlc2NyaXB0aW9uKHt0eXBlOiAicm9sbGJhY2sifSk7CkBAIC0x NzcsNyArMTc5LDggQEAKICAgICBjb25zdCBwYzIgPSBuZXcgUlRDUGVlckNvbm5lY3Rpb24oKTsK ICAgICB0LmFkZF9jbGVhbnVwKCgpID0+IHBjMi5jbG9zZSgpKTsKIAotICAgIGF3YWl0IHBjMS5z ZXRMb2NhbERlc2NyaXB0aW9uKGF3YWl0IHBjMS5jcmVhdGVPZmZlcih7b2ZmZXJUb1JlY2VpdmVB dWRpbzogdHJ1ZX0pKTsKKyAgICBwYzEuYWRkVHJhbnNjZWl2ZXIoJ2F1ZGlvJywgeyBkaXJlY3Rp b246ICdyZWN2b25seScgfSk7CisgICAgYXdhaXQgcGMxLnNldExvY2FsRGVzY3JpcHRpb24oYXdh aXQgcGMxLmNyZWF0ZU9mZmVyKCkpOwogCiAgICAgY29uc3Qgb2ZmZXIgPSBhd2FpdCBwYzEuY3Jl YXRlT2ZmZXIoKTsKICAgICBhd2FpdCBwYzEuc2V0TG9jYWxEZXNjcmlwdGlvbihvZmZlcik7CkBA IC0xOTYsNyArMTk5LDggQEAKICAgICBjb25zdCBwYyA9IG5ldyBSVENQZWVyQ29ubmVjdGlvbigp OwogICAgIHQuYWRkX2NsZWFudXAoKCkgPT4gcGMuY2xvc2UoKSk7CiAKLSAgICBjb25zdCBzbGRQ cm9taXNlID0gcGMuc2V0TG9jYWxEZXNjcmlwdGlvbihhd2FpdCBwYy5jcmVhdGVPZmZlcih7b2Zm ZXJUb1JlY2VpdmVBdWRpbzogdHJ1ZX0pKTsKKyAgICBwYy5hZGRUcmFuc2NlaXZlcignYXVkaW8n LCB7IGRpcmVjdGlvbjogJ3JlY3Zvbmx5JyB9KTsKKyAgICBjb25zdCBzbGRQcm9taXNlID0gcGMu c2V0TG9jYWxEZXNjcmlwdGlvbihhd2FpdCBwYy5jcmVhdGVPZmZlcigpKTsKIAogICAgIGFzc2Vy dF9lcXVhbHMocGMuc2lnbmFsaW5nU3RhdGUsICJzdGFibGUiLCAic2lnbmFsaW5nU3RhdGUgc2hv dWxkIG5vdCBiZSBzZXQgc3luY2hyb25vdXNseSBhZnRlciBhIGNhbGwgdG8gc0xEIik7CiAKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2Vi cnRjL1JUQ1BlZXJDb25uZWN0aW9uLXNldExvY2FsRGVzY3JpcHRpb24tcm9sbGJhY2suaHRtbCBi L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JUQ1Bl ZXJDb25uZWN0aW9uLXNldExvY2FsRGVzY3JpcHRpb24tcm9sbGJhY2suaHRtbAppbmRleCBlMTYw N2I2MzgzNjY3MDc4NDFkNzQzNTJkOWU5ZWUxMGQyMTg1MDRhLi4wNmJiY2Y5YjEwYjU4ZTdlZTc1 NWUzMTgzYzcxNzRjZWIzMmYyYzI0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1zZXRMb2NhbERl c2NyaXB0aW9uLXJvbGxiYWNrLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tc2V0TG9jYWxEZXNjcmlw dGlvbi1yb2xsYmFjay5odG1sCkBAIC0xMzIsNyArMTMyLDggQEAKICAgICBjb25zdCBwYyA9IG5l dyBSVENQZWVyQ29ubmVjdGlvbigpOwogICAgIHQuYWRkX2NsZWFudXAoKCkgPT4gcGMuY2xvc2Uo KSk7CiAKLSAgICBhd2FpdCBwYy5zZXRMb2NhbERlc2NyaXB0aW9uKGF3YWl0IHBjLmNyZWF0ZU9m ZmVyKHtvZmZlclRvUmVjZWl2ZUF1ZGlvOiB0cnVlfSkpOworICAgIHBjLmFkZFRyYW5zY2VpdmVy KCdhdWRpbycsIHsgZGlyZWN0aW9uOiAncmVjdm9ubHknIH0pOworICAgIGF3YWl0IHBjLnNldExv Y2FsRGVzY3JpcHRpb24oYXdhaXQgcGMuY3JlYXRlT2ZmZXIoKSk7CiAgICAgY29uc3Qgc2xkUHJv bWlzZSA9IHBjLnNldExvY2FsRGVzY3JpcHRpb24oe3R5cGU6ICJyb2xsYmFjayJ9KTsKIAogICAg IGFzc2VydF9lcXVhbHMocGMuc2lnbmFsaW5nU3RhdGUsICJoYXZlLWxvY2FsLW9mZmVyIiwgInNp Z25hbGluZ1N0YXRlIHNob3VsZCBub3QgYmUgc2V0IHN5bmNocm9ub3VzbHkgYWZ0ZXIgYSBjYWxs IHRvIHNMRCIpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tc2V0UmVtb3RlRGVzY3JpcHRpb24t b2ZmZXItZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tc2V0UmVtb3RlRGVzY3JpcHRpb24tb2Zm ZXItZXhwZWN0ZWQudHh0CmluZGV4IDExYWUzYzhhNmZiMzE0YjljYjlmYjkwMDJlYmQxMmQ1MzYz MTEzM2MuLmNlZDVhMDM4OGVlYTIxYjJhZDQ2MDMxODE2M2IwYjViNzY2ZDhiOTYgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JU Q1BlZXJDb25uZWN0aW9uLXNldFJlbW90ZURlc2NyaXB0aW9uLW9mZmVyLWV4cGVjdGVkLnR4dAor KysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9S VENQZWVyQ29ubmVjdGlvbi1zZXRSZW1vdGVEZXNjcmlwdGlvbi1vZmZlci1leHBlY3RlZC50eHQK QEAgLTcsOCArNyw4IEBAIFBBU1Mgc2V0UmVtb3RlRGVzY3JpcHRpb24ob2ZmZXIpIGZyb20gaGF2 ZS1sb2NhbC1vZmZlciBzaG91bGQgcm9sbCBiYWNrIGFuZCBzdWNjCiBQQVNTIHNldFJlbW90ZURl c2NyaXB0aW9uKG9mZmVyKSBmcm9tIGhhdmUtbG9jYWwtb2ZmZXIgZmlyZXMgc2lnbmFsaW5nc3Rh dGVjaGFuZ2UgdHdpY2UKIEZBSUwgc2V0UmVtb3RlRGVzY3JpcHRpb24ob2ZmZXIpIGluIHN0YWJs ZSBzaG91bGQgdXBkYXRlIGludGVybmFsIHN0YXRlIHdpdGggYSBxdWV1ZWQgdGFzaywgaW4gdGhl IHJpZ2h0IG9yZGVyIGFzc2VydF9lcXVhbHM6IHBlbmRpbmdSZW1vdGVEZXNjcmlwdGlvbiBzaG91 bGQgbm90IGJlIHNldCBzeW5jaHJvbm91c2x5IGFmdGVyIGEgY2FsbCB0byBzUkQgZXhwZWN0ZWQg bnVsbCBidXQgZ290IG9iamVjdCAiW29iamVjdCBSVENTZXNzaW9uRGVzY3JpcHRpb25dIgogRkFJ TCBzZXRSZW1vdGVEZXNjcmlwdGlvbihvZmZlcikgaW4gaGF2ZS1sb2NhbC1vZmZlciBzaG91bGQg dXBkYXRlIGludGVybmFsIHN0YXRlIHdpdGggYSBxdWV1ZWQgdGFzaywgaW4gdGhlIHJpZ2h0IG9y ZGVyIGFzc2VydF9ub3RfZXF1YWxzOiBwZW5kaW5nTG9jYWxEZXNjcmlwdGlvbiBzaG91bGQgbm90 IGJlIHNldCBzeW5jaHJvbm91c2x5IGFmdGVyIGEgY2FsbCB0byBzUkQgZ290IGRpc2FsbG93ZWQg dmFsdWUgbnVsbAotRkFJTCBOYWl2ZSByb2xsYmFjayBhcHByb2FjaCBpcyBub3QgZ2xhcmUtcHJv b2YgKGNvbnRyb2wpIGFzc2VydF91bnJlYWNoZWQ6IFNob3VsZCBoYXZlIHJlamVjdGVkOiB1bmRl ZmluZWQgUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1QQVNTIHNldFJlbW90ZURlc2NyaXB0aW9u KG9mZmVyKSBmcm9tIGhhdmUtbG9jYWwtb2ZmZXIgaXMgZ2xhcmUtcHJvb2YKK0ZBSUwgTmFpdmUg cm9sbGJhY2sgYXBwcm9hY2ggaXMgbm90IGdsYXJlLXByb29mIChjb250cm9sKSBwcm9taXNlX3Jl amVjdHNfZG9tOiBmdW5jdGlvbiAiZnVuY3Rpb24gKCkgeyB0aHJvdyBlIH0iIHRocmV3IG9iamVj dCAiVHlwZUVycm9yOiBOb3QgZW5vdWdoIGFyZ3VtZW50cyIgdGhhdCBpcyBub3QgYSBET01FeGNl cHRpb24gSW52YWxpZFN0YXRlRXJyb3I6IHByb3BlcnR5ICJjb2RlIiBpcyBlcXVhbCB0byB1bmRl ZmluZWQsIGV4cGVjdGVkIDExCitGQUlMIHNldFJlbW90ZURlc2NyaXB0aW9uKG9mZmVyKSBmcm9t IGhhdmUtbG9jYWwtb2ZmZXIgaXMgZ2xhcmUtcHJvb2YgcHJvbWlzZV90ZXN0OiBVbmhhbmRsZWQg cmVqZWN0aW9uIHdpdGggdmFsdWU6IG9iamVjdCAiVHlwZUVycm9yOiBOb3QgZW5vdWdoIGFyZ3Vt ZW50cyIKIEZBSUwgc2V0UmVtb3RlRGVzY3JpcHRpb24oaW52YWxpZE9mZmVyKSBmcm9tIGhhdmUt bG9jYWwtb2ZmZXIgZG9lcyBub3QgdW5kbyByb2xsYmFjayBUZXN0IGJ1ZzogdW5yZWNvZ25pemVk IERPTUV4Y2VwdGlvbiBjb2RlIG5hbWUgb3IgbmFtZSAiUlRDRXJyb3IiIHBhc3NlZCB0byBhc3Nl cnRfdGhyb3dzX2RvbSgpCiBQQVNTIHJlcGVhdGVkIHNSRChvZmZlcikgd29ya3MKIFBBU1Mgc1JE KHJlb2ZmZXIpIHdpdGggY2FuZGlkYXRlcyBhbmQgd2l0aG91dCB0cmlja2xlIHdvcmtzCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0 Yy9SVENQZWVyQ29ubmVjdGlvbi1zZXRSZW1vdGVEZXNjcmlwdGlvbi1vZmZlci5odG1sIGIvTGF5 b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNv bm5lY3Rpb24tc2V0UmVtb3RlRGVzY3JpcHRpb24tb2ZmZXIuaHRtbAppbmRleCBhNTBlOTY5NjM3 Mjk0YWVjOGVlYWZlNjgyZGE1ZDI1OGUyYTkwZGU1Li4yNDdkNmUwZDQ5ZWM2NDQ3Y2RlOWQ0ZTc5 MTI3ZGE3ZjkxMzZjZTM5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1zZXRSZW1vdGVEZXNjcmlw dGlvbi1vZmZlci5odG1sCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJDb25uZWN0aW9uLXNldFJlbW90ZURlc2NyaXB0aW9uLW9m ZmVyLmh0bWwKQEAgLTE5Myw3ICsxOTMsOCBAQAogICAgIGNvbnN0IHBjMiA9IG5ldyBSVENQZWVy Q29ubmVjdGlvbigpOwogICAgIHQuYWRkX2NsZWFudXAoKCkgPT4gcGMyLmNsb3NlKCkpOwogCi0g ICAgY29uc3Qgc3JkUHJvbWlzZSA9IHBjMi5zZXRSZW1vdGVEZXNjcmlwdGlvbihhd2FpdCBwYzEu Y3JlYXRlT2ZmZXIoe29mZmVyVG9SZWNlaXZlQXVkaW86IHRydWV9KSk7CisgICAgcGMxLmFkZFRy YW5zY2VpdmVyKCdhdWRpbycsIHsgZGlyZWN0aW9uOiAncmVjdm9ubHknIH0pOworICAgIGNvbnN0 IHNyZFByb21pc2UgPSBwYzIuc2V0UmVtb3RlRGVzY3JpcHRpb24oYXdhaXQgcGMxLmNyZWF0ZU9m ZmVyKCkpOwogCiAgICAgYXNzZXJ0X2VxdWFscyhwYzIuc2lnbmFsaW5nU3RhdGUsICJzdGFibGUi LCAic2lnbmFsaW5nU3RhdGUgc2hvdWxkIG5vdCBiZSBzZXQgc3luY2hyb25vdXNseSBhZnRlciBh IGNhbGwgdG8gc1JEIik7CiAKQEAgLTIyMiwxMCArMjIzLDEyIEBACiAgICAgY29uc3QgcGMyID0g bmV3IFJUQ1BlZXJDb25uZWN0aW9uKCk7CiAgICAgdC5hZGRfY2xlYW51cCgoKSA9PiBwYzIuY2xv c2UoKSk7CiAKLSAgICBhd2FpdCBwYzIuc2V0TG9jYWxEZXNjcmlwdGlvbihhd2FpdCBwYzIuY3Jl YXRlT2ZmZXIoe29mZmVyVG9SZWNlaXZlQXVkaW86IHRydWV9KSk7CisgICAgcGMyLmFkZFRyYW5z Y2VpdmVyKCdhdWRpbycsIHsgZGlyZWN0aW9uOiAncmVjdm9ubHknIH0pOworICAgIGF3YWl0IHBj Mi5zZXRMb2NhbERlc2NyaXB0aW9uKGF3YWl0IHBjMi5jcmVhdGVPZmZlcigpKTsKIAogICAgIC8v IEltcGxpY2l0IHJvbGxiYWNrIQotICAgIGNvbnN0IHNyZFByb21pc2UgPSBwYzIuc2V0UmVtb3Rl RGVzY3JpcHRpb24oYXdhaXQgcGMxLmNyZWF0ZU9mZmVyKHtvZmZlclRvUmVjZWl2ZUF1ZGlvOiB0 cnVlfSkpOworICAgIHBjMS5hZGRUcmFuc2NlaXZlcignYXVkaW8nLCB7IGRpcmVjdGlvbjogJ3Jl Y3Zvbmx5JyB9KTsKKyAgICBjb25zdCBzcmRQcm9taXNlID0gcGMyLnNldFJlbW90ZURlc2NyaXB0 aW9uKGF3YWl0IHBjMS5jcmVhdGVPZmZlcigpKTsKIAogICAgIGFzc2VydF9lcXVhbHMocGMyLnNp Z25hbGluZ1N0YXRlLCAiaGF2ZS1sb2NhbC1vZmZlciIsICJzaWduYWxpbmdTdGF0ZSBzaG91bGQg bm90IGJlIHNldCBzeW5jaHJvbm91c2x5IGFmdGVyIGEgY2FsbCB0byBzUkQiKTsKIApkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMv UlRDUGVlckNvbm5lY3Rpb24tc2V0UmVtb3RlRGVzY3JpcHRpb24tcm9sbGJhY2suaHRtbCBiL0xh eW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJD b25uZWN0aW9uLXNldFJlbW90ZURlc2NyaXB0aW9uLXJvbGxiYWNrLmh0bWwKaW5kZXggYTAzMWE2 MDE1ZjQyNzRkNzgzZmMzYTVhMWJjZTAzYTdlMjNkZmZlOC4uOTRlZDc5Y2RiMmYwNDIwNjkwZDU0 N2JiNGE1YzJiNzY2NzFjZDhhNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tc2V0UmVtb3RlRGVz Y3JpcHRpb24tcm9sbGJhY2suaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1zZXRSZW1vdGVEZXNjcmlw dGlvbi1yb2xsYmFjay5odG1sCkBAIC0xMjEsMTAgKzEyMSwxMiBAQAogICAgIHQuYWRkX2NsZWFu dXAoKCkgPT4gcGMyLmNsb3NlKCkpOwogCiAgICAgLy8gV2UgZG9uJ3QgdXNlIHRoaXMgcmlnaHQg YXdheQotICAgIGNvbnN0IG9mZmVyMSA9IGF3YWl0IHBjMS5jcmVhdGVPZmZlcih7b2ZmZXJUb1Jl Y2VpdmVBdWRpbzogdHJ1ZX0pOworICAgIHBjMS5hZGRUcmFuc2NlaXZlcignYXVkaW8nLCB7IGRp cmVjdGlvbjogJ3JlY3Zvbmx5JyB9KTsKKyAgICBjb25zdCBvZmZlcjEgPSBhd2FpdCBwYzEuY3Jl YXRlT2ZmZXIoKTsKIAogICAgIC8vIENyZWF0ZSBvZmZlciBmcm9tIHBjMiwgYXBwbHkgYW5kIHJv bGxiYWNrIG9uIHBjMQotICAgIGNvbnN0IG9mZmVyMiA9IGF3YWl0IHBjMi5jcmVhdGVPZmZlcih7 b2ZmZXJUb1JlY2VpdmVBdWRpbzogdHJ1ZX0pOworICAgIHBjMi5hZGRUcmFuc2NlaXZlcignYXVk aW8nLCB7IGRpcmVjdGlvbjogJ3JlY3Zvbmx5JyB9KTsKKyAgICBjb25zdCBvZmZlcjIgPSBhd2Fp dCBwYzIuY3JlYXRlT2ZmZXIoKTsKICAgICBhd2FpdCBwYzEuc2V0UmVtb3RlRGVzY3JpcHRpb24o b2ZmZXIyKTsKICAgICBhd2FpdCBwYzEuc2V0UmVtb3RlRGVzY3JpcHRpb24oe3R5cGU6ICJyb2xs YmFjayJ9KTsKIApAQCAtMTQ3LDcgKzE0OSw5IEBACiAgICAgY29uc3Qgb2ZmZXIxID0gYXdhaXQg cGMxLmNyZWF0ZU9mZmVyKCk7CiAKICAgICAvLyBDcmVhdGUgb2ZmZXIgZnJvbSBwYzIsIGFwcGx5 IGFuZCByb2xsYmFjayBvbiBwYzEKLSAgICBjb25zdCBvZmZlcjIgPSBhd2FpdCBwYzIuY3JlYXRl T2ZmZXIoe29mZmVyVG9SZWNlaXZlQXVkaW86IHRydWUsIG9mZmVyVG9SZWNlaXZlVmlkZW86IHRy dWV9KTsKKyAgICBwYzIuYWRkVHJhbnNjZWl2ZXIoJ2F1ZGlvJywgeyBkaXJlY3Rpb246ICdyZWN2 b25seScgfSk7CisgICAgcGMyLmFkZFRyYW5zY2VpdmVyKCd2aWRlbycsIHsgZGlyZWN0aW9uOiAn cmVjdm9ubHknIH0pOworICAgIGNvbnN0IG9mZmVyMiA9IGF3YWl0IHBjMi5jcmVhdGVPZmZlcigp OwogICAgIC8vIHBjMSBub3cgc2hvdWxkIGNoYW5nZSBpdHMgbWluZCBhYm91dCB3aGF0IGxldmVs IGl0cyB2aWRlbyB0cmFuc2NlaXZlciBpcwogICAgIC8vIGJvdW5kIHRvLiBJdCB3YXMgMCwgbm93 IGl0IGlzIDEuCiAgICAgYXdhaXQgcGMxLnNldFJlbW90ZURlc2NyaXB0aW9uKG9mZmVyMik7CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dl YnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi10cmFuc2NlaXZlcnMuaHR0cHMtZXhwZWN0ZWQudHh0IGIv TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVl ckNvbm5lY3Rpb24tdHJhbnNjZWl2ZXJzLmh0dHBzLWV4cGVjdGVkLnR4dAppbmRleCAxZTQzNDNk MTI3NGE2NmU3YjNlMjc3MzdlZTdiZWU0OGY5ZGNiZWMwLi43NjBhMWMzNzI0NjBlYTQ4Y2NkNDRl ZGVjYzAxZjc0ZTM0ZTZjNDAzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi10cmFuc2NlaXZlcnMu aHR0cHMtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJDb25uZWN0aW9uLXRyYW5zY2VpdmVycy5odHRwcy1l eHBlY3RlZC50eHQKQEAgLTQxLDYgKzQxLDYgQEAgUEFTUyBhZGRUcmFuc2NlaXZlciBkb2VzIG5v dCByZXVzZSByZXVzYWJsZSB0cmFuc2NlaXZlcnMKIFBBU1MgQ2FuIHNldHVwIHR3by13YXkgY2Fs bCB1c2luZyBhIHNpbmdsZSB0cmFuc2NlaXZlcgogRkFJTCBDbG9zaW5nIHRoZSBQQyBzdG9wcyB0 aGUgdHJhbnNjZWl2ZXJzIGFzc2VydF9lcXVhbHM6IGV4cGVjdGVkIChvYmplY3QpIG51bGwgYnV0 IGdvdCAoc3RyaW5nKSAiaW5hY3RpdmUiCiBQQVNTIENoYW5naW5nIHRyYW5zY2VpdmVyIGRpcmVj dGlvbiB0byAnc2VuZHJlY3YnIG1ha2VzIG9udHJhY2sgZmlyZQotRkFJTCB0cmFuc2NlaXZlci5z ZW5kZXIudHJhY2sgZG9lcyBub3QgcmV2ZXJ0IHRvIGFuIG9sZCBzdGF0ZSBwcm9taXNlX3Rlc3Q6 IFVuaGFuZGxlZCByZWplY3Rpb24gd2l0aCB2YWx1ZTogb2JqZWN0ICJUeXBlRXJyb3I6IHVuZGVm aW5lZCBpcyBub3QgYW4gb2JqZWN0IChldmFsdWF0aW5nICdwYzEuZ2V0UmVjZWl2ZXJzKClbMF0u dHJhY2snKSIKLUZBSUwgdHJhbnNjZWl2ZXIuZGlyZWN0aW9uIGRvZXMgbm90IHJldmVydCB0byBh biBvbGQgc3RhdGUgcHJvbWlzZV90ZXN0OiBVbmhhbmRsZWQgcmVqZWN0aW9uIHdpdGggdmFsdWU6 IG9iamVjdCAiVHlwZUVycm9yOiB1bmRlZmluZWQgaXMgbm90IGFuIG9iamVjdCAoZXZhbHVhdGlu ZyAncGMxLmdldFRyYW5zY2VpdmVycygpWzBdLmRpcmVjdGlvbiA9ICdpbmFjdGl2ZScnKSIKK1BB U1MgdHJhbnNjZWl2ZXIuc2VuZGVyLnRyYWNrIGRvZXMgbm90IHJldmVydCB0byBhbiBvbGQgc3Rh dGUKK1BBU1MgdHJhbnNjZWl2ZXIuZGlyZWN0aW9uIGRvZXMgbm90IHJldmVydCB0byBhbiBvbGQg c3RhdGUKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tdHJhbnNjZWl2ZXJzLmh0dHBzLmh0bWwg Yi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQ ZWVyQ29ubmVjdGlvbi10cmFuc2NlaXZlcnMuaHR0cHMuaHRtbAppbmRleCAxMTA2MzhjZDc0ZThk OTEwNjVmYjdlZjNhMjhjZTFhODA1MWM2MzcwLi5hNDc0ZjcwOTI4YTY0MGU2MzcyYzMzYTAzM2Y0 NjRmZGNjNTdjMmRmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi10cmFuc2NlaXZlcnMuaHR0cHMu aHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dl YnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi10cmFuc2NlaXZlcnMuaHR0cHMuaHRtbApAQCAtNDc5LDcg KzQ3OSw4IEBAIHByb21pc2VfdGVzdChhc3luYyB0ID0+IHsKICAgICAudGhlbigob2ZmZXIpID0+ IHsgcmV0dXJuIHBjMS5zZXRSZW1vdGVEZXNjcmlwdGlvbihvZmZlcik7IH0pCiAgICAgLnRoZW4o KCkgPT4geyByZXR1cm4gcGMxLmNyZWF0ZUFuc3dlcigpOyB9KQogICAgIC50aGVuKChhbnN3ZXIp ID0+IHsgcmV0dXJuIHBjMS5zZXRMb2NhbERlc2NyaXB0aW9uKGFuc3dlcik7IH0pOwotICBjb25z dCBwYzFQcm9taXNlID0gcGMxLmNyZWF0ZU9mZmVyKHsgb2ZmZXJUb1JlY2VpdmVBdWRpbzogdHJ1 ZX0pCisgIHBjMS5hZGRUcmFuc2NlaXZlcignYXVkaW8nLCB7IGRpcmVjdGlvbjogJ3JlY3Zvbmx5 JyB9KTsKKyAgY29uc3QgcGMxUHJvbWlzZSA9IHBjMS5jcmVhdGVPZmZlcigpCiAgICAgLnRoZW4o KCkgPT4geyBwYzEuYWRkVHJhY2socGMxLmdldFJlY2VpdmVycygpWzBdLnRyYWNrKTsgfSk7CiAg IGF3YWl0IFByb21pc2UuYWxsKFtwYzFQcm9taXNlLCBwYzJQcm9taXNlXSk7CiAgIGFzc2VydF9l cXVhbHMocGMxLmdldFNlbmRlcnMoKVswXS50cmFjaywgcGMxLmdldFJlY2VpdmVycygpWzBdLnRy YWNrKTsKQEAgLTQ5NCw3ICs0OTUsOCBAQCBwcm9taXNlX3Rlc3QoYXN5bmMgdCA9PiB7CiAgIGNv bnN0IHBjMlByb21pc2UgPSBwYzIuY3JlYXRlT2ZmZXIoKQogICAgIC50aGVuKChvZmZlcikgPT4g eyByZXR1cm4gcGMxLnNldFJlbW90ZURlc2NyaXB0aW9uKG9mZmVyKTsgfSkKICAgICAudGhlbigo KSA9PiB7IHJldHVybiBwYzEuY3JlYXRlQW5zd2VyKCk7IH0pOwotICBjb25zdCBwYzFQcm9taXNl ID0gcGMxLmNyZWF0ZU9mZmVyKHsgb2ZmZXJUb1JlY2VpdmVBdWRpbzogdHJ1ZX0pCisgIHBjMS5h ZGRUcmFuc2NlaXZlcignYXVkaW8nLCB7IGRpcmVjdGlvbjogJ3JlY3Zvbmx5JyB9KTsKKyAgY29u c3QgcGMxUHJvbWlzZSA9IHBjMS5jcmVhdGVPZmZlcigpCiAgICAgLnRoZW4oKCkgPT4geyBwYzEu Z2V0VHJhbnNjZWl2ZXJzKClbMF0uZGlyZWN0aW9uID0gJ2luYWN0aXZlJzsgfSk7CiAgIGF3YWl0 IFByb21pc2UuYWxsKFtwYzFQcm9taXNlLCBwYzJQcm9taXNlXSk7CiAgIGFzc2VydF9lcXVhbHMo cGMxLmdldFRyYW5zY2VpdmVycygpWzBdLmRpcmVjdGlvbiwgJ2luYWN0aXZlJyk7CmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9w cm90b2NvbC9SVENQZWVyQ29ubmVjdGlvbi1wYXlsb2FkVHlwZXMuaHRtbCBiL0xheW91dFRlc3Rz L2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL3Byb3RvY29sL1JUQ1BlZXJD b25uZWN0aW9uLXBheWxvYWRUeXBlcy5odG1sCmluZGV4IGVhY2JmMzhhMGY2MTI4ZWZkY2Q1OTdm OTk1YmY4NzJmNTU5YTg4MmMuLjA2NmZjMmUwODVlMzJkYTVjMjMwODA2YzQ1MTFlZDUyNTc3ZTUw NDggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvd2VicnRjL3Byb3RvY29sL1JUQ1BlZXJDb25uZWN0aW9uLXBheWxvYWRUeXBlcy5odG1sCisr KyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL3By b3RvY29sL1JUQ1BlZXJDb25uZWN0aW9uLXBheWxvYWRUeXBlcy5odG1sCkBAIC0xMyw3ICsxMyw5 IEBAIHByb21pc2VfdGVzdChhc3luYyB0ID0+IHsKICAgY29uc3QgcGMxID0gbmV3IFJUQ1BlZXJD b25uZWN0aW9uKCk7CiAgIHQuYWRkX2NsZWFudXAoKCkgPT4gcGMxLmNsb3NlKCkpOwogCi0gIGNv bnN0IG9mZmVyID0gYXdhaXQgcGMxLmNyZWF0ZU9mZmVyKHtvZmZlclRvUmVjZWl2ZUF1ZGlvOiB0 cnVlLCBvZmZlclRvUmVjZWl2ZVZpZGVvOiB0cnVlfSk7CisgIHBjMS5hZGRUcmFuc2NlaXZlcign YXVkaW8nLCB7IGRpcmVjdGlvbjogJ3JlY3Zvbmx5JyB9KTsKKyAgcGMxLmFkZFRyYW5zY2VpdmVy KCd2aWRlbycsIHsgZGlyZWN0aW9uOiAncmVjdm9ubHknIH0pOworICBjb25zdCBvZmZlciA9IGF3 YWl0IHBjMS5jcmVhdGVPZmZlcigpOwogCiAgIC8vIEV4dHJhY3QgYWxsIHBheWxvYWQgdHlwZXMg ZnJvbSB0aGUgbT0gbGluZXMuCiAgIGNvbnN0IHBheWxvYWRUeXBlcyA9IG9mZmVyLnNkcC5zcGxp dCgnXG4nKQo= 437538 2021-09-07 11:27:53 -0700 2021-09-14 00:40:45 -0700 Patch bug-230000-20210907202751.patch text/plain 28629 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMDc1CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBv cnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpp bmRleCBmMzVkNjQzZmNhODVkZWFjZDhlMDE4NTUzMzQ4ZWM2N2EzMGI3YjI2Li5lMjUxYzY1Zjc4 OTc4NTBjNjQ4NmYzMjZhYWYyNDQ1NWUxYzU5MjAxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9p bXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAyMS0wOS0wNyAgWW91ZW5uIEZhYmxldCAgPHlvdWVu bkBhcHBsZS5jb20+CisKKyAgICAgICAgTWlncmF0ZSBzb21lIFdQVCBXZWJSVEMgdGVzdHMgb3Vy IG9mIGxlZ2FjeSBvZmZlclRvUmVjZWl2ZSBwYXJhbWV0ZXJzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzAwMDAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBvZmZlclRvUmVjZWl2ZSBvcHRpb25zIGFyZSBs ZWdhY3kgb3B0aW9ucyB0ZXN0ZWQgaW4gV1BUIHdlYnJ0Yy1sZWdhY3kgZm9sZGVyLgorICAgICAg ICBNb3ZlIHRvIGFkZFRyYW5zY2VpdmVyIGluc3RlYWQuCisKKyAgICAgICAgKiB3ZWItcGxhdGZv cm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJDb25uZWN0aW9uLWV4cGxpY2l0LXJvbGxiYWNrLWljZUdh dGhlcmluZ1N0YXRlLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMv d2VicnRjL1JUQ1BlZXJDb25uZWN0aW9uLWV4cGxpY2l0LXJvbGxiYWNrLWljZUdhdGhlcmluZ1N0 YXRlLmh0bWw6CisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29u bmVjdGlvbi1pY2VHYXRoZXJpbmdTdGF0ZS1leHBlY3RlZC50eHQ6CisgICAgICAgICogd2ViLXBs YXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1pY2VHYXRoZXJpbmdTdGF0ZS5o dG1sOgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rp b24tc2V0TG9jYWxEZXNjcmlwdGlvbi1hbnN3ZXItZXhwZWN0ZWQudHh0OgorICAgICAgICAqIHdl Yi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tc2V0TG9jYWxEZXNjcmlw dGlvbi1hbnN3ZXIuaHRtbDoKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JU Q1BlZXJDb25uZWN0aW9uLXNldExvY2FsRGVzY3JpcHRpb24tb2ZmZXItZXhwZWN0ZWQudHh0Ogor ICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tc2V0 TG9jYWxEZXNjcmlwdGlvbi1vZmZlci5odG1sOgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0 cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tc2V0TG9jYWxEZXNjcmlwdGlvbi1yb2xsYmFjay5o dG1sOgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rp b24tc2V0UmVtb3RlRGVzY3JpcHRpb24tb2ZmZXItZXhwZWN0ZWQudHh0OgorICAgICAgICAqIHdl Yi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tc2V0UmVtb3RlRGVzY3Jp cHRpb24tb2ZmZXIuaHRtbDoKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JU Q1BlZXJDb25uZWN0aW9uLXNldFJlbW90ZURlc2NyaXB0aW9uLXJvbGxiYWNrLmh0bWw6CisgICAg ICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi10cmFuc2Nl aXZlcnMuaHR0cHMtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy93 ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tdHJhbnNjZWl2ZXJzLmh0dHBzLmh0bWw6CisgICAgICAg ICogd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9wcm90b2NvbC9SVENQZWVyQ29ubmVjdGlvbi1w YXlsb2FkVHlwZXMuaHRtbDoKKwogMjAyMS0wOS0wNiAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1 ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyODIwNTgu CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1leHBsaWNpdC1yb2xsYmFjay1pY2VHYXRoZXJpbmdT dGF0ZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1leHBsaWNpdC1yb2xsYmFjay1pY2VHYXRo ZXJpbmdTdGF0ZS1leHBlY3RlZC50eHQKaW5kZXggYjM1ZDcyNGIxOGFkMWFkOWJjYWNkMTQ4Yjdl YzNjZWJkNjFhMmQzOC4uNmQ3Yzc4ODdkNTk0ZmM5ZmZhYmI5NDkxNDY5YzMyMzUyMjQ3NTU0MCAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93 ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tZXhwbGljaXQtcm9sbGJhY2staWNlR2F0aGVyaW5nU3Rh dGUtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJDb25uZWN0aW9uLWV4cGxpY2l0LXJvbGxiYWNrLWljZUdh dGhlcmluZ1N0YXRlLWV4cGVjdGVkLnR4dApAQCAtMSw3ICsxLDUgQEAKIAotSGFybmVzcyBFcnJv ciAoVElNRU9VVCksIG1lc3NhZ2UgPSBudWxsCi0KLVRJTUVPVVQgcm9sbGluZyBiYWNrIGFuIElD RSByZXN0YXJ0IHdoZW4gZ2F0aGVyaW5nIGlzIGNvbXBsZXRlIHNob3VsZCBub3QgcmVzdWx0IGlu IGljZUdhdGhlcmluZ1N0YXRlIGNoYW5nZXMgVGVzdCB0aW1lZCBvdXQKLU5PVFJVTiBzZXRMb2Nh bERlc2NyaXB0aW9uKHJvbGxiYWNrKSBvZiBvcmlnaW5hbCBvZmZlciBzaG91bGQgY2F1c2UgaWNl R2F0aGVyaW5nU3RhdGUgdG8gcmVhY2ggIm5ldyIgd2hlbiBzdGFydGluZyBpbiAiY29tcGxldGUi Ci1OT1RSVU4gc2V0TG9jYWxEZXNjcmlwdGlvbihyb2xsYmFjaykgb2Ygb3JpZ2luYWwgb2ZmZXIg c2hvdWxkIGNhdXNlIGljZUdhdGhlcmluZ1N0YXRlIHRvIHJlYWNoICJuZXciIHdoZW4gc3RhcnRp bmcgaW4gImdhdGhlcmluZyIKK1BBU1Mgcm9sbGluZyBiYWNrIGFuIElDRSByZXN0YXJ0IHdoZW4g Z2F0aGVyaW5nIGlzIGNvbXBsZXRlIHNob3VsZCBub3QgcmVzdWx0IGluIGljZUdhdGhlcmluZ1N0 YXRlIGNoYW5nZXMKK0ZBSUwgc2V0TG9jYWxEZXNjcmlwdGlvbihyb2xsYmFjaykgb2Ygb3JpZ2lu YWwgb2ZmZXIgc2hvdWxkIGNhdXNlIGljZUdhdGhlcmluZ1N0YXRlIHRvIHJlYWNoICJuZXciIHdo ZW4gc3RhcnRpbmcgaW4gImNvbXBsZXRlIiBwcm9taXNlX3Rlc3Q6IFVuaGFuZGxlZCByZWplY3Rp b24gd2l0aCB2YWx1ZTogIlVuZXhwZWN0ZWQgZ2F0aGVyaW5nIHN0YXRlOiBjb21wbGV0ZSwgd2Fz IGV4cGVjdGluZyBnYXRoZXJpbmciCitGQUlMIHNldExvY2FsRGVzY3JpcHRpb24ocm9sbGJhY2sp IG9mIG9yaWdpbmFsIG9mZmVyIHNob3VsZCBjYXVzZSBpY2VHYXRoZXJpbmdTdGF0ZSB0byByZWFj aCAibmV3IiB3aGVuIHN0YXJ0aW5nIGluICJnYXRoZXJpbmciIHByb21pc2VfdGVzdDogVW5oYW5k bGVkIHJlamVjdGlvbiB3aXRoIHZhbHVlOiAiVW5leHBlY3RlZCBnYXRoZXJpbmcgc3RhdGU6IGNv bXBsZXRlLCB3YXMgZXhwZWN0aW5nIGdhdGhlcmluZyIKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rp b24tZXhwbGljaXQtcm9sbGJhY2staWNlR2F0aGVyaW5nU3RhdGUuaHRtbCBiL0xheW91dFRlc3Rz L2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJDb25uZWN0aW9u LWV4cGxpY2l0LXJvbGxiYWNrLWljZUdhdGhlcmluZ1N0YXRlLmh0bWwKaW5kZXggOWMxZmUwMTRi ZDllZTE4YmI2YTlhYjY1ZWE3YWEzZWViYmNlMTIwMC4uZTM5Yjk4NWJlZjJmZTY1ZDM1OWUxNjE1 MmI4Y2ZmMzIyMDE2ZmQwOCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tZXhwbGljaXQtcm9sbGJh Y2staWNlR2F0aGVyaW5nU3RhdGUuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1leHBsaWNpdC1yb2xs YmFjay1pY2VHYXRoZXJpbmdTdGF0ZS5odG1sCkBAIC0xMiw4ICsxMiw5IEBAIHByb21pc2VfdGVz dChhc3luYyB0ID0+IHsKICAgdC5hZGRfY2xlYW51cCgoKSA9PiBwYzEuY2xvc2UoKSk7CiAgIGNv bnN0IHBjMiA9IG5ldyBSVENQZWVyQ29ubmVjdGlvbigpOwogICB0LmFkZF9jbGVhbnVwKCgpID0+ IHBjMi5jbG9zZSgpKTsKKyAgcGMxLmFkZFRyYW5zY2VpdmVyKCdhdWRpbycsIHsgZGlyZWN0aW9u OiAncmVjdm9ubHknIH0pOwogICBhd2FpdCBpbml0aWFsT2ZmZXJBbnN3ZXJXaXRoSWNlR2F0aGVy aW5nU3RhdGVUcmFuc2l0aW9ucygKLSAgICAgIHBjMSwgcGMyLCB7b2ZmZXJUb1JlY2VpdmVBdWRp bzogdHJ1ZX0pOworICAgICAgcGMxLCBwYzIpOwogICBhd2FpdCBwYzEuc2V0TG9jYWxEZXNjcmlw dGlvbihhd2FpdCBwYzEuY3JlYXRlT2ZmZXIoe2ljZVJlc3RhcnQ6IHRydWV9KSk7CiAgIGF3YWl0 IGljZUdhdGhlcmluZ1N0YXRlVHJhbnNpdGlvbnMocGMxLCAnZ2F0aGVyaW5nJywgJ2NvbXBsZXRl Jyk7CiAgIGV4cGVjdE5vTW9yZUdhdGhlcmluZ1N0YXRlQ2hhbmdlcyh0LCBwYzEpOwpAQCAtMjQs OCArMjUsOSBAQCBwcm9taXNlX3Rlc3QoYXN5bmMgdCA9PiB7CiBwcm9taXNlX3Rlc3QoYXN5bmMg dCA9PiB7CiAgIGNvbnN0IHBjID0gbmV3IFJUQ1BlZXJDb25uZWN0aW9uKCk7CiAgIHQuYWRkX2Ns ZWFudXAoKCkgPT4gcGMuY2xvc2UoKSk7CisgIHBjLmFkZFRyYW5zY2VpdmVyKCdhdWRpbycsIHsg ZGlyZWN0aW9uOiAncmVjdm9ubHknIH0pOwogICBhd2FpdCBwYy5zZXRMb2NhbERlc2NyaXB0aW9u KAotICAgIGF3YWl0IHBjLmNyZWF0ZU9mZmVyKHtvZmZlclRvUmVjZWl2ZUF1ZGlvOiB0cnVlfSkp OworICAgIGF3YWl0IHBjLmNyZWF0ZU9mZmVyKCkpOwogICBhd2FpdCBpY2VHYXRoZXJpbmdTdGF0 ZVRyYW5zaXRpb25zKHBjLCAnZ2F0aGVyaW5nJywgJ2NvbXBsZXRlJyk7CiAgIGF3YWl0IHBjLnNl dExvY2FsRGVzY3JpcHRpb24oe3R5cGU6ICdyb2xsYmFjayd9KTsKICAgYXdhaXQgaWNlR2F0aGVy aW5nU3RhdGVUcmFuc2l0aW9ucyhwYywgJ25ldycpOwpAQCAtMzQsOCArMzYsOSBAQCBwcm9taXNl X3Rlc3QoYXN5bmMgdCA9PiB7CiBwcm9taXNlX3Rlc3QoYXN5bmMgdCA9PiB7CiAgIGNvbnN0IHBj ID0gbmV3IFJUQ1BlZXJDb25uZWN0aW9uKCk7CiAgIHQuYWRkX2NsZWFudXAoKCkgPT4gcGMuY2xv c2UoKSk7CisgIHBjLmFkZFRyYW5zY2VpdmVyKCdhdWRpbycsIHsgZGlyZWN0aW9uOiAncmVjdm9u bHknIH0pOwogICBhd2FpdCBwYy5zZXRMb2NhbERlc2NyaXB0aW9uKAotICAgIGF3YWl0IHBjLmNy ZWF0ZU9mZmVyKHtvZmZlclRvUmVjZWl2ZUF1ZGlvOiB0cnVlfSkpOworICAgIGF3YWl0IHBjLmNy ZWF0ZU9mZmVyKCkpOwogICBhd2FpdCBpY2VHYXRoZXJpbmdTdGF0ZVRyYW5zaXRpb25zKHBjLCAn Z2F0aGVyaW5nJyk7CiAgIGF3YWl0IHBjLnNldExvY2FsRGVzY3JpcHRpb24oe3R5cGU6ICdyb2xs YmFjayd9KTsKICAgLy8gV2UgbWlnaHQgZ28gZGlyZWN0bHkgdG8gJ25ldycsIG9yIHdlIG1pZ2h0 IGdvIHRvICdjb21wbGV0ZScgZmlyc3QsCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1pY2VHYXRo ZXJpbmdTdGF0ZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1pY2VHYXRoZXJpbmdTdGF0ZS1l eHBlY3RlZC50eHQKaW5kZXggNjA4NjMyNzljYjU4ZjE1ZDQwMTYyYmQ5ZDMyMDIyYzM0NjU0OTE2 ZC4uZmIwYTYwMTkyNGQzMjczYTM4MTJhYTBkMjdmZjg3ZWVkMmM4Mjk3YiAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVl ckNvbm5lY3Rpb24taWNlR2F0aGVyaW5nU3RhdGUtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRl c3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJDb25uZWN0 aW9uLWljZUdhdGhlcmluZ1N0YXRlLWV4cGVjdGVkLnR4dApAQCAtMSwxMiArMSwxMCBAQAogCi1I YXJuZXNzIEVycm9yIChUSU1FT1VUKSwgbWVzc2FnZSA9IG51bGwKLQogUEFTUyBJbml0aWFsIGlj ZUdhdGhlcmluZ1N0YXRlIHNob3VsZCBiZSBuZXcKIFBBU1MgaWNlR2F0aGVyaW5nU3RhdGUgc2hv dWxkIGV2ZW50dWFsbHkgYmVjb21lIGNvbXBsZXRlIGFmdGVyIHNldExvY2FsRGVzY3JpcHRpb24K LVRJTUVPVVQgc2V0TG9jYWxEZXNjcmlwdGlvbihyZW9mZmVyKSB3aXRoIG5vIG5ldyB0cmFuc3Bv cnRzIHNob3VsZCBub3QgY2F1c2UgaWNlR2F0aGVyaW5nU3RhdGUgdG8gY2hhbmdlIFRlc3QgdGlt ZWQgb3V0Ci1OT1RSVU4gc2V0TG9jYWxEZXNjcmlwdGlvbigpIHdpdGggbm8gdHJhbnNwb3J0cyBz aG91bGQgbm90IGNhdXNlIGljZUdhdGhlcmluZ1N0YXRlIHRvIGNoYW5nZQotTk9UUlVOIHNldExv Y2FsRGVzY3JpcHRpb24ocmVvZmZlcikgd2l0aCBhIG5ldyB0cmFuc3BvcnQgc2hvdWxkIGNhdXNl IGljZUdhdGhlcmluZ1N0YXRlIHRvIGdvIHRvICJjaGVja2luZyIgYW5kIHRoZW4gImNvbXBsZXRl IgotTk9UUlVOIHNSRCBkb2VzIG5vdCBjYXVzZSBJQ0UgZ2F0aGVyaW5nIHN0YXRlIGNoYW5nZXMK LU5PVFJVTiByZW5lZ290aWF0aW9uIHRoYXQgY2xvc2VzIGFsbCB0cmFuc3BvcnRzIHNob3VsZCBy ZXN1bHQgaW4gSUNFIGdhdGhlcmluZyBzdGF0ZSAibmV3IgorRkFJTCBzZXRMb2NhbERlc2NyaXB0 aW9uKHJlb2ZmZXIpIHdpdGggbm8gbmV3IHRyYW5zcG9ydHMgc2hvdWxkIG5vdCBjYXVzZSBpY2VH YXRoZXJpbmdTdGF0ZSB0byBjaGFuZ2UgcHJvbWlzZV90ZXN0OiBVbmhhbmRsZWQgcmVqZWN0aW9u IHdpdGggdmFsdWU6ICJVbmV4cGVjdGVkIGdhdGhlcmluZyBzdGF0ZTogY29tcGxldGUsIHdhcyBl eHBlY3RpbmcgZ2F0aGVyaW5nIgorUEFTUyBzZXRMb2NhbERlc2NyaXB0aW9uKCkgd2l0aCBubyB0 cmFuc3BvcnRzIHNob3VsZCBub3QgY2F1c2UgaWNlR2F0aGVyaW5nU3RhdGUgdG8gY2hhbmdlCitG QUlMIHNldExvY2FsRGVzY3JpcHRpb24ocmVvZmZlcikgd2l0aCBhIG5ldyB0cmFuc3BvcnQgc2hv dWxkIGNhdXNlIGljZUdhdGhlcmluZ1N0YXRlIHRvIGdvIHRvICJjaGVja2luZyIgYW5kIHRoZW4g ImNvbXBsZXRlIiBwcm9taXNlX3Rlc3Q6IFVuaGFuZGxlZCByZWplY3Rpb24gd2l0aCB2YWx1ZTog IlVuZXhwZWN0ZWQgZ2F0aGVyaW5nIHN0YXRlOiBjb21wbGV0ZSwgd2FzIGV4cGVjdGluZyBnYXRo ZXJpbmciCitQQVNTIHNSRCBkb2VzIG5vdCBjYXVzZSBJQ0UgZ2F0aGVyaW5nIHN0YXRlIGNoYW5n ZXMKK0ZBSUwgcmVuZWdvdGlhdGlvbiB0aGF0IGNsb3NlcyBhbGwgdHJhbnNwb3J0cyBzaG91bGQg cmVzdWx0IGluIElDRSBnYXRoZXJpbmcgc3RhdGUgIm5ldyIgcHJvbWlzZV90ZXN0OiBVbmhhbmRs ZWQgcmVqZWN0aW9uIHdpdGggdmFsdWU6ICJVbmV4cGVjdGVkIGdhdGhlcmluZyBzdGF0ZTogY29t cGxldGUsIHdhcyBleHBlY3RpbmcgZ2F0aGVyaW5nIgogRkFJTCBjb25uZWN0aW9uIHdpdGggb25l IGRhdGEgY2hhbm5lbCBzaG91bGQgZXZlbnR1YWxseSBoYXZlIGNvbm5lY3RlZCBjb25uZWN0aW9u IHN0YXRlIHVuZGVmaW5lZCBpcyBub3QgYW4gb2JqZWN0IChldmFsdWF0aW5nICdwYzIuc2N0cC50 cmFuc3BvcnQnKQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1pY2VHYXRoZXJpbmdTdGF0ZS5o dG1sIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMv UlRDUGVlckNvbm5lY3Rpb24taWNlR2F0aGVyaW5nU3RhdGUuaHRtbAppbmRleCA4NzBlNmFkNzJl YzM1NmVjZWZiY2E2ODg3OGRhNzMxZTM0N2VkMTdjLi45MzNhMjFjYzc1ZWZjYjE0OTAzYTU4NmQ5 OTE2Mjc4ZmQwYzlmODI2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1pY2VHYXRoZXJpbmdTdGF0 ZS5odG1sCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv d2VicnRjL1JUQ1BlZXJDb25uZWN0aW9uLWljZUdhdGhlcmluZ1N0YXRlLmh0bWwKQEAgLTg5LDgg Kzg5LDkgQEAKICAgICB0LmFkZF9jbGVhbnVwKCgpID0+IHBjMS5jbG9zZSgpKTsKICAgICBjb25z dCBwYzIgPSBuZXcgUlRDUGVlckNvbm5lY3Rpb24oKTsKICAgICB0LmFkZF9jbGVhbnVwKCgpID0+ IHBjMi5jbG9zZSgpKTsKKyAgICBwYzEuYWRkVHJhbnNjZWl2ZXIoJ2F1ZGlvJywgeyBkaXJlY3Rp b246ICdyZWN2b25seScgfSk7CiAgICAgYXdhaXQgaW5pdGlhbE9mZmVyQW5zd2VyV2l0aEljZUdh dGhlcmluZ1N0YXRlVHJhbnNpdGlvbnMoCi0gICAgICAgIHBjMSwgcGMyLCB7b2ZmZXJUb1JlY2Vp dmVBdWRpbzogdHJ1ZX0pOworICAgICAgICBwYzEsIHBjMik7CiAKICAgICBleHBlY3ROb01vcmVH YXRoZXJpbmdTdGF0ZUNoYW5nZXModCwgcGMxKTsKICAgICBleHBlY3ROb01vcmVHYXRoZXJpbmdT dGF0ZUNoYW5nZXModCwgcGMyKTsKQEAgLTExNyw4ICsxMTgsOSBAQAogICAgIHQuYWRkX2NsZWFu dXAoKCkgPT4gcGMxLmNsb3NlKCkpOwogICAgIGNvbnN0IHBjMiA9IG5ldyBSVENQZWVyQ29ubmVj dGlvbigpOwogICAgIHQuYWRkX2NsZWFudXAoKCkgPT4gcGMyLmNsb3NlKCkpOworICAgIHBjMS5h ZGRUcmFuc2NlaXZlcignYXVkaW8nLCB7IGRpcmVjdGlvbjogJ3JlY3Zvbmx5JyB9KTsKICAgICBh d2FpdCBpbml0aWFsT2ZmZXJBbnN3ZXJXaXRoSWNlR2F0aGVyaW5nU3RhdGVUcmFuc2l0aW9ucygK LSAgICAgICAgcGMxLCBwYzIsIHtvZmZlclRvUmVjZWl2ZUF1ZGlvOnRydWV9KTsKKyAgICAgICAg cGMxLCBwYzIpOwogICAgIGF3YWl0IHBjMS5zZXRMb2NhbERlc2NyaXB0aW9uKGF3YWl0IHBjMS5j cmVhdGVPZmZlcih7aWNlUmVzdGFydDogdHJ1ZX0pKTsKICAgICBhd2FpdCBpY2VHYXRoZXJpbmdT dGF0ZVRyYW5zaXRpb25zKHBjMSwgJ2dhdGhlcmluZycsICdjb21wbGV0ZScpOwogICB9LCAnc2V0 TG9jYWxEZXNjcmlwdGlvbihyZW9mZmVyKSB3aXRoIGEgbmV3IHRyYW5zcG9ydCBzaG91bGQgY2F1 c2UgaWNlR2F0aGVyaW5nU3RhdGUgdG8gZ28gdG8gImNoZWNraW5nIiBhbmQgdGhlbiAiY29tcGxl dGUiJyk7CkBAIC0xMjksNyArMTMxLDggQEAKICAgICBjb25zdCBwYzIgPSBuZXcgUlRDUGVlckNv bm5lY3Rpb24oKTsKICAgICB0LmFkZF9jbGVhbnVwKCgpID0+IHBjMi5jbG9zZSgpKTsKICAgICBl eHBlY3ROb01vcmVHYXRoZXJpbmdTdGF0ZUNoYW5nZXModCwgcGMyKTsKLSAgICBjb25zdCBvZmZl ciA9IGF3YWl0IHBjMS5jcmVhdGVPZmZlcih7b2ZmZXJUb1JlY2VpdmVBdWRpbzogdHJ1ZX0pOwor ICAgIHBjMS5hZGRUcmFuc2NlaXZlcignYXVkaW8nLCB7IGRpcmVjdGlvbjogJ3JlY3Zvbmx5JyB9 KTsKKyAgICBjb25zdCBvZmZlciA9IGF3YWl0IHBjMS5jcmVhdGVPZmZlcigpOwogICAgIGF3YWl0 IHBjMi5zZXRSZW1vdGVEZXNjcmlwdGlvbihvZmZlcik7CiAgICAgYXdhaXQgcGMyLnNldFJlbW90 ZURlc2NyaXB0aW9uKG9mZmVyKTsKICAgICBhd2FpdCBwYzIuc2V0UmVtb3RlRGVzY3JpcHRpb24o e3R5cGU6ICdyb2xsYmFjayd9KTsKQEAgLTE0MSw4ICsxNDQsOSBAQAogICAgIHQuYWRkX2NsZWFu dXAoKCkgPT4gcGMxLmNsb3NlKCkpOwogICAgIGNvbnN0IHBjMiA9IG5ldyBSVENQZWVyQ29ubmVj dGlvbigpOwogICAgIHQuYWRkX2NsZWFudXAoKCkgPT4gcGMyLmNsb3NlKCkpOworICAgIHBjMS5h ZGRUcmFuc2NlaXZlcignYXVkaW8nLCB7IGRpcmVjdGlvbjogJ3JlY3Zvbmx5JyB9KTsKICAgICBh d2FpdCBpbml0aWFsT2ZmZXJBbnN3ZXJXaXRoSWNlR2F0aGVyaW5nU3RhdGVUcmFuc2l0aW9ucygK LSAgICAgICAgcGMxLCBwYzIsIHtvZmZlclRvUmVjZWl2ZUF1ZGlvOiB0cnVlfSk7CisgICAgICAg IHBjMSwgcGMyKTsKIAogICAgIGNvbnN0IHBjMXdhaXRlciA9IGljZUdhdGhlcmluZ1N0YXRlVHJh bnNpdGlvbnMocGMxLCAnbmV3Jyk7CiAgICAgY29uc3QgcGMyd2FpdGVyID0gaWNlR2F0aGVyaW5n U3RhdGVUcmFuc2l0aW9ucyhwYzIsICduZXcnKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2lt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJDb25uZWN0aW9uLXNl dExvY2FsRGVzY3JpcHRpb24tYW5zd2VyLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9y dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJDb25uZWN0aW9uLXNldExv Y2FsRGVzY3JpcHRpb24tYW5zd2VyLWV4cGVjdGVkLnR4dAppbmRleCAxY2U2ZWQ5ZmQ5ZGUxN2I4 NTRkYmU0MTUwZTBlYTIxNTgwOGVkNjZhLi4wZTIzODBmMDMyZjdmYTkxMzljNjYwZjVlNzE0NmY5 N2IzMzE0OTMyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1zZXRMb2NhbERlc2NyaXB0aW9uLWFu c3dlci1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tc2V0TG9jYWxEZXNjcmlwdGlvbi1h bnN3ZXItZXhwZWN0ZWQudHh0CkBAIC0xLDcgKzEsNyBAQAogCiBQQVNTIHNldExvY2FsRGVzY3Jp cHRpb24oKSB3aXRoIHZhbGlkIGFuc3dlciBzaG91bGQgc3VjY2VlZAogRkFJTCBzZXRMb2NhbERl c2NyaXB0aW9uKCkgd2l0aCB0eXBlIGFuc3dlciBhbmQgbnVsbCBzZHAgc2hvdWxkIHVzZSBsYXN0 QW5zd2VyIGdlbmVyYXRlZCBmcm9tIGNyZWF0ZUFuc3dlciBwcm9taXNlX3Rlc3Q6IFVuaGFuZGxl ZCByZWplY3Rpb24gd2l0aCB2YWx1ZTogb2JqZWN0ICJPcGVyYXRpb25FcnJvcjogRXhwZWN0IGxp bmU6IHY9IgotRkFJTCBzZXRMb2NhbERlc2NyaXB0aW9uKCkgd2l0aCBhbnN3ZXIgbm90IGNyZWF0 ZWQgYnkgb3duIGNyZWF0ZUFuc3dlcigpIHNob3VsZCByZWplY3Qgd2l0aCBJbnZhbGlkTW9kaWZp Y2F0aW9uRXJyb3IgcHJvbWlzZV9yZWplY3RzX2RvbTogZnVuY3Rpb24gImZ1bmN0aW9uICgpIHsg dGhyb3cgZSB9IiB0aHJldyBvYmplY3QgIk9wZXJhdGlvbkVycm9yOiBGYWlsZWQgdG8gc2V0IGxv Y2FsIGFuc3dlciBzZHA6IEZhaWxlZCB0byBhcHBseSB0aGUgZGVzY3JpcHRpb24gZm9yIG09IHNl Y3Rpb24gd2l0aCBtaWQ9JzAnOiBMb2NhbCBmaW5nZXJwcmludCBkb2VzIG5vdCBtYXRjaCBpZGVu dGl0eS4gRXhwZWN0ZWQ6IHNoYS0yNTYgNUE6OTA6RTY6NzY6MkI6Njg6QkE6MDI6NTc6RkM6MEU6 Mzc6QjY6QkY6QTc6MUU6Nzk6NTg6MTI6RDQ6NkM6MEQ6ODQ6Q0I6MDg6RDI6Rjc6QkI6MDE6OUU6 Qjk6Q0IgR290OiBzaGEtMjU2IDA1OjY4OkQ0Ojc5OkQ5OjQ3OjcyOjEwOkYxOjJBOkY4OjgxOkM3 OkMwOkM1OjI4OjRDOjlCOkI5OjkwOjlBOjYwOjgxOkU2OjJDOjMxOjM1OkU1OjlEOkM3OkUyOjBB IiB0aGF0IGlzIG5vdCBhIERPTUV4Y2VwdGlvbiBJbnZhbGlkTW9kaWZpY2F0aW9uRXJyb3I6IHBy b3BlcnR5ICJjb2RlIiBpcyBlcXVhbCB0byAwLCBleHBlY3RlZCAxMworRkFJTCBzZXRMb2NhbERl c2NyaXB0aW9uKCkgd2l0aCBhbnN3ZXIgbm90IGNyZWF0ZWQgYnkgb3duIGNyZWF0ZUFuc3dlcigp IHNob3VsZCByZWplY3Qgd2l0aCBJbnZhbGlkTW9kaWZpY2F0aW9uRXJyb3IgcHJvbWlzZV9yZWpl Y3RzX2RvbTogZnVuY3Rpb24gImZ1bmN0aW9uICgpIHsgdGhyb3cgZSB9IiB0aHJldyBvYmplY3Qg Ik9wZXJhdGlvbkVycm9yOiBGYWlsZWQgdG8gc2V0IGxvY2FsIGFuc3dlciBzZHA6IEZhaWxlZCB0 byBhcHBseSB0aGUgZGVzY3JpcHRpb24gZm9yIG09IHNlY3Rpb24gd2l0aCBtaWQ9JzAnOiBMb2Nh bCBmaW5nZXJwcmludCBkb2VzIG5vdCBtYXRjaCBpZGVudGl0eS4gRXhwZWN0ZWQ6IHNoYS0yNTYg Rjk6ODM6Nzc6Rjk6QjE6Mjk6NDc6QkI6RUU6ODg6OTQ6RTk6OTQ6RjQ6RUM6QTc6MjE6NUE6OUQ6 NEM6Mjk6Q0E6QzE6NUI6MjU6RTM6NDc6OEQ6RUI6Nzg6NUQ6QUQgR290OiBzaGEtMjU2IDlCOjcy Ojk5OkFCOjZDOjlFOjVGOkNBOjhFOjNBOjc2OjVFOkYwOjVBOkI3OjZCOjJEOjNFOjAzOjgxOjlC OjcxOkIxOjkwOjM0OjkzOjlBOkU2OjM1OjlFOjM3OjVFIiB0aGF0IGlzIG5vdCBhIERPTUV4Y2Vw dGlvbiBJbnZhbGlkTW9kaWZpY2F0aW9uRXJyb3I6IHByb3BlcnR5ICJjb2RlIiBpcyBlcXVhbCB0 byAwLCBleHBlY3RlZCAxMwogRkFJTCBDYWxsaW5nIHNldExvY2FsRGVzY3JpcHRpb24oYW5zd2Vy KSBmcm9tIHN0YWJsZSBzdGF0ZSBzaG91bGQgcmVqZWN0IHdpdGggSW52YWxpZE1vZGlmaWNhdGlv bkVycm9yIHByb21pc2VfcmVqZWN0c19kb206IGZ1bmN0aW9uICJmdW5jdGlvbiAoKSB7IHRocm93 IGUgfSIgdGhyZXcgb2JqZWN0ICJJbnZhbGlkU3RhdGVFcnJvcjogRmFpbGVkIHRvIHNldCBsb2Nh bCBhbnN3ZXIgc2RwOiBubyBwZW5kaW5nIHJlbW90ZSBkZXNjcmlwdGlvbi4iIHRoYXQgaXMgbm90 IGEgRE9NRXhjZXB0aW9uIEludmFsaWRNb2RpZmljYXRpb25FcnJvcjogcHJvcGVydHkgImNvZGUi IGlzIGVxdWFsIHRvIDExLCBleHBlY3RlZCAxMwogRkFJTCBDYWxsaW5nIHNldExvY2FsRGVzY3Jp cHRpb24oYW5zd2VyKSBmcm9tIGhhdmUtbG9jYWwtb2ZmZXIgc3RhdGUgc2hvdWxkIHJlamVjdCB3 aXRoIEludmFsaWRNb2RpZmljYXRpb25FcnJvciBwcm9taXNlX3JlamVjdHNfZG9tOiBmdW5jdGlv biAiZnVuY3Rpb24gKCkgeyB0aHJvdyBlIH0iIHRocmV3IG9iamVjdCAiSW52YWxpZFN0YXRlRXJy b3I6IEZhaWxlZCB0byBzZXQgbG9jYWwgYW5zd2VyIHNkcDogbm8gcGVuZGluZyByZW1vdGUgZGVz Y3JpcHRpb24uIiB0aGF0IGlzIG5vdCBhIERPTUV4Y2VwdGlvbiBJbnZhbGlkTW9kaWZpY2F0aW9u RXJyb3I6IHByb3BlcnR5ICJjb2RlIiBpcyBlcXVhbCB0byAxMSwgZXhwZWN0ZWQgMTMKIFBBU1Mg U2V0dGluZyBwcmV2aW91c2x5IGdlbmVyYXRlZCBhbnN3ZXIgYWZ0ZXIgYSBjYWxsIHRvIGNyZWF0 ZU9mZmVyIHNob3VsZCB3b3JrCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1zZXRMb2NhbERlc2Ny aXB0aW9uLWFuc3dlci5odG1sIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tc2V0TG9jYWxEZXNjcmlwdGlvbi1hbnN3 ZXIuaHRtbAppbmRleCA4MjFlZTFkMGIxNWNlMTFhZGI5YjVjNjg4ZWRhNjNiYWUwMmU0MGRkLi5h NmEwMjEwOGYxMmI0YTJlZWUzZTMyMzVlMjVjNDNjYWY2N2IxMWQ3IDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29u bmVjdGlvbi1zZXRMb2NhbERlc2NyaXB0aW9uLWFuc3dlci5odG1sCisrKyBiL0xheW91dFRlc3Rz L2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJDb25uZWN0aW9u LXNldExvY2FsRGVzY3JpcHRpb24tYW5zd2VyLmh0bWwKQEAgLTE3NywxMSArMTc3LDEzIEBACiAg ICAgY29uc3QgcGMyID0gbmV3IFJUQ1BlZXJDb25uZWN0aW9uKCk7CiAgICAgdC5hZGRfY2xlYW51 cCgoKSA9PiBwYzIuY2xvc2UoKSk7CiAKLSAgICBjb25zdCBvZmZlciA9IGF3YWl0IHBjMS5jcmVh dGVPZmZlcih7b2ZmZXJUb1JlY2VpdmVBdWRpbzogdHJ1ZX0pOworICAgIHBjMS5hZGRUcmFuc2Nl aXZlcignYXVkaW8nLCB7IGRpcmVjdGlvbjogJ3JlY3Zvbmx5JyB9KTsKKyAgICBjb25zdCBvZmZl ciA9IGF3YWl0IHBjMS5jcmVhdGVPZmZlcigpOwogICAgIGF3YWl0IHBjMi5zZXRSZW1vdGVEZXNj cmlwdGlvbihvZmZlcik7CiAgICAgY29uc3QgYW5zd2VyID0gYXdhaXQgcGMyLmNyZWF0ZUFuc3dl cigpOyAvLyBbW0xhc3RBbnN3ZXJdXSBzbG90IHNldAogICAgIGF3YWl0IHBjMi5zZXRSZW1vdGVE ZXNjcmlwdGlvbih7dHlwZTogInJvbGxiYWNrIn0pOwotICAgIGF3YWl0IHBjMi5jcmVhdGVPZmZl cih7b2ZmZXJUb1JlY2VpdmVWaWRlbzogdHJ1ZX0pOyAvLyBbW0xhc3RPZmZlcl1dIHNsb3Qgc2V0 CisgICAgcGMyLmFkZFRyYW5zY2VpdmVyKCd2aWRlbycsIHsgZGlyZWN0aW9uOiAncmVjdm9ubHkn IH0pOworICAgIGF3YWl0IHBjMi5jcmVhdGVPZmZlcigpOyAvLyBbW0xhc3RPZmZlcl1dIHNsb3Qg c2V0CiAgICAgYXdhaXQgcGMyLnNldFJlbW90ZURlc2NyaXB0aW9uKG9mZmVyKTsKICAgICBhd2Fp dCBwYzIuc2V0TG9jYWxEZXNjcmlwdGlvbihhbnN3ZXIpOyAvLyBTaG91bGQgY2hlY2sgYWdhaW5z dCBbW0xhc3RBbnN3ZXJdXSwgbm90IFtbTGFzdE9mZmVyXV0KICAgfSwgIlNldHRpbmcgcHJldmlv dXNseSBnZW5lcmF0ZWQgYW5zd2VyIGFmdGVyIGEgY2FsbCB0byBjcmVhdGVPZmZlciBzaG91bGQg d29yayIpOwpAQCAtMTkyLDcgKzE5NCw4IEBACiAgICAgY29uc3QgcGMyID0gbmV3IFJUQ1BlZXJD b25uZWN0aW9uKCk7CiAgICAgdC5hZGRfY2xlYW51cCgoKSA9PiBwYzIuY2xvc2UoKSk7CiAKLSAg ICBhd2FpdCBwYzIuc2V0UmVtb3RlRGVzY3JpcHRpb24oYXdhaXQgcGMxLmNyZWF0ZU9mZmVyKHtv ZmZlclRvUmVjZWl2ZUF1ZGlvOiB0cnVlfSkpOworICAgIHBjMS5hZGRUcmFuc2NlaXZlcignYXVk aW8nLCB7IGRpcmVjdGlvbjogJ3JlY3Zvbmx5JyB9KTsKKyAgICBhd2FpdCBwYzIuc2V0UmVtb3Rl RGVzY3JpcHRpb24oYXdhaXQgcGMxLmNyZWF0ZU9mZmVyKCkpOwogICAgIGNvbnN0IGFuc3dlciA9 IGF3YWl0IHBjMi5jcmVhdGVBbnN3ZXIoKTsKICAgICBjb25zdCBzbGRQcm9taXNlID0gcGMyLnNl dExvY2FsRGVzY3JpcHRpb24oYW5zd2VyKTsKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tc2V0 TG9jYWxEZXNjcmlwdGlvbi1vZmZlci1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1zZXRMb2Nh bERlc2NyaXB0aW9uLW9mZmVyLWV4cGVjdGVkLnR4dAppbmRleCBjMmI4OWI1NzQ0MGQ3YTcyYjJj MTlkNzY3N2YwMmE2YjQyNjAzN2RjLi5lMGQzYjZkZmNiYzYxZTc2NDRiYzg3ZGNmZjY0N2Q1MjA4 ZWYyZTY4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1zZXRMb2NhbERlc2NyaXB0aW9uLW9mZmVy LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1zZXRMb2NhbERlc2NyaXB0aW9uLW9mZmVy LWV4cGVjdGVkLnR4dApAQCAtMSwxMCArMSwxMCBAQAogCiBQQVNTIHNldExvY2FsRGVzY3JpcHRp b24gd2l0aCB2YWxpZCBvZmZlciBzaG91bGQgc3VjY2VlZAogRkFJTCBzZXRMb2NhbERlc2NyaXB0 aW9uIHdpdGggdHlwZSBvZmZlciBhbmQgbnVsbCBzZHAgc2hvdWxkIHVzZSBsYXN0T2ZmZXIgZ2Vu ZXJhdGVkIGZyb20gY3JlYXRlT2ZmZXIgcHJvbWlzZV90ZXN0OiBVbmhhbmRsZWQgcmVqZWN0aW9u IHdpdGggdmFsdWU6IG9iamVjdCAiT3BlcmF0aW9uRXJyb3I6IEV4cGVjdCBsaW5lOiB2PSIKLUZB SUwgc2V0TG9jYWxEZXNjcmlwdGlvbigpIHdpdGggb2ZmZXIgbm90IGNyZWF0ZWQgYnkgb3duIGNy ZWF0ZU9mZmVyKCkgc2hvdWxkIHJlamVjdCB3aXRoIEludmFsaWRNb2RpZmljYXRpb25FcnJvciBw cm9taXNlX3JlamVjdHNfZG9tOiBmdW5jdGlvbiAiZnVuY3Rpb24gKCkgeyB0aHJvdyBlIH0iIHRo cmV3IG9iamVjdCAiT3BlcmF0aW9uRXJyb3I6IEZhaWxlZCB0byBzZXQgbG9jYWwgb2ZmZXIgc2Rw OiBGYWlsZWQgdG8gYXBwbHkgdGhlIGRlc2NyaXB0aW9uIGZvciBtPSBzZWN0aW9uIHdpdGggbWlk PScwJzogTG9jYWwgZmluZ2VycHJpbnQgZG9lcyBub3QgbWF0Y2ggaWRlbnRpdHkuIEV4cGVjdGVk OiBzaGEtMjU2IENCOkREOjZDOjE2OkMzOkVCOjJCOjkxOjRCOjQ1OjU1OjRGOkMxOjQ1OkRDOkJG OjUzOjdDOkY0OjRCOkY1OjA3OjgwOjE4OjMxOjhBOjUxOjNBOjM1OjBFOjM2OjRDIEdvdDogc2hh LTI1NiBERDpEOTpFMjpGMzozMzo2ODo5QTo0QzoxRDpGRDpCRTpDQTo0RTowRjozNTo3ODpGQzpC NToyQTowQTpDODpFNTpDRDpFMjo5Mzo3QjpDNzo3QTo5OTpDMjozMTo2MyIgdGhhdCBpcyBub3Qg YSBET01FeGNlcHRpb24gSW52YWxpZE1vZGlmaWNhdGlvbkVycm9yOiBwcm9wZXJ0eSAiY29kZSIg aXMgZXF1YWwgdG8gMCwgZXhwZWN0ZWQgMTMKK0ZBSUwgc2V0TG9jYWxEZXNjcmlwdGlvbigpIHdp dGggb2ZmZXIgbm90IGNyZWF0ZWQgYnkgb3duIGNyZWF0ZU9mZmVyKCkgc2hvdWxkIHJlamVjdCB3 aXRoIEludmFsaWRNb2RpZmljYXRpb25FcnJvciBwcm9taXNlX3JlamVjdHNfZG9tOiBmdW5jdGlv biAiZnVuY3Rpb24gKCkgeyB0aHJvdyBlIH0iIHRocmV3IG9iamVjdCAiT3BlcmF0aW9uRXJyb3I6 IEZhaWxlZCB0byBzZXQgbG9jYWwgb2ZmZXIgc2RwOiBGYWlsZWQgdG8gYXBwbHkgdGhlIGRlc2Ny aXB0aW9uIGZvciBtPSBzZWN0aW9uIHdpdGggbWlkPScwJzogTG9jYWwgZmluZ2VycHJpbnQgZG9l cyBub3QgbWF0Y2ggaWRlbnRpdHkuIEV4cGVjdGVkOiBzaGEtMjU2IEQ4OjYzOjc0OkZDOjkxOkFC OkQ3OjlBOjUwOjJCOkUyOjZGOjg4OkQxOjQyOjExOkE1OkI0OjExOkE2OkNDOjExOkE4OjA3OkZB OjU0OkIyOkM5OjQ2OkM0Ojg0OjhEIEdvdDogc2hhLTI1NiBCQToyNTpDQTpFMzo0QTowQTo4MDoz QzpBQjo0NTowRDo5NjowNDpDRDo2RTo2RTpFMDpFOTpEMjozOTpEQTo3Qzo2QToyMTpCMDpGRTo1 Qjo0MDpERjpGODozRDoxQyIgdGhhdCBpcyBub3QgYSBET01FeGNlcHRpb24gSW52YWxpZE1vZGlm aWNhdGlvbkVycm9yOiBwcm9wZXJ0eSAiY29kZSIgaXMgZXF1YWwgdG8gMCwgZXhwZWN0ZWQgMTMK IEZBSUwgU2V0IGNyZWF0ZWQgb2ZmZXIgb3RoZXIgdGhhbiBsYXN0IG9mZmVyIHNob3VsZCByZWpl Y3Qgd2l0aCBJbnZhbGlkTW9kaWZpY2F0aW9uRXJyb3IgYXNzZXJ0X3VucmVhY2hlZDogU2hvdWxk IGhhdmUgcmVqZWN0ZWQ6IHVuZGVmaW5lZCBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKIFBBU1Mg Q3JlYXRpbmcgYW5kIHNldHRpbmcgb2ZmZXIgbXVsdGlwbGUgdGltZXMgc2hvdWxkIHN1Y2NlZWQK IFBBU1MgU2V0dGluZyBwcmV2aW91c2x5IGdlbmVyYXRlZCBvZmZlciBhZnRlciBhIGNhbGwgdG8g Y3JlYXRlQW5zd2VyIHNob3VsZCB3b3JrCi1GQUlMIE5lZ290aWF0aW9uIHdvcmtzIHdoZW4gdGhl cmUgaGFzIGJlZW4gYSByZXBlYXRlZCBzZXRMb2NhbERlc2NyaXB0aW9uKG9mZmVyKSBhc3NlcnRf ZXF1YWxzOiBleHBlY3RlZCAxIGJ1dCBnb3QgMAorUEFTUyBOZWdvdGlhdGlvbiB3b3JrcyB3aGVu IHRoZXJlIGhhcyBiZWVuIGEgcmVwZWF0ZWQgc2V0TG9jYWxEZXNjcmlwdGlvbihvZmZlcikKIEZB SUwgc2V0TG9jYWxEZXNjcmlwdGlvbihvZmZlcikgc2hvdWxkIHVwZGF0ZSBpbnRlcm5hbCBzdGF0 ZSB3aXRoIGEgcXVldWVkIHRhc2ssIGluIHRoZSByaWdodCBvcmRlciBhc3NlcnRfZXF1YWxzOiBw ZW5kaW5nUmVtb3RlRGVzY3JpcHRpb24gc2hvdWxkIG5ldmVyIGJlIHNldCBkdWUgdG8gc0xEIGV4 cGVjdGVkIG51bGwgYnV0IGdvdCBvYmplY3QgIltvYmplY3QgUlRDU2Vzc2lvbkRlc2NyaXB0aW9u XSIKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tc2V0TG9jYWxEZXNjcmlwdGlvbi1vZmZlci5o dG1sIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMv UlRDUGVlckNvbm5lY3Rpb24tc2V0TG9jYWxEZXNjcmlwdGlvbi1vZmZlci5odG1sCmluZGV4IDdh ZjcxNTBkZjYwOGI2MGZhMGUxZDJhZDAxZGI5Y2Q0ZGFlZmIxMjIuLmM0ZjQ3NmIwMDlkNTA0Yjc4 MDE2ODgzYmRmYTY4MDM4MDhiNDNhN2IgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJDb25uZWN0aW9uLXNldExvY2Fs RGVzY3JpcHRpb24tb2ZmZXIuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1zZXRMb2NhbERlc2NyaXB0 aW9uLW9mZmVyLmh0bWwKQEAgLTE2Myw4ICsxNjMsMTAgQEAKICAgICBjb25zdCBwYzIgPSBuZXcg UlRDUGVlckNvbm5lY3Rpb24oKTsKICAgICB0LmFkZF9jbGVhbnVwKCgpID0+IHBjMi5jbG9zZSgp KTsKIAotICAgIGNvbnN0IG9mZmVyID0gYXdhaXQgcGMxLmNyZWF0ZU9mZmVyKHtvZmZlclRvUmVj ZWl2ZUF1ZGlvOiB0cnVlfSk7IC8vIFtbTGFzdE9mZmVyXV0gc2V0Ci0gICAgY29uc3Qgb2ZmZXIy ID0gYXdhaXQgcGMyLmNyZWF0ZU9mZmVyKHtvZmZlclRvUmVjZWl2ZVZpZGVvOiB0cnVlfSk7Cisg ICAgcGMxLmFkZFRyYW5zY2VpdmVyKCdhdWRpbycsIHsgZGlyZWN0aW9uOiAncmVjdm9ubHknIH0p OworICAgIGNvbnN0IG9mZmVyID0gYXdhaXQgcGMxLmNyZWF0ZU9mZmVyKCk7IC8vIFtbTGFzdE9m ZmVyXV0gc2V0CisgICAgcGMyLmFkZFRyYW5zY2VpdmVyKCd2aWRlbycsIHsgZGlyZWN0aW9uOiAn cmVjdm9ubHknIH0pOworICAgIGNvbnN0IG9mZmVyMiA9IGF3YWl0IHBjMi5jcmVhdGVPZmZlcigp OwogICAgIGF3YWl0IHBjMS5zZXRSZW1vdGVEZXNjcmlwdGlvbihvZmZlcjIpOwogICAgIGF3YWl0 IHBjMS5jcmVhdGVBbnN3ZXIoKTsgLy8gW1tMYXN0QW5zd2VyXV0gc2V0CiAgICAgYXdhaXQgcGMx LnNldFJlbW90ZURlc2NyaXB0aW9uKHt0eXBlOiAicm9sbGJhY2sifSk7CkBAIC0xNzcsNyArMTc5 LDggQEAKICAgICBjb25zdCBwYzIgPSBuZXcgUlRDUGVlckNvbm5lY3Rpb24oKTsKICAgICB0LmFk ZF9jbGVhbnVwKCgpID0+IHBjMi5jbG9zZSgpKTsKIAotICAgIGF3YWl0IHBjMS5zZXRMb2NhbERl c2NyaXB0aW9uKGF3YWl0IHBjMS5jcmVhdGVPZmZlcih7b2ZmZXJUb1JlY2VpdmVBdWRpbzogdHJ1 ZX0pKTsKKyAgICBwYzEuYWRkVHJhbnNjZWl2ZXIoJ2F1ZGlvJywgeyBkaXJlY3Rpb246ICdyZWN2 b25seScgfSk7CisgICAgYXdhaXQgcGMxLnNldExvY2FsRGVzY3JpcHRpb24oYXdhaXQgcGMxLmNy ZWF0ZU9mZmVyKCkpOwogCiAgICAgY29uc3Qgb2ZmZXIgPSBhd2FpdCBwYzEuY3JlYXRlT2ZmZXIo KTsKICAgICBhd2FpdCBwYzEuc2V0TG9jYWxEZXNjcmlwdGlvbihvZmZlcik7CkBAIC0xOTYsNyAr MTk5LDggQEAKICAgICBjb25zdCBwYyA9IG5ldyBSVENQZWVyQ29ubmVjdGlvbigpOwogICAgIHQu YWRkX2NsZWFudXAoKCkgPT4gcGMuY2xvc2UoKSk7CiAKLSAgICBjb25zdCBzbGRQcm9taXNlID0g cGMuc2V0TG9jYWxEZXNjcmlwdGlvbihhd2FpdCBwYy5jcmVhdGVPZmZlcih7b2ZmZXJUb1JlY2Vp dmVBdWRpbzogdHJ1ZX0pKTsKKyAgICBwYy5hZGRUcmFuc2NlaXZlcignYXVkaW8nLCB7IGRpcmVj dGlvbjogJ3JlY3Zvbmx5JyB9KTsKKyAgICBjb25zdCBzbGRQcm9taXNlID0gcGMuc2V0TG9jYWxE ZXNjcmlwdGlvbihhd2FpdCBwYy5jcmVhdGVPZmZlcigpKTsKIAogICAgIGFzc2VydF9lcXVhbHMo cGMuc2lnbmFsaW5nU3RhdGUsICJzdGFibGUiLCAic2lnbmFsaW5nU3RhdGUgc2hvdWxkIG5vdCBi ZSBzZXQgc3luY2hyb25vdXNseSBhZnRlciBhIGNhbGwgdG8gc0xEIik7CiAKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JUQ1Bl ZXJDb25uZWN0aW9uLXNldExvY2FsRGVzY3JpcHRpb24tcm9sbGJhY2suaHRtbCBiL0xheW91dFRl c3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJDb25uZWN0 aW9uLXNldExvY2FsRGVzY3JpcHRpb24tcm9sbGJhY2suaHRtbAppbmRleCBlMTYwN2I2MzgzNjY3 MDc4NDFkNzQzNTJkOWU5ZWUxMGQyMTg1MDRhLi4wNmJiY2Y5YjEwYjU4ZTdlZTc1NWUzMTgzYzcx NzRjZWIzMmYyYzI0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1zZXRMb2NhbERlc2NyaXB0aW9u LXJvbGxiYWNrLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tc2V0TG9jYWxEZXNjcmlwdGlvbi1yb2xs YmFjay5odG1sCkBAIC0xMzIsNyArMTMyLDggQEAKICAgICBjb25zdCBwYyA9IG5ldyBSVENQZWVy Q29ubmVjdGlvbigpOwogICAgIHQuYWRkX2NsZWFudXAoKCkgPT4gcGMuY2xvc2UoKSk7CiAKLSAg ICBhd2FpdCBwYy5zZXRMb2NhbERlc2NyaXB0aW9uKGF3YWl0IHBjLmNyZWF0ZU9mZmVyKHtvZmZl clRvUmVjZWl2ZUF1ZGlvOiB0cnVlfSkpOworICAgIHBjLmFkZFRyYW5zY2VpdmVyKCdhdWRpbycs IHsgZGlyZWN0aW9uOiAncmVjdm9ubHknIH0pOworICAgIGF3YWl0IHBjLnNldExvY2FsRGVzY3Jp cHRpb24oYXdhaXQgcGMuY3JlYXRlT2ZmZXIoKSk7CiAgICAgY29uc3Qgc2xkUHJvbWlzZSA9IHBj LnNldExvY2FsRGVzY3JpcHRpb24oe3R5cGU6ICJyb2xsYmFjayJ9KTsKIAogICAgIGFzc2VydF9l cXVhbHMocGMuc2lnbmFsaW5nU3RhdGUsICJoYXZlLWxvY2FsLW9mZmVyIiwgInNpZ25hbGluZ1N0 YXRlIHNob3VsZCBub3QgYmUgc2V0IHN5bmNocm9ub3VzbHkgYWZ0ZXIgYSBjYWxsIHRvIHNMRCIp OwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tc2V0UmVtb3RlRGVzY3JpcHRpb24tb2ZmZXIuaHRt bCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JU Q1BlZXJDb25uZWN0aW9uLXNldFJlbW90ZURlc2NyaXB0aW9uLW9mZmVyLmh0bWwKaW5kZXggYTUw ZTk2OTYzNzI5NGFlYzhlZWFmZTY4MmRhNWQyNThlMmE5MGRlNS4uMjQ3ZDZlMGQ0OWVjNjQ0N2Nk ZTlkNGU3OTEyN2RhN2Y5MTM2Y2UzOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tc2V0UmVtb3Rl RGVzY3JpcHRpb24tb2ZmZXIuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi1zZXRSZW1vdGVEZXNjcmlw dGlvbi1vZmZlci5odG1sCkBAIC0xOTMsNyArMTkzLDggQEAKICAgICBjb25zdCBwYzIgPSBuZXcg UlRDUGVlckNvbm5lY3Rpb24oKTsKICAgICB0LmFkZF9jbGVhbnVwKCgpID0+IHBjMi5jbG9zZSgp KTsKIAotICAgIGNvbnN0IHNyZFByb21pc2UgPSBwYzIuc2V0UmVtb3RlRGVzY3JpcHRpb24oYXdh aXQgcGMxLmNyZWF0ZU9mZmVyKHtvZmZlclRvUmVjZWl2ZUF1ZGlvOiB0cnVlfSkpOworICAgIHBj MS5hZGRUcmFuc2NlaXZlcignYXVkaW8nLCB7IGRpcmVjdGlvbjogJ3JlY3Zvbmx5JyB9KTsKKyAg ICBjb25zdCBzcmRQcm9taXNlID0gcGMyLnNldFJlbW90ZURlc2NyaXB0aW9uKGF3YWl0IHBjMS5j cmVhdGVPZmZlcigpKTsKIAogICAgIGFzc2VydF9lcXVhbHMocGMyLnNpZ25hbGluZ1N0YXRlLCAi c3RhYmxlIiwgInNpZ25hbGluZ1N0YXRlIHNob3VsZCBub3QgYmUgc2V0IHN5bmNocm9ub3VzbHkg YWZ0ZXIgYSBjYWxsIHRvIHNSRCIpOwogCkBAIC0yMjIsMTAgKzIyMywxMiBAQAogICAgIGNvbnN0 IHBjMiA9IG5ldyBSVENQZWVyQ29ubmVjdGlvbigpOwogICAgIHQuYWRkX2NsZWFudXAoKCkgPT4g cGMyLmNsb3NlKCkpOwogCi0gICAgYXdhaXQgcGMyLnNldExvY2FsRGVzY3JpcHRpb24oYXdhaXQg cGMyLmNyZWF0ZU9mZmVyKHtvZmZlclRvUmVjZWl2ZUF1ZGlvOiB0cnVlfSkpOworICAgIHBjMi5h ZGRUcmFuc2NlaXZlcignYXVkaW8nLCB7IGRpcmVjdGlvbjogJ3JlY3Zvbmx5JyB9KTsKKyAgICBh d2FpdCBwYzIuc2V0TG9jYWxEZXNjcmlwdGlvbihhd2FpdCBwYzIuY3JlYXRlT2ZmZXIoKSk7CiAK ICAgICAvLyBJbXBsaWNpdCByb2xsYmFjayEKLSAgICBjb25zdCBzcmRQcm9taXNlID0gcGMyLnNl dFJlbW90ZURlc2NyaXB0aW9uKGF3YWl0IHBjMS5jcmVhdGVPZmZlcih7b2ZmZXJUb1JlY2VpdmVB dWRpbzogdHJ1ZX0pKTsKKyAgICBwYzEuYWRkVHJhbnNjZWl2ZXIoJ2F1ZGlvJywgeyBkaXJlY3Rp b246ICdyZWN2b25seScgfSk7CisgICAgY29uc3Qgc3JkUHJvbWlzZSA9IHBjMi5zZXRSZW1vdGVE ZXNjcmlwdGlvbihhd2FpdCBwYzEuY3JlYXRlT2ZmZXIoKSk7CiAKICAgICBhc3NlcnRfZXF1YWxz KHBjMi5zaWduYWxpbmdTdGF0ZSwgImhhdmUtbG9jYWwtb2ZmZXIiLCAic2lnbmFsaW5nU3RhdGUg c2hvdWxkIG5vdCBiZSBzZXQgc3luY2hyb25vdXNseSBhZnRlciBhIGNhbGwgdG8gc1JEIik7CiAK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv d2VicnRjL1JUQ1BlZXJDb25uZWN0aW9uLXNldFJlbW90ZURlc2NyaXB0aW9uLXJvbGxiYWNrLmh0 bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9S VENQZWVyQ29ubmVjdGlvbi1zZXRSZW1vdGVEZXNjcmlwdGlvbi1yb2xsYmFjay5odG1sCmluZGV4 IGEwMzFhNjAxNWY0Mjc0ZDc4M2ZjM2E1YTFiY2UwM2E3ZTIzZGZmZTguLjk0ZWQ3OWNkYjJmMDQy MDY5MGQ1NDdiYjRhNWMyYjc2NjcxY2Q4YTYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9y dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJDb25uZWN0aW9uLXNldFJl bW90ZURlc2NyaXB0aW9uLXJvbGxiYWNrLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tc2V0UmVtb3Rl RGVzY3JpcHRpb24tcm9sbGJhY2suaHRtbApAQCAtMTIxLDEwICsxMjEsMTIgQEAKICAgICB0LmFk ZF9jbGVhbnVwKCgpID0+IHBjMi5jbG9zZSgpKTsKIAogICAgIC8vIFdlIGRvbid0IHVzZSB0aGlz IHJpZ2h0IGF3YXkKLSAgICBjb25zdCBvZmZlcjEgPSBhd2FpdCBwYzEuY3JlYXRlT2ZmZXIoe29m ZmVyVG9SZWNlaXZlQXVkaW86IHRydWV9KTsKKyAgICBwYzEuYWRkVHJhbnNjZWl2ZXIoJ2F1ZGlv JywgeyBkaXJlY3Rpb246ICdyZWN2b25seScgfSk7CisgICAgY29uc3Qgb2ZmZXIxID0gYXdhaXQg cGMxLmNyZWF0ZU9mZmVyKCk7CiAKICAgICAvLyBDcmVhdGUgb2ZmZXIgZnJvbSBwYzIsIGFwcGx5 IGFuZCByb2xsYmFjayBvbiBwYzEKLSAgICBjb25zdCBvZmZlcjIgPSBhd2FpdCBwYzIuY3JlYXRl T2ZmZXIoe29mZmVyVG9SZWNlaXZlQXVkaW86IHRydWV9KTsKKyAgICBwYzIuYWRkVHJhbnNjZWl2 ZXIoJ2F1ZGlvJywgeyBkaXJlY3Rpb246ICdyZWN2b25seScgfSk7CisgICAgY29uc3Qgb2ZmZXIy ID0gYXdhaXQgcGMyLmNyZWF0ZU9mZmVyKCk7CiAgICAgYXdhaXQgcGMxLnNldFJlbW90ZURlc2Ny aXB0aW9uKG9mZmVyMik7CiAgICAgYXdhaXQgcGMxLnNldFJlbW90ZURlc2NyaXB0aW9uKHt0eXBl OiAicm9sbGJhY2sifSk7CiAKQEAgLTE0Nyw3ICsxNDksOSBAQAogICAgIGNvbnN0IG9mZmVyMSA9 IGF3YWl0IHBjMS5jcmVhdGVPZmZlcigpOwogCiAgICAgLy8gQ3JlYXRlIG9mZmVyIGZyb20gcGMy LCBhcHBseSBhbmQgcm9sbGJhY2sgb24gcGMxCi0gICAgY29uc3Qgb2ZmZXIyID0gYXdhaXQgcGMy LmNyZWF0ZU9mZmVyKHtvZmZlclRvUmVjZWl2ZUF1ZGlvOiB0cnVlLCBvZmZlclRvUmVjZWl2ZVZp ZGVvOiB0cnVlfSk7CisgICAgcGMyLmFkZFRyYW5zY2VpdmVyKCdhdWRpbycsIHsgZGlyZWN0aW9u OiAncmVjdm9ubHknIH0pOworICAgIHBjMi5hZGRUcmFuc2NlaXZlcigndmlkZW8nLCB7IGRpcmVj dGlvbjogJ3JlY3Zvbmx5JyB9KTsKKyAgICBjb25zdCBvZmZlcjIgPSBhd2FpdCBwYzIuY3JlYXRl T2ZmZXIoKTsKICAgICAvLyBwYzEgbm93IHNob3VsZCBjaGFuZ2UgaXRzIG1pbmQgYWJvdXQgd2hh dCBsZXZlbCBpdHMgdmlkZW8gdHJhbnNjZWl2ZXIgaXMKICAgICAvLyBib3VuZCB0by4gSXQgd2Fz IDAsIG5vdyBpdCBpcyAxLgogICAgIGF3YWl0IHBjMS5zZXRSZW1vdGVEZXNjcmlwdGlvbihvZmZl cjIpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tdHJhbnNjZWl2ZXJzLmh0dHBzLWV4cGVjdGVk LnR4dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRj L1JUQ1BlZXJDb25uZWN0aW9uLXRyYW5zY2VpdmVycy5odHRwcy1leHBlY3RlZC50eHQKaW5kZXgg MWU0MzQzZDEyNzRhNjZlN2IzZTI3NzM3ZWU3YmVlNDhmOWRjYmVjMC4uNzYwYTFjMzcyNDYwZWE0 OGNjZDQ0ZWRlY2MwMWY3NGUzNGU2YzQwMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tdHJhbnNj ZWl2ZXJzLmh0dHBzLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9SVENQZWVyQ29ubmVjdGlvbi10cmFuc2NlaXZlcnMu aHR0cHMtZXhwZWN0ZWQudHh0CkBAIC00MSw2ICs0MSw2IEBAIFBBU1MgYWRkVHJhbnNjZWl2ZXIg ZG9lcyBub3QgcmV1c2UgcmV1c2FibGUgdHJhbnNjZWl2ZXJzCiBQQVNTIENhbiBzZXR1cCB0d28t d2F5IGNhbGwgdXNpbmcgYSBzaW5nbGUgdHJhbnNjZWl2ZXIKIEZBSUwgQ2xvc2luZyB0aGUgUEMg c3RvcHMgdGhlIHRyYW5zY2VpdmVycyBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAob2JqZWN0KSBu dWxsIGJ1dCBnb3QgKHN0cmluZykgImluYWN0aXZlIgogUEFTUyBDaGFuZ2luZyB0cmFuc2NlaXZl ciBkaXJlY3Rpb24gdG8gJ3NlbmRyZWN2JyBtYWtlcyBvbnRyYWNrIGZpcmUKLUZBSUwgdHJhbnNj ZWl2ZXIuc2VuZGVyLnRyYWNrIGRvZXMgbm90IHJldmVydCB0byBhbiBvbGQgc3RhdGUgcHJvbWlz ZV90ZXN0OiBVbmhhbmRsZWQgcmVqZWN0aW9uIHdpdGggdmFsdWU6IG9iamVjdCAiVHlwZUVycm9y OiB1bmRlZmluZWQgaXMgbm90IGFuIG9iamVjdCAoZXZhbHVhdGluZyAncGMxLmdldFJlY2VpdmVy cygpWzBdLnRyYWNrJykiCi1GQUlMIHRyYW5zY2VpdmVyLmRpcmVjdGlvbiBkb2VzIG5vdCByZXZl cnQgdG8gYW4gb2xkIHN0YXRlIHByb21pc2VfdGVzdDogVW5oYW5kbGVkIHJlamVjdGlvbiB3aXRo IHZhbHVlOiBvYmplY3QgIlR5cGVFcnJvcjogdW5kZWZpbmVkIGlzIG5vdCBhbiBvYmplY3QgKGV2 YWx1YXRpbmcgJ3BjMS5nZXRUcmFuc2NlaXZlcnMoKVswXS5kaXJlY3Rpb24gPSAnaW5hY3RpdmUn JykiCitQQVNTIHRyYW5zY2VpdmVyLnNlbmRlci50cmFjayBkb2VzIG5vdCByZXZlcnQgdG8gYW4g b2xkIHN0YXRlCitQQVNTIHRyYW5zY2VpdmVyLmRpcmVjdGlvbiBkb2VzIG5vdCByZXZlcnQgdG8g YW4gb2xkIHN0YXRlCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvd2VicnRjL1JUQ1BlZXJDb25uZWN0aW9uLXRyYW5zY2VpdmVycy5odHRw cy5odG1sIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJy dGMvUlRDUGVlckNvbm5lY3Rpb24tdHJhbnNjZWl2ZXJzLmh0dHBzLmh0bWwKaW5kZXggMTEwNjM4 Y2Q3NGU4ZDkxMDY1ZmI3ZWYzYTI4Y2UxYTgwNTFjNjM3MC4uYTQ3NGY3MDkyOGE2NDBlNjM3MmMz M2EwMzNmNDY0ZmRjYzU3YzJkZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tdHJhbnNjZWl2ZXJz Lmh0dHBzLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy93ZWJydGMvUlRDUGVlckNvbm5lY3Rpb24tdHJhbnNjZWl2ZXJzLmh0dHBzLmh0bWwKQEAg LTQ3OSw3ICs0NzksOCBAQCBwcm9taXNlX3Rlc3QoYXN5bmMgdCA9PiB7CiAgICAgLnRoZW4oKG9m ZmVyKSA9PiB7IHJldHVybiBwYzEuc2V0UmVtb3RlRGVzY3JpcHRpb24ob2ZmZXIpOyB9KQogICAg IC50aGVuKCgpID0+IHsgcmV0dXJuIHBjMS5jcmVhdGVBbnN3ZXIoKTsgfSkKICAgICAudGhlbigo YW5zd2VyKSA9PiB7IHJldHVybiBwYzEuc2V0TG9jYWxEZXNjcmlwdGlvbihhbnN3ZXIpOyB9KTsK LSAgY29uc3QgcGMxUHJvbWlzZSA9IHBjMS5jcmVhdGVPZmZlcih7IG9mZmVyVG9SZWNlaXZlQXVk aW86IHRydWV9KQorICBwYzEuYWRkVHJhbnNjZWl2ZXIoJ2F1ZGlvJywgeyBkaXJlY3Rpb246ICdy ZWN2b25seScgfSk7CisgIGNvbnN0IHBjMVByb21pc2UgPSBwYzEuY3JlYXRlT2ZmZXIoKQogICAg IC50aGVuKCgpID0+IHsgcGMxLmFkZFRyYWNrKHBjMS5nZXRSZWNlaXZlcnMoKVswXS50cmFjayk7 IH0pOwogICBhd2FpdCBQcm9taXNlLmFsbChbcGMxUHJvbWlzZSwgcGMyUHJvbWlzZV0pOwogICBh c3NlcnRfZXF1YWxzKHBjMS5nZXRTZW5kZXJzKClbMF0udHJhY2ssIHBjMS5nZXRSZWNlaXZlcnMo KVswXS50cmFjayk7CkBAIC00OTQsNyArNDk1LDggQEAgcHJvbWlzZV90ZXN0KGFzeW5jIHQgPT4g ewogICBjb25zdCBwYzJQcm9taXNlID0gcGMyLmNyZWF0ZU9mZmVyKCkKICAgICAudGhlbigob2Zm ZXIpID0+IHsgcmV0dXJuIHBjMS5zZXRSZW1vdGVEZXNjcmlwdGlvbihvZmZlcik7IH0pCiAgICAg LnRoZW4oKCkgPT4geyByZXR1cm4gcGMxLmNyZWF0ZUFuc3dlcigpOyB9KTsKLSAgY29uc3QgcGMx UHJvbWlzZSA9IHBjMS5jcmVhdGVPZmZlcih7IG9mZmVyVG9SZWNlaXZlQXVkaW86IHRydWV9KQor ICBwYzEuYWRkVHJhbnNjZWl2ZXIoJ2F1ZGlvJywgeyBkaXJlY3Rpb246ICdyZWN2b25seScgfSk7 CisgIGNvbnN0IHBjMVByb21pc2UgPSBwYzEuY3JlYXRlT2ZmZXIoKQogICAgIC50aGVuKCgpID0+ IHsgcGMxLmdldFRyYW5zY2VpdmVycygpWzBdLmRpcmVjdGlvbiA9ICdpbmFjdGl2ZSc7IH0pOwog ICBhd2FpdCBQcm9taXNlLmFsbChbcGMxUHJvbWlzZSwgcGMyUHJvbWlzZV0pOwogICBhc3NlcnRf ZXF1YWxzKHBjMS5nZXRUcmFuc2NlaXZlcnMoKVswXS5kaXJlY3Rpb24sICdpbmFjdGl2ZScpOwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93 ZWJydGMvcHJvdG9jb2wvUlRDUGVlckNvbm5lY3Rpb24tcGF5bG9hZFR5cGVzLmh0bWwgYi9MYXlv dXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy9wcm90b2NvbC9S VENQZWVyQ29ubmVjdGlvbi1wYXlsb2FkVHlwZXMuaHRtbAppbmRleCBlYWNiZjM4YTBmNjEyOGVm ZGNkNTk3Zjk5NWJmODcyZjU1OWE4ODJjLi4wNjZmYzJlMDg1ZTMyZGE1YzIzMDgwNmM0NTExZWQ1 MjU3N2U1MDQ4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL3dlYnJ0Yy9wcm90b2NvbC9SVENQZWVyQ29ubmVjdGlvbi1wYXlsb2FkVHlwZXMu aHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dl YnJ0Yy9wcm90b2NvbC9SVENQZWVyQ29ubmVjdGlvbi1wYXlsb2FkVHlwZXMuaHRtbApAQCAtMTMs NyArMTMsOSBAQCBwcm9taXNlX3Rlc3QoYXN5bmMgdCA9PiB7CiAgIGNvbnN0IHBjMSA9IG5ldyBS VENQZWVyQ29ubmVjdGlvbigpOwogICB0LmFkZF9jbGVhbnVwKCgpID0+IHBjMS5jbG9zZSgpKTsK IAotICBjb25zdCBvZmZlciA9IGF3YWl0IHBjMS5jcmVhdGVPZmZlcih7b2ZmZXJUb1JlY2VpdmVB dWRpbzogdHJ1ZSwgb2ZmZXJUb1JlY2VpdmVWaWRlbzogdHJ1ZX0pOworICBwYzEuYWRkVHJhbnNj ZWl2ZXIoJ2F1ZGlvJywgeyBkaXJlY3Rpb246ICdyZWN2b25seScgfSk7CisgIHBjMS5hZGRUcmFu c2NlaXZlcigndmlkZW8nLCB7IGRpcmVjdGlvbjogJ3JlY3Zvbmx5JyB9KTsKKyAgY29uc3Qgb2Zm ZXIgPSBhd2FpdCBwYzEuY3JlYXRlT2ZmZXIoKTsKIAogICAvLyBFeHRyYWN0IGFsbCBwYXlsb2Fk IHR5cGVzIGZyb20gdGhlIG09IGxpbmVzLgogICBjb25zdCBwYXlsb2FkVHlwZXMgPSBvZmZlci5z ZHAuc3BsaXQoJ1xuJykK