233198 2021-11-16 09:52:49 -0800 Web Inspector: Remove unused `dontCreateIfMissing` argument from CSSStyleDeclaration.prototype.propertyForName 2021-11-16 16:24:22 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 nvasilyev nvasilyev ews-watchlist hi inspector-bugzilla-changes pangle webkit-bug-importer oldest_to_newest 1815539 0 nvasilyev 2021-11-16 09:52:49 -0800 `dontCreateIfMissing` is always true. We don't need to make it an argument. 1815545 1 444405 nvasilyev 2021-11-16 10:10:28 -0800 Created attachment 444405 Patch Never liked a negation in the argument name anyway :p 1815603 2 444405 hi 2021-11-16 12:29:31 -0800 Comment on attachment 444405 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=444405&action=review > Source/WebInspectorUI/UserInterface/Models/CSSStyleDeclaration.js:332 > + return bestMatchProperty; We should simplify `propertyForName` while we're at it. There's no reason to have an inline function `findMatch` that we only call once. 1815619 3 444424 nvasilyev 2021-11-16 13:24:07 -0800 Created attachment 444424 Patch Done. 1815631 4 444424 hi 2021-11-16 13:59:07 -0800 Comment on attachment 444424 Patch r=me 1815706 5 ews-feeder 2021-11-16 16:23:27 -0800 Committed r285896 (244314@main): <https://commits.webkit.org/244314@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 444424. 1815707 6 webkit-bug-importer 2021-11-16 16:24:22 -0800 <rdar://problem/85480781> 444405 2021-11-16 10:10:28 -0800 2021-11-16 13:24:07 -0800 Patch patch.txt text/plain 13337 nvasilyev ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2NzAwNTM5MzY1MTIuLjNjYmI2OTliZDdmOCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBA CisyMDIxLTExLTE2ICBOaWtpdGEgVmFzaWx5ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgorCisg ICAgICAgIFdlYiBJbnNwZWN0b3I6IFJlbW92ZSB1bnVzZWQgYGRvbnRDcmVhdGVJZk1pc3Npbmdg IGFyZ3VtZW50IGZyb20gQ1NTU3R5bGVEZWNsYXJhdGlvbi5wcm90b3R5cGUucHJvcGVydHlGb3JO YW1lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzMx OTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGlu c3BlY3Rvci9jc3Mvb3ZlcnJpZGRlbi1wcm9wZXJ0eS5odG1sOgorICAgICAgICAqIGluc3BlY3Rv ci9jc3MvcHNldWRvLWVsZW1lbnQtbWF0Y2hlcy1mb3ItcHNldWRvLWVsZW1lbnQtbm9kZS5odG1s OgorCiAyMDIxLTExLTE1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAg ICAgYENyb3NzLU9yaWdpbi1FbWJlZGRlci1Qb2xpY3k6IHJlcXVpcmUtY29ycGAgcHJldmVudHMg bG9hZGluZyBvZiBkYXRhIFVSTCBpbWFnZXMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9jc3Mvb3ZlcnJpZGRlbi1wcm9wZXJ0eS5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2Nzcy9vdmVycmlkZGVuLXByb3BlcnR5Lmh0bWwKaW5kZXggOGU2MjkyNzY3NjFmLi5lMTM2NzQ2 Y2NhMGUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9jc3Mvb3ZlcnJpZGRlbi1w cm9wZXJ0eS5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jc3Mvb3ZlcnJpZGRlbi1w cm9wZXJ0eS5odG1sCkBAIC05MiwxMSArOTIsMTAgQEAgZnVuY3Rpb24gdGVzdCgpIHsKICAgICAg ICAgbmFtZTogIk92ZXJyaWRkZW5Qcm9wZXJ0eS5PdmVycmlkZGVuQnlTaG9ydGhhbmQiLAogICAg ICAgICB0ZXN0KHJlc29sdmUsIHJlamVjdCkgewogICAgICAgICAgICAgZ2V0U3R5bGVEZWNsYXJh dGlvbigiLmxvbmdoYW5kLW92ZXJyaWRkZW4tYnktc2hvcnRoYW5kIiwgKHN0eWxlKSA9PiB7Ci0g ICAgICAgICAgICAgICAgY29uc3QgZG9udENyZWF0ZUlmTWlzc2luZyA9IHRydWU7Ci0gICAgICAg ICAgICAgICAgbGV0IGJvcmRlclRvcENvbG9yUHJvcGVydHkgPSBzdHlsZS5wcm9wZXJ0eUZvck5h bWUoImJvcmRlci10b3AtY29sb3IiLCBkb250Q3JlYXRlSWZNaXNzaW5nKTsKKyAgICAgICAgICAg ICAgICBsZXQgYm9yZGVyVG9wQ29sb3JQcm9wZXJ0eSA9IHN0eWxlLnByb3BlcnR5Rm9yTmFtZSgi Ym9yZGVyLXRvcC1jb2xvciIpOwogICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0 VHJ1ZShib3JkZXJUb3BDb2xvclByb3BlcnR5Lm92ZXJyaWRkZW4sICJib3JkZXItdG9wLWNvbG9y IGlzIG92ZXJyaWRkZW4uIik7CiAKLSAgICAgICAgICAgICAgICBsZXQgYm9yZGVyQ29sb3JQcm9w ZXJ0eSA9IHN0eWxlLnByb3BlcnR5Rm9yTmFtZSgiYm9yZGVyLWNvbG9yIiwgZG9udENyZWF0ZUlm TWlzc2luZyk7CisgICAgICAgICAgICAgICAgbGV0IGJvcmRlckNvbG9yUHJvcGVydHkgPSBzdHls ZS5wcm9wZXJ0eUZvck5hbWUoImJvcmRlci1jb2xvciIpOwogICAgICAgICAgICAgICAgIEluc3Bl Y3RvclRlc3QuZXhwZWN0RmFsc2UoYm9yZGVyQ29sb3JQcm9wZXJ0eS5vdmVycmlkZGVuLCAiYm9y ZGVyLWNvbG9yIGlzIE5PVCBvdmVycmlkZGVuLiIpOwogCiAgICAgICAgICAgICAgICAgcmVzb2x2 ZSgpOwpAQCAtMTA4LDExICsxMDcsMTAgQEAgZnVuY3Rpb24gdGVzdCgpIHsKICAgICAgICAgbmFt ZTogIk92ZXJyaWRkZW5Qcm9wZXJ0eS5PdmVycmlkZGVuQnlJbXBvcnRhbnRTaG9ydGhhbmQiLAog ICAgICAgICB0ZXN0KHJlc29sdmUsIHJlamVjdCkgewogICAgICAgICAgICAgZ2V0U3R5bGVEZWNs YXJhdGlvbigiLmxvbmdoYW5kLW92ZXJyaWRkZW4tYnktaW1wb3J0YW50LXNob3J0aGFuZCIsIChz dHlsZSkgPT4gewotICAgICAgICAgICAgICAgIGNvbnN0IGRvbnRDcmVhdGVJZk1pc3NpbmcgPSB0 cnVlOwotICAgICAgICAgICAgICAgIGxldCBib3JkZXJDb2xvclByb3BlcnR5ID0gc3R5bGUucHJv cGVydHlGb3JOYW1lKCJib3JkZXItY29sb3IiLCBkb250Q3JlYXRlSWZNaXNzaW5nKTsKKyAgICAg ICAgICAgICAgICBsZXQgYm9yZGVyQ29sb3JQcm9wZXJ0eSA9IHN0eWxlLnByb3BlcnR5Rm9yTmFt ZSgiYm9yZGVyLWNvbG9yIik7CiAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RG YWxzZShib3JkZXJDb2xvclByb3BlcnR5Lm92ZXJyaWRkZW4sICJib3JkZXItY29sb3IgaXMgTk9U IG92ZXJyaWRkZW4uIik7CiAKLSAgICAgICAgICAgICAgICBsZXQgYm9yZGVyVG9wQ29sb3JQcm9w ZXJ0eSA9IHN0eWxlLnByb3BlcnR5Rm9yTmFtZSgiYm9yZGVyLXRvcC1jb2xvciIsIGRvbnRDcmVh dGVJZk1pc3NpbmcpOworICAgICAgICAgICAgICAgIGxldCBib3JkZXJUb3BDb2xvclByb3BlcnR5 ID0gc3R5bGUucHJvcGVydHlGb3JOYW1lKCJib3JkZXItdG9wLWNvbG9yIik7CiAgICAgICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUcnVlKGJvcmRlclRvcENvbG9yUHJvcGVydHkub3Zl cnJpZGRlbiwgImJvcmRlci10b3AtY29sb3IgaXMgb3ZlcnJpZGRlbi4iKTsKIAogICAgICAgICAg ICAgICAgIHJlc29sdmUoKTsKQEAgLTEyNCwxMSArMTIyLDEwIEBAIGZ1bmN0aW9uIHRlc3QoKSB7 CiAgICAgICAgIG5hbWU6ICJPdmVycmlkZGVuUHJvcGVydHkuTm90T3ZlcnJpZGRlbkJ5SW1wb3J0 YW50TG9uZ2hhbmQiLAogICAgICAgICB0ZXN0KHJlc29sdmUsIHJlamVjdCkgewogICAgICAgICAg ICAgZ2V0U3R5bGVEZWNsYXJhdGlvbigiLnNob3J0aGFuZC1vdmVycmlkZGVuLWJ5LWltcG9ydGFu dC1sb25naGFuZCIsIChzdHlsZSkgPT4gewotICAgICAgICAgICAgICAgIGNvbnN0IGRvbnRDcmVh dGVJZk1pc3NpbmcgPSB0cnVlOwotICAgICAgICAgICAgICAgIGxldCBib3JkZXJUb3BDb2xvclBy b3BlcnR5ID0gc3R5bGUucHJvcGVydHlGb3JOYW1lKCJib3JkZXItdG9wLWNvbG9yIiwgZG9udENy ZWF0ZUlmTWlzc2luZyk7CisgICAgICAgICAgICAgICAgbGV0IGJvcmRlclRvcENvbG9yUHJvcGVy dHkgPSBzdHlsZS5wcm9wZXJ0eUZvck5hbWUoImJvcmRlci10b3AtY29sb3IiKTsKICAgICAgICAg ICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEZhbHNlKGJvcmRlclRvcENvbG9yUHJvcGVydHku b3ZlcnJpZGRlbiwgImJvcmRlci10b3AtY29sb3IgaXMgTk9UIG92ZXJyaWRkZW4uIik7CiAKLSAg ICAgICAgICAgICAgICBsZXQgYm9yZGVyQ29sb3JQcm9wZXJ0eSA9IHN0eWxlLnByb3BlcnR5Rm9y TmFtZSgiYm9yZGVyLWNvbG9yIiwgZG9udENyZWF0ZUlmTWlzc2luZyk7CisgICAgICAgICAgICAg ICAgbGV0IGJvcmRlckNvbG9yUHJvcGVydHkgPSBzdHlsZS5wcm9wZXJ0eUZvck5hbWUoImJvcmRl ci1jb2xvciIpOwogICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RmFsc2UoYm9y ZGVyQ29sb3JQcm9wZXJ0eS5vdmVycmlkZGVuLCAiYm9yZGVyLWNvbG9yIGlzIE5PVCBvdmVycmlk ZGVuLiIpOwogCiAgICAgICAgICAgICAgICAgcmVzb2x2ZSgpOwpAQCAtMTQwLDExICsxMzcsMTAg QEAgZnVuY3Rpb24gdGVzdCgpIHsKICAgICAgICAgbmFtZTogIk92ZXJyaWRkZW5Qcm9wZXJ0eS5O b3RPdmVycmlkZGVuQnlMb25naGFuZCIsCiAgICAgICAgIHRlc3QocmVzb2x2ZSwgcmVqZWN0KSB7 CiAgICAgICAgICAgICBnZXRTdHlsZURlY2xhcmF0aW9uKCIuc2hvcnRoYW5kLW5vdC1vdmVycmlk ZGVuLWJ5LWxvbmdoYW5kIiwgKHN0eWxlKSA9PiB7Ci0gICAgICAgICAgICAgICAgY29uc3QgZG9u dENyZWF0ZUlmTWlzc2luZyA9IHRydWU7Ci0gICAgICAgICAgICAgICAgbGV0IGJvcmRlckNvbG9y UHJvcGVydHkgPSBzdHlsZS5wcm9wZXJ0eUZvck5hbWUoImJvcmRlci1jb2xvciIsIGRvbnRDcmVh dGVJZk1pc3NpbmcpOworICAgICAgICAgICAgICAgIGxldCBib3JkZXJDb2xvclByb3BlcnR5ID0g c3R5bGUucHJvcGVydHlGb3JOYW1lKCJib3JkZXItY29sb3IiKTsKICAgICAgICAgICAgICAgICBJ bnNwZWN0b3JUZXN0LmV4cGVjdEZhbHNlKGJvcmRlckNvbG9yUHJvcGVydHkub3ZlcnJpZGRlbiwg ImJvcmRlci1jb2xvciBpcyBOT1Qgb3ZlcnJpZGRlbi4iKTsKIAotICAgICAgICAgICAgICAgIGxl dCBib3JkZXJUb3BDb2xvclByb3BlcnR5ID0gc3R5bGUucHJvcGVydHlGb3JOYW1lKCJib3JkZXIt dG9wLWNvbG9yIiwgZG9udENyZWF0ZUlmTWlzc2luZyk7CisgICAgICAgICAgICAgICAgbGV0IGJv cmRlclRvcENvbG9yUHJvcGVydHkgPSBzdHlsZS5wcm9wZXJ0eUZvck5hbWUoImJvcmRlci10b3At Y29sb3IiKTsKICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEZhbHNlKGJvcmRl clRvcENvbG9yUHJvcGVydHkub3ZlcnJpZGRlbiwgImJvcmRlci10b3AtY29sb3IgaXMgTk9UIG92 ZXJyaWRkZW4uIik7CiAKICAgICAgICAgICAgICAgICByZXNvbHZlKCk7CkBAIC0xNTYsMTEgKzE1 MiwxMCBAQCBmdW5jdGlvbiB0ZXN0KCkgewogICAgICAgICBuYW1lOiAiT3ZlcnJpZGRlblByb3Bl cnR5Lk1peGVkQ2FzZVZhcmlhYmxlc05vdE92ZXJyaWRkZW4iLAogICAgICAgICB0ZXN0KHJlc29s dmUsIHJlamVjdCkgewogICAgICAgICAgICAgZ2V0U3R5bGVEZWNsYXJhdGlvbigiLm1peGVkLWNh c2UtdmFyaWFibGVzLW5vdC1vdmVycmlkZGVuIiwgKHN0eWxlKSA9PiB7Ci0gICAgICAgICAgICAg ICAgY29uc3QgZG9udENyZWF0ZUlmTWlzc2luZyA9IHRydWU7Ci0gICAgICAgICAgICAgICAgbGV0 IGxvd2VyY2FzZVZhcmlhYmxlUHJvcGVydHkgPSBzdHlsZS5wcm9wZXJ0eUZvck5hbWUoIi0tZm9v IiwgZG9udENyZWF0ZUlmTWlzc2luZyk7CisgICAgICAgICAgICAgICAgbGV0IGxvd2VyY2FzZVZh cmlhYmxlUHJvcGVydHkgPSBzdHlsZS5wcm9wZXJ0eUZvck5hbWUoIi0tZm9vIik7CiAgICAgICAg ICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RGYWxzZShsb3dlcmNhc2VWYXJpYWJsZVByb3Bl cnR5Lm92ZXJyaWRkZW4sICJgLS1mb29gIGlzIE5PVCBvdmVycmlkZGVuLiIpOwogCi0gICAgICAg ICAgICAgICAgbGV0IHVwcGVyY2FzZVZhcmlhYmxlUHJvcGVydHkgPSBzdHlsZS5wcm9wZXJ0eUZv ck5hbWUoIi0tRk9PIiwgZG9udENyZWF0ZUlmTWlzc2luZyk7CisgICAgICAgICAgICAgICAgbGV0 IHVwcGVyY2FzZVZhcmlhYmxlUHJvcGVydHkgPSBzdHlsZS5wcm9wZXJ0eUZvck5hbWUoIi0tRk9P Iik7CiAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RGYWxzZSh1cHBlcmNhc2VW YXJpYWJsZVByb3BlcnR5Lm92ZXJyaWRkZW4sICJgLS1GT09gIGlzIE5PVCBvdmVycmlkZGVuLiIp OwogCiAgICAgICAgICAgICAgICAgcmVzb2x2ZSgpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL2Nzcy9wc2V1ZG8tZWxlbWVudC1tYXRjaGVzLWZvci1wc2V1ZG8tZWxlbWVudC1u b2RlLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY3NzL3BzZXVkby1lbGVtZW50LW1hdGNo ZXMtZm9yLXBzZXVkby1lbGVtZW50LW5vZGUuaHRtbAppbmRleCBlODc3NWEwZWQzZTQuLmRhNzdk YTBhZWMwNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Nzcy9wc2V1ZG8tZWxl bWVudC1tYXRjaGVzLWZvci1wc2V1ZG8tZWxlbWVudC1ub2RlLmh0bWwKKysrIGIvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2Nzcy9wc2V1ZG8tZWxlbWVudC1tYXRjaGVzLWZvci1wc2V1ZG8tZWxlbWVu dC1ub2RlLmh0bWwKQEAgLTE3LDggKzE3LDcgQEAgZnVuY3Rpb24gdGVzdCgpIHsKICAgICAgICAg SW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KG5vZGVTdHlsZXMuY29tcHV0ZWRTdHlsZSwgIkhhcyBD b21wdXRlZCBTdHlsZXMiKTsKIAogICAgICAgICBmdW5jdGlvbiBsb2dQcm9wZXJ0eShwcm9wZXJ0 eU5hbWUpIHsKLSAgICAgICAgICAgIGNvbnN0IGRvbnRDcmVhdGVJZk1pc3NpbmcgPSB0cnVlOwot ICAgICAgICAgICAgbGV0IHByb3BlcnR5ID0gbm9kZVN0eWxlcy5jb21wdXRlZFN0eWxlLnByb3Bl cnR5Rm9yTmFtZShwcm9wZXJ0eU5hbWUsIGRvbnRDcmVhdGVJZk1pc3NpbmcpOworICAgICAgICAg ICAgbGV0IHByb3BlcnR5ID0gbm9kZVN0eWxlcy5jb21wdXRlZFN0eWxlLnByb3BlcnR5Rm9yTmFt ZShwcm9wZXJ0eU5hbWUpOwogICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5sb2coYFBST1BFUlRZ OiAke3Byb3BlcnR5Lm5hbWV9OiAke3Byb3BlcnR5LnZhbHVlfTtgKTsKICAgICAgICAgfQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYklu c3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBmZDM3MWNkMjRlNDUuLjI5YmU0YTgwYTBmZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMjEtMTEtMTYgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogUmVtb3ZlIHVudXNlZCBgZG9udENyZWF0ZUlmTWlzc2luZ2AgYXJndW1lbnQgZnJvbSBDU1NT dHlsZURlY2xhcmF0aW9uLnByb3RvdHlwZS5wcm9wZXJ0eUZvck5hbWUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzE5OAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGBkb250Q3JlYXRlSWZNaXNzaW5nYCB3 YXMgYWx3YXlzIHNldCB0byBgdHJ1ZWAuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVs cy9DU1NTdHlsZURlY2xhcmF0aW9uLmpzOgorICAgICAgICAoV0kuQ1NTU3R5bGVEZWNsYXJhdGlv bi5wcm90b3R5cGUucHJvcGVydHlGb3JOYW1lKToKKyAgICAgICAgKFdJLkNTU1N0eWxlRGVjbGFy YXRpb24ucHJvdG90eXBlLnJlc29sdmVWYXJpYWJsZVZhbHVlKToKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL01vZGVscy9ET01Ob2RlU3R5bGVzLmpzOgorICAgICAgICAoV0kuRE9NTm9kZVN0eWxl cy5wcm90b3R5cGUuX3BhcnNlU3R5bGVQcm9wZXJ0eVBheWxvYWQpOgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvTW9kZWxzL0ZvbnQuanM6CisgICAgICAgIChXSS5Gb250KToKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1ZpZXdzL0JveE1vZGVsRGV0YWlsc1NlY3Rpb25Sb3cuanM6CisgICAgICAg IChXSS5Cb3hNb2RlbERldGFpbHNTZWN0aW9uUm93LnByb3RvdHlwZS5fZ2V0UHJvcGVydHlWYWx1 ZSk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFN0eWxlUHJvcGVy dHkuanM6CisgICAgICAgIChXSS5TcHJlYWRzaGVldFN0eWxlUHJvcGVydHkucHJvdG90eXBlLl9h ZGRWYXJpYWJsZVRva2Vucyk6CisKIDIwMjEtMTEtMTIgIFJhenZhbiBDYWxpbWFuICA8cmNhbGlt YW5AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEV4dHJhY3QgcmV1c2FibGUg bG9naWMgZnJvbSBSZXNvdXJjZVF1ZXJ5Q29udHJvbGxlciwgUmVzb3VyY2VRdWVyeVJlc3VsdCBh bmQgUmVzb3VyY2VRdWVyeU1hdGNoCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Nb2RlbHMvQ1NTU3R5bGVEZWNsYXJhdGlvbi5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9DU1NTdHlsZURlY2xhcmF0aW9uLmpzCmlu ZGV4IGVmYmY0YWFmMWIwNC4uN2RhYTM2MWFlOTY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ1NTU3R5bGVEZWNsYXJhdGlvbi5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ1NTU3R5bGVEZWNs YXJhdGlvbi5qcwpAQCAtMzAxLDcgKzMwMSw3IEBAIFdJLkNTU1N0eWxlRGVjbGFyYXRpb24gPSBj bGFzcyBDU1NTdHlsZURlY2xhcmF0aW9uIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgIHJldHVy biB0aGlzLl9ub2RlLmFwcHJvcHJpYXRlU2VsZWN0b3JGb3IodHJ1ZSk7CiAgICAgfQogCi0gICAg cHJvcGVydHlGb3JOYW1lKG5hbWUsIGRvbnRDcmVhdGVJZk1pc3NpbmcpCisgICAgcHJvcGVydHlG b3JOYW1lKG5hbWUpCiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2VydChuYW1lKTsKICAgICAg ICAgaWYgKCFuYW1lKQpAQCAtMzI5LDIzICszMjksNyBAQCBXSS5DU1NTdHlsZURlY2xhcmF0aW9u ID0gY2xhc3MgQ1NTU3R5bGVEZWNsYXJhdGlvbiBleHRlbmRzIFdJLk9iamVjdAogCiAgICAgICAg IGZpbmRNYXRjaCh0aGlzLmVuYWJsZWRQcm9wZXJ0aWVzKTsKIAotICAgICAgICBpZiAoYmVzdE1h dGNoUHJvcGVydHkpCi0gICAgICAgICAgICByZXR1cm4gYmVzdE1hdGNoUHJvcGVydHk7Ci0KLSAg ICAgICAgaWYgKGRvbnRDcmVhdGVJZk1pc3NpbmcgfHwgIXRoaXMuZWRpdGFibGUpCi0gICAgICAg ICAgICByZXR1cm4gbnVsbDsKLQotICAgICAgICBmaW5kTWF0Y2godGhpcy5fcGVuZGluZ1Byb3Bl cnRpZXMsIHRydWUpOwotCi0gICAgICAgIGlmIChiZXN0TWF0Y2hQcm9wZXJ0eSkKLSAgICAgICAg ICAgIHJldHVybiBiZXN0TWF0Y2hQcm9wZXJ0eTsKLQotICAgICAgICB2YXIgbmV3UHJvcGVydHkg PSBuZXcgV0kuQ1NTUHJvcGVydHkoTmFOLCBudWxsLCBuYW1lKTsKLSAgICAgICAgbmV3UHJvcGVy dHkub3duZXJTdHlsZSA9IHRoaXM7Ci0KLSAgICAgICAgdGhpcy5fcGVuZGluZ1Byb3BlcnRpZXMu cHVzaChuZXdQcm9wZXJ0eSk7Ci0KLSAgICAgICAgcmV0dXJuIG5ld1Byb3BlcnR5OworICAgICAg ICByZXR1cm4gYmVzdE1hdGNoUHJvcGVydHk7CiAgICAgfQogCiAgICAgcmVzb2x2ZVZhcmlhYmxl VmFsdWUodGV4dCkKQEAgLTM4NSw3ICszNjksNyBAQCBXSS5DU1NTdHlsZURlY2xhcmF0aW9uID0g Y2xhc3MgQ1NTU3R5bGVEZWNsYXJhdGlvbiBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICAgICAg ICAgICAgICBpZiAodmFyaWFibGVOYW1lSW5kZXggPT09IC0xKQogICAgICAgICAgICAgICAgICAg ICAgICAgY29udGludWU7CiAKLSAgICAgICAgICAgICAgICAgICAgbGV0IHZhcmlhYmxlUHJvcGVy dHkgPSB0aGlzLnByb3BlcnR5Rm9yTmFtZSh2YXJpYWJsZVRva2Vuc1t2YXJpYWJsZU5hbWVJbmRl eF0udmFsdWUsIHRydWUpOworICAgICAgICAgICAgICAgICAgICBsZXQgdmFyaWFibGVQcm9wZXJ0 eSA9IHRoaXMucHJvcGVydHlGb3JOYW1lKHZhcmlhYmxlVG9rZW5zW3ZhcmlhYmxlTmFtZUluZGV4 XS52YWx1ZSk7CiAgICAgICAgICAgICAgICAgICAgIGlmICh2YXJpYWJsZVByb3BlcnR5KQogICAg ICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHZhcmlhYmxlUHJvcGVydHkudmFsdWUudHJpbSgp OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2Rl bHMvRE9NTm9kZVN0eWxlcy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L01vZGVscy9ET01Ob2RlU3R5bGVzLmpzCmluZGV4IDA1ODFmZWI4ZjIyNy4uZDQ0YWIzNDI0ODNk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMv RE9NTm9kZVN0eWxlcy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Nb2RlbHMvRE9NTm9kZVN0eWxlcy5qcwpAQCAtNTQ1LDcgKzU0NSw3IEBAIFdJLkRPTU5vZGVT dHlsZXMgPSBjbGFzcyBET01Ob2RlU3R5bGVzIGV4dGVuZHMgV0kuT2JqZWN0CiAKICAgICAgICAg aWYgKHN0eWxlRGVjbGFyYXRpb24pIHsKICAgICAgICAgICAgIC8vIFVzZSBwcm9wZXJ0eUZvck5h bWUgd2hlbiB0aGUgaW5kZXggaXMgTmFOIHNpbmNlIHByb3BlcnR5Rm9yTmFtZSBpcyBmYXN0IGlu IHRoYXQgY2FzZS4KLSAgICAgICAgICAgIHZhciBwcm9wZXJ0eSA9IGlzTmFOKGluZGV4KSA/IHN0 eWxlRGVjbGFyYXRpb24ucHJvcGVydHlGb3JOYW1lKG5hbWUsIHRydWUpIDogc3R5bGVEZWNsYXJh dGlvbi5lbmFibGVkUHJvcGVydGllc1tpbmRleF07CisgICAgICAgICAgICB2YXIgcHJvcGVydHkg PSBpc05hTihpbmRleCkgPyBzdHlsZURlY2xhcmF0aW9uLnByb3BlcnR5Rm9yTmFtZShuYW1lKSA6 IHN0eWxlRGVjbGFyYXRpb24uZW5hYmxlZFByb3BlcnRpZXNbaW5kZXhdOwogCiAgICAgICAgICAg ICAvLyBSZXVzZSBhIHByb3BlcnR5IGlmIHRoZSBpbmRleCBhbmQgbmFtZSBtYXRjaGVzLiBPdGhl cndpc2UgaXQgaXMgYSBkaWZmZXJlbnQgcHJvcGVydHkKICAgICAgICAgICAgIC8vIGFuZCBzaG91 bGQgYmUgY3JlYXRlZCBmcm9tIHNjcmF0Y2guIFRoaXMgd29ya3MgaW4gdGhlIHNpbXBsZSBjYXNl cyB3aGVyZSBvbmx5IGV4aXN0aW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Nb2RlbHMvRm9udC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL01vZGVscy9Gb250LmpzCmluZGV4IGMyNzlhZTYwMWRjZi4uYWViYTQwYWE3NDll IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMv Rm9udC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMv Rm9udC5qcwpAQCAtMjA2LDggKzIwNiw3IEBAIFdJLkZvbnQgPSBjbGFzcyBGb250CiAKICAgICBf Y29tcHV0ZWRQcm9wZXJ0eVZhbHVlRm9yTmFtZShkb21Ob2RlU3R5bGUsIG5hbWUpCiAgICAgewot ICAgICAgICBjb25zdCBkb250Q3JlYXRlSWZNaXNzaW5nID0gdHJ1ZTsKLSAgICAgICAgcmV0dXJu IGRvbU5vZGVTdHlsZS5jb21wdXRlZFN0eWxlPy5wcm9wZXJ0eUZvck5hbWUobmFtZSwgZG9udENy ZWF0ZUlmTWlzc2luZyk/LnZhbHVlIHx8ICIiOworICAgICAgICByZXR1cm4gZG9tTm9kZVN0eWxl LmNvbXB1dGVkU3R5bGU/LnByb3BlcnR5Rm9yTmFtZShuYW1lKT8udmFsdWUgfHwgIiI7CiAgICAg fQogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvQm94TW9kZWxEZXRhaWxzU2VjdGlvblJvdy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0JveE1vZGVsRGV0YWlsc1NlY3Rpb25Sb3cuanMKaW5kZXgg Mzk4M2Q2ZmZkM2FkLi44NDYyMjI1YmM5NWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0JveE1vZGVsRGV0YWlsc1NlY3Rpb25Sb3cuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQm94TW9kZWxEZXRh aWxzU2VjdGlvblJvdy5qcwpAQCAtODAsOCArODAsNyBAQCBXSS5Cb3hNb2RlbERldGFpbHNTZWN0 aW9uUm93ID0gY2xhc3MgQm94TW9kZWxEZXRhaWxzU2VjdGlvblJvdyBleHRlbmRzIFdJLkRldGFp bAogCiAgICAgX2dldFByb3BlcnR5VmFsdWUoc3R5bGUsIHByb3BlcnR5TmFtZSkKICAgICB7Ci0g ICAgICAgIGNvbnN0IGRvbnRDcmVhdGVJZk1pc3NpbmcgPSB0cnVlOwotICAgICAgICBsZXQgcHJv cGVydHkgPSBzdHlsZS5wcm9wZXJ0eUZvck5hbWUocHJvcGVydHlOYW1lLCBkb250Q3JlYXRlSWZN aXNzaW5nKTsKKyAgICAgICAgbGV0IHByb3BlcnR5ID0gc3R5bGUucHJvcGVydHlGb3JOYW1lKHBy b3BlcnR5TmFtZSk7CiAgICAgICAgIGlmICghcHJvcGVydHkpCiAgICAgICAgICAgICByZXR1cm4g bnVsbDsKICAgICAgICAgcmV0dXJuIHByb3BlcnR5LnZhbHVlOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRTdHlsZVByb3Bl cnR5LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFk c2hlZXRTdHlsZVByb3BlcnR5LmpzCmluZGV4IGMwMzFjMGM5N2E2Ny4uNmU3MmVhNTIwMWI2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJl YWRzaGVldFN0eWxlUHJvcGVydHkuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5LmpzCkBAIC04NzAsOCArODcw LDcgQEAgV0kuU3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5ID0gY2xhc3MgU3ByZWFkc2hlZXRTdHls ZVByb3BlcnR5IGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgICAgICAgICAgICAgIGxldCBjb250 ZW50cyA9IHJhd1Rva2Vucy5zbGljZSgwLCB2YXJpYWJsZU5hbWVJbmRleCArIDEpOwogCiAgICAg ICAgICAgICAgICAgICAgIGlmIChXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVTdHlsZXNK dW1wVG9WYXJpYWJsZURlY2xhcmF0aW9uLnZhbHVlICYmIHRoaXMuX3Byb3BlcnR5Lm93bmVyU3R5 bGUudHlwZSAhPT0gV0kuQ1NTU3R5bGVEZWNsYXJhdGlvbi5UeXBlLkNvbXB1dGVkICYmIHRoaXMu X2RlbGVnYXRlICYmIHRoaXMuX2RlbGVnYXRlLnNwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eVNlbGVj dEJ5UHJvcGVydHkpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGRvbnRDcmVhdGVJ Zk1pc3NpbmcgPSB0cnVlOwotICAgICAgICAgICAgICAgICAgICAgICAgbGV0IGVmZmVjdGl2ZVZh cmlhYmxlUHJvcGVydHkgPSB0aGlzLl9wcm9wZXJ0eS5vd25lclN0eWxlLm5vZGVTdHlsZXMuZWZm ZWN0aXZlUHJvcGVydHlGb3JOYW1lKHJhd1Rva2Vuc1t2YXJpYWJsZU5hbWVJbmRleF0udmFsdWUs IGRvbnRDcmVhdGVJZk1pc3NpbmcpOworICAgICAgICAgICAgICAgICAgICAgICAgbGV0IGVmZmVj dGl2ZVZhcmlhYmxlUHJvcGVydHkgPSB0aGlzLl9wcm9wZXJ0eS5vd25lclN0eWxlLm5vZGVTdHls ZXMuZWZmZWN0aXZlUHJvcGVydHlGb3JOYW1lKHJhd1Rva2Vuc1t2YXJpYWJsZU5hbWVJbmRleF0u dmFsdWUpOwogICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGVmZmVjdGl2ZVZhcmlhYmxlUHJv cGVydHkpIHsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsZXQgYXJyb3dFbGVtZW50ID0g V0kuY3JlYXRlR29Ub0Fycm93QnV0dG9uKCk7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg YXJyb3dFbGVtZW50LmNsYXNzTGlzdC5hZGQoInNlbGVjdC12YXJpYWJsZS1wcm9wZXJ0eSIpOwo= 444424 2021-11-16 13:24:07 -0800 2021-11-16 16:23:28 -0800 Patch patch.txt text/plain 14329 nvasilyev ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2NzAwNTM5MzY1MTIuLjNjYmI2OTliZDdmOCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBA CisyMDIxLTExLTE2ICBOaWtpdGEgVmFzaWx5ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgorCisg ICAgICAgIFdlYiBJbnNwZWN0b3I6IFJlbW92ZSB1bnVzZWQgYGRvbnRDcmVhdGVJZk1pc3Npbmdg IGFyZ3VtZW50IGZyb20gQ1NTU3R5bGVEZWNsYXJhdGlvbi5wcm90b3R5cGUucHJvcGVydHlGb3JO YW1lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzMx OTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGlu c3BlY3Rvci9jc3Mvb3ZlcnJpZGRlbi1wcm9wZXJ0eS5odG1sOgorICAgICAgICAqIGluc3BlY3Rv ci9jc3MvcHNldWRvLWVsZW1lbnQtbWF0Y2hlcy1mb3ItcHNldWRvLWVsZW1lbnQtbm9kZS5odG1s OgorCiAyMDIxLTExLTE1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAg ICAgYENyb3NzLU9yaWdpbi1FbWJlZGRlci1Qb2xpY3k6IHJlcXVpcmUtY29ycGAgcHJldmVudHMg bG9hZGluZyBvZiBkYXRhIFVSTCBpbWFnZXMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9jc3Mvb3ZlcnJpZGRlbi1wcm9wZXJ0eS5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2Nzcy9vdmVycmlkZGVuLXByb3BlcnR5Lmh0bWwKaW5kZXggOGU2MjkyNzY3NjFmLi5lMTM2NzQ2 Y2NhMGUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9jc3Mvb3ZlcnJpZGRlbi1w cm9wZXJ0eS5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jc3Mvb3ZlcnJpZGRlbi1w cm9wZXJ0eS5odG1sCkBAIC05MiwxMSArOTIsMTAgQEAgZnVuY3Rpb24gdGVzdCgpIHsKICAgICAg ICAgbmFtZTogIk92ZXJyaWRkZW5Qcm9wZXJ0eS5PdmVycmlkZGVuQnlTaG9ydGhhbmQiLAogICAg ICAgICB0ZXN0KHJlc29sdmUsIHJlamVjdCkgewogICAgICAgICAgICAgZ2V0U3R5bGVEZWNsYXJh dGlvbigiLmxvbmdoYW5kLW92ZXJyaWRkZW4tYnktc2hvcnRoYW5kIiwgKHN0eWxlKSA9PiB7Ci0g ICAgICAgICAgICAgICAgY29uc3QgZG9udENyZWF0ZUlmTWlzc2luZyA9IHRydWU7Ci0gICAgICAg ICAgICAgICAgbGV0IGJvcmRlclRvcENvbG9yUHJvcGVydHkgPSBzdHlsZS5wcm9wZXJ0eUZvck5h bWUoImJvcmRlci10b3AtY29sb3IiLCBkb250Q3JlYXRlSWZNaXNzaW5nKTsKKyAgICAgICAgICAg ICAgICBsZXQgYm9yZGVyVG9wQ29sb3JQcm9wZXJ0eSA9IHN0eWxlLnByb3BlcnR5Rm9yTmFtZSgi Ym9yZGVyLXRvcC1jb2xvciIpOwogICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0 VHJ1ZShib3JkZXJUb3BDb2xvclByb3BlcnR5Lm92ZXJyaWRkZW4sICJib3JkZXItdG9wLWNvbG9y IGlzIG92ZXJyaWRkZW4uIik7CiAKLSAgICAgICAgICAgICAgICBsZXQgYm9yZGVyQ29sb3JQcm9w ZXJ0eSA9IHN0eWxlLnByb3BlcnR5Rm9yTmFtZSgiYm9yZGVyLWNvbG9yIiwgZG9udENyZWF0ZUlm TWlzc2luZyk7CisgICAgICAgICAgICAgICAgbGV0IGJvcmRlckNvbG9yUHJvcGVydHkgPSBzdHls ZS5wcm9wZXJ0eUZvck5hbWUoImJvcmRlci1jb2xvciIpOwogICAgICAgICAgICAgICAgIEluc3Bl Y3RvclRlc3QuZXhwZWN0RmFsc2UoYm9yZGVyQ29sb3JQcm9wZXJ0eS5vdmVycmlkZGVuLCAiYm9y ZGVyLWNvbG9yIGlzIE5PVCBvdmVycmlkZGVuLiIpOwogCiAgICAgICAgICAgICAgICAgcmVzb2x2 ZSgpOwpAQCAtMTA4LDExICsxMDcsMTAgQEAgZnVuY3Rpb24gdGVzdCgpIHsKICAgICAgICAgbmFt ZTogIk92ZXJyaWRkZW5Qcm9wZXJ0eS5PdmVycmlkZGVuQnlJbXBvcnRhbnRTaG9ydGhhbmQiLAog ICAgICAgICB0ZXN0KHJlc29sdmUsIHJlamVjdCkgewogICAgICAgICAgICAgZ2V0U3R5bGVEZWNs YXJhdGlvbigiLmxvbmdoYW5kLW92ZXJyaWRkZW4tYnktaW1wb3J0YW50LXNob3J0aGFuZCIsIChz dHlsZSkgPT4gewotICAgICAgICAgICAgICAgIGNvbnN0IGRvbnRDcmVhdGVJZk1pc3NpbmcgPSB0 cnVlOwotICAgICAgICAgICAgICAgIGxldCBib3JkZXJDb2xvclByb3BlcnR5ID0gc3R5bGUucHJv cGVydHlGb3JOYW1lKCJib3JkZXItY29sb3IiLCBkb250Q3JlYXRlSWZNaXNzaW5nKTsKKyAgICAg ICAgICAgICAgICBsZXQgYm9yZGVyQ29sb3JQcm9wZXJ0eSA9IHN0eWxlLnByb3BlcnR5Rm9yTmFt ZSgiYm9yZGVyLWNvbG9yIik7CiAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RG YWxzZShib3JkZXJDb2xvclByb3BlcnR5Lm92ZXJyaWRkZW4sICJib3JkZXItY29sb3IgaXMgTk9U IG92ZXJyaWRkZW4uIik7CiAKLSAgICAgICAgICAgICAgICBsZXQgYm9yZGVyVG9wQ29sb3JQcm9w ZXJ0eSA9IHN0eWxlLnByb3BlcnR5Rm9yTmFtZSgiYm9yZGVyLXRvcC1jb2xvciIsIGRvbnRDcmVh dGVJZk1pc3NpbmcpOworICAgICAgICAgICAgICAgIGxldCBib3JkZXJUb3BDb2xvclByb3BlcnR5 ID0gc3R5bGUucHJvcGVydHlGb3JOYW1lKCJib3JkZXItdG9wLWNvbG9yIik7CiAgICAgICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUcnVlKGJvcmRlclRvcENvbG9yUHJvcGVydHkub3Zl cnJpZGRlbiwgImJvcmRlci10b3AtY29sb3IgaXMgb3ZlcnJpZGRlbi4iKTsKIAogICAgICAgICAg ICAgICAgIHJlc29sdmUoKTsKQEAgLTEyNCwxMSArMTIyLDEwIEBAIGZ1bmN0aW9uIHRlc3QoKSB7 CiAgICAgICAgIG5hbWU6ICJPdmVycmlkZGVuUHJvcGVydHkuTm90T3ZlcnJpZGRlbkJ5SW1wb3J0 YW50TG9uZ2hhbmQiLAogICAgICAgICB0ZXN0KHJlc29sdmUsIHJlamVjdCkgewogICAgICAgICAg ICAgZ2V0U3R5bGVEZWNsYXJhdGlvbigiLnNob3J0aGFuZC1vdmVycmlkZGVuLWJ5LWltcG9ydGFu dC1sb25naGFuZCIsIChzdHlsZSkgPT4gewotICAgICAgICAgICAgICAgIGNvbnN0IGRvbnRDcmVh dGVJZk1pc3NpbmcgPSB0cnVlOwotICAgICAgICAgICAgICAgIGxldCBib3JkZXJUb3BDb2xvclBy b3BlcnR5ID0gc3R5bGUucHJvcGVydHlGb3JOYW1lKCJib3JkZXItdG9wLWNvbG9yIiwgZG9udENy ZWF0ZUlmTWlzc2luZyk7CisgICAgICAgICAgICAgICAgbGV0IGJvcmRlclRvcENvbG9yUHJvcGVy dHkgPSBzdHlsZS5wcm9wZXJ0eUZvck5hbWUoImJvcmRlci10b3AtY29sb3IiKTsKICAgICAgICAg ICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEZhbHNlKGJvcmRlclRvcENvbG9yUHJvcGVydHku b3ZlcnJpZGRlbiwgImJvcmRlci10b3AtY29sb3IgaXMgTk9UIG92ZXJyaWRkZW4uIik7CiAKLSAg ICAgICAgICAgICAgICBsZXQgYm9yZGVyQ29sb3JQcm9wZXJ0eSA9IHN0eWxlLnByb3BlcnR5Rm9y TmFtZSgiYm9yZGVyLWNvbG9yIiwgZG9udENyZWF0ZUlmTWlzc2luZyk7CisgICAgICAgICAgICAg ICAgbGV0IGJvcmRlckNvbG9yUHJvcGVydHkgPSBzdHlsZS5wcm9wZXJ0eUZvck5hbWUoImJvcmRl ci1jb2xvciIpOwogICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RmFsc2UoYm9y ZGVyQ29sb3JQcm9wZXJ0eS5vdmVycmlkZGVuLCAiYm9yZGVyLWNvbG9yIGlzIE5PVCBvdmVycmlk ZGVuLiIpOwogCiAgICAgICAgICAgICAgICAgcmVzb2x2ZSgpOwpAQCAtMTQwLDExICsxMzcsMTAg QEAgZnVuY3Rpb24gdGVzdCgpIHsKICAgICAgICAgbmFtZTogIk92ZXJyaWRkZW5Qcm9wZXJ0eS5O b3RPdmVycmlkZGVuQnlMb25naGFuZCIsCiAgICAgICAgIHRlc3QocmVzb2x2ZSwgcmVqZWN0KSB7 CiAgICAgICAgICAgICBnZXRTdHlsZURlY2xhcmF0aW9uKCIuc2hvcnRoYW5kLW5vdC1vdmVycmlk ZGVuLWJ5LWxvbmdoYW5kIiwgKHN0eWxlKSA9PiB7Ci0gICAgICAgICAgICAgICAgY29uc3QgZG9u dENyZWF0ZUlmTWlzc2luZyA9IHRydWU7Ci0gICAgICAgICAgICAgICAgbGV0IGJvcmRlckNvbG9y UHJvcGVydHkgPSBzdHlsZS5wcm9wZXJ0eUZvck5hbWUoImJvcmRlci1jb2xvciIsIGRvbnRDcmVh dGVJZk1pc3NpbmcpOworICAgICAgICAgICAgICAgIGxldCBib3JkZXJDb2xvclByb3BlcnR5ID0g c3R5bGUucHJvcGVydHlGb3JOYW1lKCJib3JkZXItY29sb3IiKTsKICAgICAgICAgICAgICAgICBJ bnNwZWN0b3JUZXN0LmV4cGVjdEZhbHNlKGJvcmRlckNvbG9yUHJvcGVydHkub3ZlcnJpZGRlbiwg ImJvcmRlci1jb2xvciBpcyBOT1Qgb3ZlcnJpZGRlbi4iKTsKIAotICAgICAgICAgICAgICAgIGxl dCBib3JkZXJUb3BDb2xvclByb3BlcnR5ID0gc3R5bGUucHJvcGVydHlGb3JOYW1lKCJib3JkZXIt dG9wLWNvbG9yIiwgZG9udENyZWF0ZUlmTWlzc2luZyk7CisgICAgICAgICAgICAgICAgbGV0IGJv cmRlclRvcENvbG9yUHJvcGVydHkgPSBzdHlsZS5wcm9wZXJ0eUZvck5hbWUoImJvcmRlci10b3At Y29sb3IiKTsKICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEZhbHNlKGJvcmRl clRvcENvbG9yUHJvcGVydHkub3ZlcnJpZGRlbiwgImJvcmRlci10b3AtY29sb3IgaXMgTk9UIG92 ZXJyaWRkZW4uIik7CiAKICAgICAgICAgICAgICAgICByZXNvbHZlKCk7CkBAIC0xNTYsMTEgKzE1 MiwxMCBAQCBmdW5jdGlvbiB0ZXN0KCkgewogICAgICAgICBuYW1lOiAiT3ZlcnJpZGRlblByb3Bl cnR5Lk1peGVkQ2FzZVZhcmlhYmxlc05vdE92ZXJyaWRkZW4iLAogICAgICAgICB0ZXN0KHJlc29s dmUsIHJlamVjdCkgewogICAgICAgICAgICAgZ2V0U3R5bGVEZWNsYXJhdGlvbigiLm1peGVkLWNh c2UtdmFyaWFibGVzLW5vdC1vdmVycmlkZGVuIiwgKHN0eWxlKSA9PiB7Ci0gICAgICAgICAgICAg ICAgY29uc3QgZG9udENyZWF0ZUlmTWlzc2luZyA9IHRydWU7Ci0gICAgICAgICAgICAgICAgbGV0 IGxvd2VyY2FzZVZhcmlhYmxlUHJvcGVydHkgPSBzdHlsZS5wcm9wZXJ0eUZvck5hbWUoIi0tZm9v IiwgZG9udENyZWF0ZUlmTWlzc2luZyk7CisgICAgICAgICAgICAgICAgbGV0IGxvd2VyY2FzZVZh cmlhYmxlUHJvcGVydHkgPSBzdHlsZS5wcm9wZXJ0eUZvck5hbWUoIi0tZm9vIik7CiAgICAgICAg ICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RGYWxzZShsb3dlcmNhc2VWYXJpYWJsZVByb3Bl cnR5Lm92ZXJyaWRkZW4sICJgLS1mb29gIGlzIE5PVCBvdmVycmlkZGVuLiIpOwogCi0gICAgICAg ICAgICAgICAgbGV0IHVwcGVyY2FzZVZhcmlhYmxlUHJvcGVydHkgPSBzdHlsZS5wcm9wZXJ0eUZv ck5hbWUoIi0tRk9PIiwgZG9udENyZWF0ZUlmTWlzc2luZyk7CisgICAgICAgICAgICAgICAgbGV0 IHVwcGVyY2FzZVZhcmlhYmxlUHJvcGVydHkgPSBzdHlsZS5wcm9wZXJ0eUZvck5hbWUoIi0tRk9P Iik7CiAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RGYWxzZSh1cHBlcmNhc2VW YXJpYWJsZVByb3BlcnR5Lm92ZXJyaWRkZW4sICJgLS1GT09gIGlzIE5PVCBvdmVycmlkZGVuLiIp OwogCiAgICAgICAgICAgICAgICAgcmVzb2x2ZSgpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL2Nzcy9wc2V1ZG8tZWxlbWVudC1tYXRjaGVzLWZvci1wc2V1ZG8tZWxlbWVudC1u b2RlLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY3NzL3BzZXVkby1lbGVtZW50LW1hdGNo ZXMtZm9yLXBzZXVkby1lbGVtZW50LW5vZGUuaHRtbAppbmRleCBlODc3NWEwZWQzZTQuLmRhNzdk YTBhZWMwNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Nzcy9wc2V1ZG8tZWxl bWVudC1tYXRjaGVzLWZvci1wc2V1ZG8tZWxlbWVudC1ub2RlLmh0bWwKKysrIGIvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2Nzcy9wc2V1ZG8tZWxlbWVudC1tYXRjaGVzLWZvci1wc2V1ZG8tZWxlbWVu dC1ub2RlLmh0bWwKQEAgLTE3LDggKzE3LDcgQEAgZnVuY3Rpb24gdGVzdCgpIHsKICAgICAgICAg SW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KG5vZGVTdHlsZXMuY29tcHV0ZWRTdHlsZSwgIkhhcyBD b21wdXRlZCBTdHlsZXMiKTsKIAogICAgICAgICBmdW5jdGlvbiBsb2dQcm9wZXJ0eShwcm9wZXJ0 eU5hbWUpIHsKLSAgICAgICAgICAgIGNvbnN0IGRvbnRDcmVhdGVJZk1pc3NpbmcgPSB0cnVlOwot ICAgICAgICAgICAgbGV0IHByb3BlcnR5ID0gbm9kZVN0eWxlcy5jb21wdXRlZFN0eWxlLnByb3Bl cnR5Rm9yTmFtZShwcm9wZXJ0eU5hbWUsIGRvbnRDcmVhdGVJZk1pc3NpbmcpOworICAgICAgICAg ICAgbGV0IHByb3BlcnR5ID0gbm9kZVN0eWxlcy5jb21wdXRlZFN0eWxlLnByb3BlcnR5Rm9yTmFt ZShwcm9wZXJ0eU5hbWUpOwogICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5sb2coYFBST1BFUlRZ OiAke3Byb3BlcnR5Lm5hbWV9OiAke3Byb3BlcnR5LnZhbHVlfTtgKTsKICAgICAgICAgfQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYklu c3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBmZDM3MWNkMjRlNDUuLmQzYmY0MWRjYmE2MiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMjEtMTEtMTYgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogUmVtb3ZlIHVudXNlZCBgZG9udENyZWF0ZUlmTWlzc2luZ2AgYXJndW1lbnQgZnJvbSBDU1NT dHlsZURlY2xhcmF0aW9uLnByb3RvdHlwZS5wcm9wZXJ0eUZvck5hbWUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzE5OAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGBkb250Q3JlYXRlSWZNaXNzaW5nYCB3 YXMgYWx3YXlzIHNldCB0byBgdHJ1ZWAuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVs cy9DU1NTdHlsZURlY2xhcmF0aW9uLmpzOgorICAgICAgICAoV0kuQ1NTU3R5bGVEZWNsYXJhdGlv bi5wcm90b3R5cGUucHJvcGVydHlGb3JOYW1lKToKKyAgICAgICAgRHJpdmUtYnk6IGlubGluZSBm aW5kTWF0Y2ggZnVuY3Rpb24sIHdoaWNoIHdhcyBvbmx5IHVzZWQgb25jZS4KKworICAgICAgICAq IFVzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTU5vZGVTdHlsZXMuanM6CisgICAgICAgIChXSS5ET01O b2RlU3R5bGVzLnByb3RvdHlwZS5fcGFyc2VTdHlsZVByb3BlcnR5UGF5bG9hZCk6CisgICAgICAg ICogVXNlckludGVyZmFjZS9Nb2RlbHMvRm9udC5qczoKKyAgICAgICAgKFdJLkZvbnQpOgorICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQm94TW9kZWxEZXRhaWxzU2VjdGlvblJvdy5qczoK KyAgICAgICAgKFdJLkJveE1vZGVsRGV0YWlsc1NlY3Rpb25Sb3cucHJvdG90eXBlLl9nZXRQcm9w ZXJ0eVZhbHVlKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0U3R5 bGVQcm9wZXJ0eS5qczoKKyAgICAgICAgKFdJLlNwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eS5wcm90 b3R5cGUuX2FkZFZhcmlhYmxlVG9rZW5zKToKKwogMjAyMS0xMS0xMiAgUmF6dmFuIENhbGltYW4g IDxyY2FsaW1hbkBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogRXh0cmFjdCBy ZXVzYWJsZSBsb2dpYyBmcm9tIFJlc291cmNlUXVlcnlDb250cm9sbGVyLCBSZXNvdXJjZVF1ZXJ5 UmVzdWx0IGFuZCBSZXNvdXJjZVF1ZXJ5TWF0Y2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9DU1NTdHlsZURlY2xhcmF0aW9uLmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NTU1N0eWxlRGVjbGFyYXRp b24uanMKaW5kZXggZWZiZjRhYWYxYjA0Li5iMmExM2FmMjViNDYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9DU1NTdHlsZURlY2xhcmF0aW9u LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9DU1NT dHlsZURlY2xhcmF0aW9uLmpzCkBAIC0zMDEsNyArMzAxLDcgQEAgV0kuQ1NTU3R5bGVEZWNsYXJh dGlvbiA9IGNsYXNzIENTU1N0eWxlRGVjbGFyYXRpb24gZXh0ZW5kcyBXSS5PYmplY3QKICAgICAg ICAgcmV0dXJuIHRoaXMuX25vZGUuYXBwcm9wcmlhdGVTZWxlY3RvckZvcih0cnVlKTsKICAgICB9 CiAKLSAgICBwcm9wZXJ0eUZvck5hbWUobmFtZSwgZG9udENyZWF0ZUlmTWlzc2luZykKKyAgICBw cm9wZXJ0eUZvck5hbWUobmFtZSkKICAgICB7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KG5hbWUp OwogICAgICAgICBpZiAoIW5hbWUpCkBAIC0zMTMsMzkgKzMxMywxNiBAQCBXSS5DU1NTdHlsZURl Y2xhcmF0aW9uID0gY2xhc3MgQ1NTU3R5bGVEZWNsYXJhdGlvbiBleHRlbmRzIFdJLk9iamVjdAog ICAgICAgICAvLyBFZGl0YWJsZSBzdHlsZXMgZG9uJ3QgdXNlIHRoZSBtYXAgc2luY2UgdGhleSBu ZWVkIHRvCiAgICAgICAgIC8vIGFjY291bnQgZm9yIG92ZXJyaWRkZW4gcHJvcGVydGllcy4KIAot ICAgICAgICBmdW5jdGlvbiBmaW5kTWF0Y2gocHJvcGVydGllcykKLSAgICAgICAgewotICAgICAg ICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBwcm9wZXJ0aWVzLmxlbmd0aDsgKytpKSB7Ci0gICAg ICAgICAgICAgICAgdmFyIHByb3BlcnR5ID0gcHJvcGVydGllc1tpXTsKLSAgICAgICAgICAgICAg ICBpZiAocHJvcGVydHkuY2Fub25pY2FsTmFtZSAhPT0gbmFtZSAmJiBwcm9wZXJ0eS5uYW1lICE9 PSBuYW1lKQotICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgICAgICBp ZiAoYmVzdE1hdGNoUHJvcGVydHkgJiYgIWJlc3RNYXRjaFByb3BlcnR5Lm92ZXJyaWRkZW4gJiYg cHJvcGVydHkub3ZlcnJpZGRlbikKLSAgICAgICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAg ICAgICAgICAgICAgYmVzdE1hdGNoUHJvcGVydHkgPSBwcm9wZXJ0eTsKLSAgICAgICAgICAgIH0K KyAgICAgICAgbGV0IGJlc3RNYXRjaFByb3BlcnR5ID0gbnVsbDsKKyAgICAgICAgZm9yIChsZXQg cHJvcGVydHkgb2YgdGhpcy5lbmFibGVkUHJvcGVydGllcykgeworICAgICAgICAgICAgaWYgKHBy b3BlcnR5LmNhbm9uaWNhbE5hbWUgIT09IG5hbWUgJiYgcHJvcGVydHkubmFtZSAhPT0gbmFtZSkK KyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIGlmIChiZXN0TWF0Y2hQcm9w ZXJ0eSAmJiAhYmVzdE1hdGNoUHJvcGVydHkub3ZlcnJpZGRlbiAmJiBwcm9wZXJ0eS5vdmVycmlk ZGVuKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgYmVzdE1hdGNoUHJv cGVydHkgPSBwcm9wZXJ0eTsKICAgICAgICAgfQogCi0gICAgICAgIHZhciBiZXN0TWF0Y2hQcm9w ZXJ0eSA9IG51bGw7Ci0KLSAgICAgICAgZmluZE1hdGNoKHRoaXMuZW5hYmxlZFByb3BlcnRpZXMp OwotCi0gICAgICAgIGlmIChiZXN0TWF0Y2hQcm9wZXJ0eSkKLSAgICAgICAgICAgIHJldHVybiBi ZXN0TWF0Y2hQcm9wZXJ0eTsKLQotICAgICAgICBpZiAoZG9udENyZWF0ZUlmTWlzc2luZyB8fCAh dGhpcy5lZGl0YWJsZSkKLSAgICAgICAgICAgIHJldHVybiBudWxsOwotCi0gICAgICAgIGZpbmRN YXRjaCh0aGlzLl9wZW5kaW5nUHJvcGVydGllcywgdHJ1ZSk7Ci0KLSAgICAgICAgaWYgKGJlc3RN YXRjaFByb3BlcnR5KQotICAgICAgICAgICAgcmV0dXJuIGJlc3RNYXRjaFByb3BlcnR5OwotCi0g ICAgICAgIHZhciBuZXdQcm9wZXJ0eSA9IG5ldyBXSS5DU1NQcm9wZXJ0eShOYU4sIG51bGwsIG5h bWUpOwotICAgICAgICBuZXdQcm9wZXJ0eS5vd25lclN0eWxlID0gdGhpczsKLQotICAgICAgICB0 aGlzLl9wZW5kaW5nUHJvcGVydGllcy5wdXNoKG5ld1Byb3BlcnR5KTsKLQotICAgICAgICByZXR1 cm4gbmV3UHJvcGVydHk7CisgICAgICAgIHJldHVybiBiZXN0TWF0Y2hQcm9wZXJ0eTsKICAgICB9 CiAKICAgICByZXNvbHZlVmFyaWFibGVWYWx1ZSh0ZXh0KQpAQCAtMzg1LDcgKzM2Miw3IEBAIFdJ LkNTU1N0eWxlRGVjbGFyYXRpb24gPSBjbGFzcyBDU1NTdHlsZURlY2xhcmF0aW9uIGV4dGVuZHMg V0kuT2JqZWN0CiAgICAgICAgICAgICAgICAgICAgIGlmICh2YXJpYWJsZU5hbWVJbmRleCA9PT0g LTEpCiAgICAgICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAgICAgICAgICAg ICAgICBsZXQgdmFyaWFibGVQcm9wZXJ0eSA9IHRoaXMucHJvcGVydHlGb3JOYW1lKHZhcmlhYmxl VG9rZW5zW3ZhcmlhYmxlTmFtZUluZGV4XS52YWx1ZSwgdHJ1ZSk7CisgICAgICAgICAgICAgICAg ICAgIGxldCB2YXJpYWJsZVByb3BlcnR5ID0gdGhpcy5wcm9wZXJ0eUZvck5hbWUodmFyaWFibGVU b2tlbnNbdmFyaWFibGVOYW1lSW5kZXhdLnZhbHVlKTsKICAgICAgICAgICAgICAgICAgICAgaWYg KHZhcmlhYmxlUHJvcGVydHkpCiAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gdmFyaWFi bGVQcm9wZXJ0eS52YWx1ZS50cmltKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2RlU3R5bGVzLmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTU5vZGVTdHlsZXMuanMKaW5kZXggMDU4 MWZlYjhmMjI3Li5kNDRhYjM0MjQ4M2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2RlU3R5bGVzLmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2RlU3R5bGVzLmpzCkBAIC01NDUs NyArNTQ1LDcgQEAgV0kuRE9NTm9kZVN0eWxlcyA9IGNsYXNzIERPTU5vZGVTdHlsZXMgZXh0ZW5k cyBXSS5PYmplY3QKIAogICAgICAgICBpZiAoc3R5bGVEZWNsYXJhdGlvbikgewogICAgICAgICAg ICAgLy8gVXNlIHByb3BlcnR5Rm9yTmFtZSB3aGVuIHRoZSBpbmRleCBpcyBOYU4gc2luY2UgcHJv cGVydHlGb3JOYW1lIGlzIGZhc3QgaW4gdGhhdCBjYXNlLgotICAgICAgICAgICAgdmFyIHByb3Bl cnR5ID0gaXNOYU4oaW5kZXgpID8gc3R5bGVEZWNsYXJhdGlvbi5wcm9wZXJ0eUZvck5hbWUobmFt ZSwgdHJ1ZSkgOiBzdHlsZURlY2xhcmF0aW9uLmVuYWJsZWRQcm9wZXJ0aWVzW2luZGV4XTsKKyAg ICAgICAgICAgIHZhciBwcm9wZXJ0eSA9IGlzTmFOKGluZGV4KSA/IHN0eWxlRGVjbGFyYXRpb24u cHJvcGVydHlGb3JOYW1lKG5hbWUpIDogc3R5bGVEZWNsYXJhdGlvbi5lbmFibGVkUHJvcGVydGll c1tpbmRleF07CiAKICAgICAgICAgICAgIC8vIFJldXNlIGEgcHJvcGVydHkgaWYgdGhlIGluZGV4 IGFuZCBuYW1lIG1hdGNoZXMuIE90aGVyd2lzZSBpdCBpcyBhIGRpZmZlcmVudCBwcm9wZXJ0eQog ICAgICAgICAgICAgLy8gYW5kIHNob3VsZCBiZSBjcmVhdGVkIGZyb20gc2NyYXRjaC4gVGhpcyB3 b3JrcyBpbiB0aGUgc2ltcGxlIGNhc2VzIHdoZXJlIG9ubHkgZXhpc3RpbmcKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9Gb250LmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0ZvbnQuanMKaW5kZXggYzI3 OWFlNjAxZGNmLi5hZWJhNDBhYTc0OWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL01vZGVscy9Gb250LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL01vZGVscy9Gb250LmpzCkBAIC0yMDYsOCArMjA2LDcgQEAgV0kuRm9u dCA9IGNsYXNzIEZvbnQKIAogICAgIF9jb21wdXRlZFByb3BlcnR5VmFsdWVGb3JOYW1lKGRvbU5v ZGVTdHlsZSwgbmFtZSkKICAgICB7Ci0gICAgICAgIGNvbnN0IGRvbnRDcmVhdGVJZk1pc3Npbmcg PSB0cnVlOwotICAgICAgICByZXR1cm4gZG9tTm9kZVN0eWxlLmNvbXB1dGVkU3R5bGU/LnByb3Bl cnR5Rm9yTmFtZShuYW1lLCBkb250Q3JlYXRlSWZNaXNzaW5nKT8udmFsdWUgfHwgIiI7CisgICAg ICAgIHJldHVybiBkb21Ob2RlU3R5bGUuY29tcHV0ZWRTdHlsZT8ucHJvcGVydHlGb3JOYW1lKG5h bWUpPy52YWx1ZSB8fCAiIjsKICAgICB9CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Cb3hNb2RlbERldGFpbHNTZWN0aW9uUm93Lmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQm94TW9kZWxEZXRh aWxzU2VjdGlvblJvdy5qcwppbmRleCAzOTgzZDZmZmQzYWQuLjg0NjIyMjViYzk1YSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQm94TW9kZWxE ZXRhaWxzU2VjdGlvblJvdy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9Cb3hNb2RlbERldGFpbHNTZWN0aW9uUm93LmpzCkBAIC04MCw4ICs4MCw3IEBA IFdJLkJveE1vZGVsRGV0YWlsc1NlY3Rpb25Sb3cgPSBjbGFzcyBCb3hNb2RlbERldGFpbHNTZWN0 aW9uUm93IGV4dGVuZHMgV0kuRGV0YWlsCiAKICAgICBfZ2V0UHJvcGVydHlWYWx1ZShzdHlsZSwg cHJvcGVydHlOYW1lKQogICAgIHsKLSAgICAgICAgY29uc3QgZG9udENyZWF0ZUlmTWlzc2luZyA9 IHRydWU7Ci0gICAgICAgIGxldCBwcm9wZXJ0eSA9IHN0eWxlLnByb3BlcnR5Rm9yTmFtZShwcm9w ZXJ0eU5hbWUsIGRvbnRDcmVhdGVJZk1pc3NpbmcpOworICAgICAgICBsZXQgcHJvcGVydHkgPSBz dHlsZS5wcm9wZXJ0eUZvck5hbWUocHJvcGVydHlOYW1lKTsKICAgICAgICAgaWYgKCFwcm9wZXJ0 eSkKICAgICAgICAgICAgIHJldHVybiBudWxsOwogICAgICAgICByZXR1cm4gcHJvcGVydHkudmFs dWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9TcHJlYWRzaGVldFN0eWxlUHJvcGVydHkuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFN0eWxlUHJvcGVydHkuanMKaW5kZXggYzAzMWMw Yzk3YTY3Li42ZTcyZWE1MjAxYjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eS5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFN0eWxlUHJv cGVydHkuanMKQEAgLTg3MCw4ICs4NzAsNyBAQCBXSS5TcHJlYWRzaGVldFN0eWxlUHJvcGVydHkg PSBjbGFzcyBTcHJlYWRzaGVldFN0eWxlUHJvcGVydHkgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAg ICAgICAgICAgICAgICAgbGV0IGNvbnRlbnRzID0gcmF3VG9rZW5zLnNsaWNlKDAsIHZhcmlhYmxl TmFtZUluZGV4ICsgMSk7CiAKICAgICAgICAgICAgICAgICAgICAgaWYgKFdJLnNldHRpbmdzLmV4 cGVyaW1lbnRhbEVuYWJsZVN0eWxlc0p1bXBUb1ZhcmlhYmxlRGVjbGFyYXRpb24udmFsdWUgJiYg dGhpcy5fcHJvcGVydHkub3duZXJTdHlsZS50eXBlICE9PSBXSS5DU1NTdHlsZURlY2xhcmF0aW9u LlR5cGUuQ29tcHV0ZWQgJiYgdGhpcy5fZGVsZWdhdGUgJiYgdGhpcy5fZGVsZWdhdGUuc3ByZWFk c2hlZXRTdHlsZVByb3BlcnR5U2VsZWN0QnlQcm9wZXJ0eSkgewotICAgICAgICAgICAgICAgICAg ICAgICAgY29uc3QgZG9udENyZWF0ZUlmTWlzc2luZyA9IHRydWU7Ci0gICAgICAgICAgICAgICAg ICAgICAgICBsZXQgZWZmZWN0aXZlVmFyaWFibGVQcm9wZXJ0eSA9IHRoaXMuX3Byb3BlcnR5Lm93 bmVyU3R5bGUubm9kZVN0eWxlcy5lZmZlY3RpdmVQcm9wZXJ0eUZvck5hbWUocmF3VG9rZW5zW3Zh cmlhYmxlTmFtZUluZGV4XS52YWx1ZSwgZG9udENyZWF0ZUlmTWlzc2luZyk7CisgICAgICAgICAg ICAgICAgICAgICAgICBsZXQgZWZmZWN0aXZlVmFyaWFibGVQcm9wZXJ0eSA9IHRoaXMuX3Byb3Bl cnR5Lm93bmVyU3R5bGUubm9kZVN0eWxlcy5lZmZlY3RpdmVQcm9wZXJ0eUZvck5hbWUocmF3VG9r ZW5zW3ZhcmlhYmxlTmFtZUluZGV4XS52YWx1ZSk7CiAgICAgICAgICAgICAgICAgICAgICAgICBp ZiAoZWZmZWN0aXZlVmFyaWFibGVQcm9wZXJ0eSkgewogICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGxldCBhcnJvd0VsZW1lbnQgPSBXSS5jcmVhdGVHb1RvQXJyb3dCdXR0b24oKTsKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBhcnJvd0VsZW1lbnQuY2xhc3NMaXN0LmFkZCgic2VsZWN0 LXZhcmlhYmxlLXByb3BlcnR5Iik7Cg==