142374 2015-03-05 17:26:38 -0800 Web Inspector: Adopt Object Literal Shorthand Property Construction Syntax 2015-03-06 14:47:35 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck burg ggaren graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1074770 0 joepeck 2015-03-05 17:26:38 -0800 * SUMMARY Adopt Object Literal Shorthand Property Construction Syntax. 1074772 1 248024 joepeck 2015-03-05 17:28:58 -0800 Created attachment 248024 [PATCH] Proposed Fix Been living on this all day and I've seen no issues. 1074787 2 248024 timothy 2015-03-05 18:21:42 -0800 Comment on attachment 248024 [PATCH] Proposed Fix Hot! 1075103 3 joepeck 2015-03-06 14:47:35 -0800 <http://trac.webkit.org/changeset/181185> 248024 2015-03-05 17:28:58 -0800 2015-03-05 18:21:42 -0800 [PATCH] Proposed Fix adopt.patch text/plain 73420 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDU2ZDBlMzguLjA5MmU3OWMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE0IEBACiAyMDE1LTAzLTA1ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQWRvcHQg T2JqZWN0IExpdGVyYWwgU2hvcnRoYW5kIFByb3BlcnR5IENvbnN0cnVjdGlvbiBTeW50YXgKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjM3NAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9y L0luamVjdGVkU2NyaXB0U291cmNlLmpzOgorCisyMDE1LTAzLTA1ICBKb3NlcGggUGVjb3Jhcm8g IDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAgICAgICAgRVM2OiBPYmplY3QgTGl0ZXJhbCBFeHRl bnNpb25zIC0gU2hvcnRoYW5kIFByb3BlcnRpZXMgKElkZW50aWZpZXJzKQogICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyMzUzCiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2UuanMg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0U291cmNlLmpz CmluZGV4IDhiMzYyZmUuLmI0YjdhZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2UuanMKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJjZS5qcwpAQCAtNjA1LDEyICs2MDUs MTIgQEAgSW5qZWN0ZWRTY3JpcHQucHJvdG90eXBlID0gewogICAgICAgICBmdW5jdGlvbiBjcmVh dGVGYWtlVmFsdWVEZXNjcmlwdG9yKG5hbWUsIGRlc2NyaXB0b3IsIGlzT3duUHJvcGVydHksIHBv c3NpYmxlTmF0aXZlQmluZGluZ0dldHRlcikKICAgICAgICAgewogICAgICAgICAgICAgdHJ5IHsK LSAgICAgICAgICAgICAgICB2YXIgZGVzY3JpcHRvciA9IHtuYW1lOiBuYW1lLCB2YWx1ZTogb2Jq ZWN0W25hbWVdLCB3cml0YWJsZTogZGVzY3JpcHRvci53cml0YWJsZSB8fCBmYWxzZSwgY29uZmln dXJhYmxlOiBkZXNjcmlwdG9yLmNvbmZpZ3VyYWJsZSB8fCBmYWxzZSwgZW51bWVyYWJsZTogZGVz Y3JpcHRvci5lbnVtZXJhYmxlIHx8IGZhbHNlfTsKKyAgICAgICAgICAgICAgICB2YXIgZGVzY3Jp cHRvciA9IHtuYW1lLCB2YWx1ZTogb2JqZWN0W25hbWVdLCB3cml0YWJsZTogZGVzY3JpcHRvci53 cml0YWJsZSB8fCBmYWxzZSwgY29uZmlndXJhYmxlOiBkZXNjcmlwdG9yLmNvbmZpZ3VyYWJsZSB8 fCBmYWxzZSwgZW51bWVyYWJsZTogZGVzY3JpcHRvci5lbnVtZXJhYmxlIHx8IGZhbHNlfTsKICAg ICAgICAgICAgICAgICBpZiAocG9zc2libGVOYXRpdmVCaW5kaW5nR2V0dGVyKQogICAgICAgICAg ICAgICAgICAgICBkZXNjcmlwdG9yLm5hdGl2ZUdldHRlciA9IHRydWU7CiAgICAgICAgICAgICAg ICAgcmV0dXJuIGRlc2NyaXB0b3I7CiAgICAgICAgICAgICB9IGNhdGNoIChlKSB7Ci0gICAgICAg ICAgICAgICAgdmFyIGVycm9yRGVzY3JpcHRvciA9IHtuYW1lOiBuYW1lLCB2YWx1ZTogZSwgd2Fz VGhyb3duOiB0cnVlfTsKKyAgICAgICAgICAgICAgICB2YXIgZXJyb3JEZXNjcmlwdG9yID0ge25h bWUsIHZhbHVlOiBlLCB3YXNUaHJvd246IHRydWV9OwogICAgICAgICAgICAgICAgIGlmIChpc093 blByb3BlcnR5KQogICAgICAgICAgICAgICAgICAgICBlcnJvckRlc2NyaXB0b3IuaXNPd24gPSB0 cnVlOwogICAgICAgICAgICAgICAgIHJldHVybiBlcnJvckRlc2NyaXB0b3I7CkBAIC03OTUsNyAr Nzk1LDcgQEAgSW5qZWN0ZWRTY3JpcHQucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIGNv bnRpbnVlOwogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICBlbnRyaWVzLnB1c2goe3ZhbHVl OiB2YWx1ZX0pOworICAgICAgICAgICAgZW50cmllcy5wdXNoKHt2YWx1ZX0pOwogCiAgICAgICAg ICAgICBpZiAobnVtYmVyVG9GZXRjaCAmJiBlbnRyaWVzLmxlbmd0aCA9PT0gbnVtYmVyVG9GZXRj aCkKICAgICAgICAgICAgICAgICBicmVhazsKQEAgLTgxNCw3ICs4MTQsNyBAQCBJbmplY3RlZFNj cmlwdC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAg ICB9CiAKLSAgICAgICAgICAgIGVudHJpZXMucHVzaCh7a2V5OiBrZXksIHZhbHVlOiB2YWx1ZX0p OworICAgICAgICAgICAgZW50cmllcy5wdXNoKHtrZXksIHZhbHVlfSk7CiAKICAgICAgICAgICAg IGlmIChudW1iZXJUb0ZldGNoICYmIGVudHJpZXMubGVuZ3RoID09PSBudW1iZXJUb0ZldGNoKQog ICAgICAgICAgICAgICAgIGJyZWFrOwpAQCAtMTAyMiwxNCArMTAyMiwxNCBAQCBJbmplY3RlZFNj cmlwdC5SZW1vdGVPYmplY3QucHJvdG90eXBlID0gewogICAgICAgICAgICAgLy8gR2V0dGVyL3Nl dHRlci4KICAgICAgICAgICAgIGlmICghKCJ2YWx1ZSIgaW4gZGVzY3JpcHRvcikpIHsKICAgICAg ICAgICAgICAgICBwcmV2aWV3Lmxvc3NsZXNzID0gZmFsc2U7Ci0gICAgICAgICAgICAgICAgdGhp cy5fYXBwZW5kUHJvcGVydHlQcmV2aWV3KHByZXZpZXcsIGludGVybmFsLCB7bmFtZTogbmFtZSwg dHlwZTogImFjY2Vzc29yIn0sIHByb3BlcnRpZXNUaHJlc2hvbGQpOworICAgICAgICAgICAgICAg IHRoaXMuX2FwcGVuZFByb3BlcnR5UHJldmlldyhwcmV2aWV3LCBpbnRlcm5hbCwge25hbWUsIHR5 cGU6ICJhY2Nlc3NvciJ9LCBwcm9wZXJ0aWVzVGhyZXNob2xkKTsKICAgICAgICAgICAgICAgICBj b250aW51ZTsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgLy8gTnVsbCB2YWx1ZS4KICAg ICAgICAgICAgIHZhciB2YWx1ZSA9IGRlc2NyaXB0b3IudmFsdWU7CiAgICAgICAgICAgICBpZiAo dmFsdWUgPT09IG51bGwpIHsKLSAgICAgICAgICAgICAgICB0aGlzLl9hcHBlbmRQcm9wZXJ0eVBy ZXZpZXcocHJldmlldywgaW50ZXJuYWwsIHtuYW1lOiBuYW1lLCB0eXBlOiAib2JqZWN0Iiwgc3Vi dHlwZTogIm51bGwiLCB2YWx1ZTogIm51bGwifSwgcHJvcGVydGllc1RocmVzaG9sZCk7CisgICAg ICAgICAgICAgICAgdGhpcy5fYXBwZW5kUHJvcGVydHlQcmV2aWV3KHByZXZpZXcsIGludGVybmFs LCB7bmFtZSwgdHlwZTogIm9iamVjdCIsIHN1YnR5cGU6ICJudWxsIiwgdmFsdWU6ICJudWxsIn0s IHByb3BlcnRpZXNUaHJlc2hvbGQpOwogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAg ICAgICAgfQogCkBAIC0xMDQ5LDcgKzEwNDksNyBAQCBJbmplY3RlZFNjcmlwdC5SZW1vdGVPYmpl Y3QucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgICAgICB2YWx1ZSA9IHRoaXMuX2FiYnJl dmlhdGVTdHJpbmcodmFsdWUsIG1heExlbmd0aCwgdHJ1ZSk7CiAgICAgICAgICAgICAgICAgICAg IHByZXZpZXcubG9zc2xlc3MgPSBmYWxzZTsKICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAg ICAgICAgdGhpcy5fYXBwZW5kUHJvcGVydHlQcmV2aWV3KHByZXZpZXcsIGludGVybmFsLCB7bmFt ZTogbmFtZSwgdHlwZTogdHlwZSwgdmFsdWU6IHRvU3RyaW5nKHZhbHVlKX0sIHByb3BlcnRpZXNU aHJlc2hvbGQpOworICAgICAgICAgICAgICAgIHRoaXMuX2FwcGVuZFByb3BlcnR5UHJldmlldyhw cmV2aWV3LCBpbnRlcm5hbCwge25hbWUsIHR5cGUsIHZhbHVlOiB0b1N0cmluZyh2YWx1ZSl9LCBw cm9wZXJ0aWVzVGhyZXNob2xkKTsKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAg ICAgIH0KIApAQCAtMTA2MCwxMiArMTA2MCwxMiBAQCBJbmplY3RlZFNjcmlwdC5SZW1vdGVPYmpl Y3QucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgICAgICBzeW1ib2xTdHJpbmcgPSB0aGlz Ll9hYmJyZXZpYXRlU3RyaW5nKHN5bWJvbFN0cmluZywgbWF4TGVuZ3RoLCB0cnVlKTsKICAgICAg ICAgICAgICAgICAgICAgcHJldmlldy5sb3NzbGVzcyA9IGZhbHNlOwogICAgICAgICAgICAgICAg IH0KLSAgICAgICAgICAgICAgICB0aGlzLl9hcHBlbmRQcm9wZXJ0eVByZXZpZXcocHJldmlldywg aW50ZXJuYWwsIHtuYW1lOiBuYW1lLCB0eXBlOiB0eXBlLCB2YWx1ZTogc3ltYm9sU3RyaW5nfSwg cHJvcGVydGllc1RocmVzaG9sZCk7CisgICAgICAgICAgICAgICAgdGhpcy5fYXBwZW5kUHJvcGVy dHlQcmV2aWV3KHByZXZpZXcsIGludGVybmFsLCB7bmFtZSwgdHlwZSwgdmFsdWU6IHN5bWJvbFN0 cmluZ30sIHByb3BlcnRpZXNUaHJlc2hvbGQpOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAg ICAgICAgICAgIH0KIAogICAgICAgICAgICAgLy8gT2JqZWN0LgotICAgICAgICAgICAgdmFyIHBy b3BlcnR5ID0ge25hbWU6IG5hbWUsIHR5cGU6IHR5cGV9OworICAgICAgICAgICAgdmFyIHByb3Bl cnR5ID0ge25hbWUsIHR5cGV9OwogICAgICAgICAgICAgdmFyIHN1YnR5cGUgPSBpbmplY3RlZFNj cmlwdC5fc3VidHlwZSh2YWx1ZSk7CiAgICAgICAgICAgICBpZiAoc3VidHlwZSkKICAgICAgICAg ICAgICAgICBwcm9wZXJ0eS5zdWJ0eXBlID0gc3VidHlwZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9n CmluZGV4IGZmODk0NzQuLmFjNTFiYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSw1 ICsxLDE0IEBACiAyMDE1LTAzLTA1ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5j b20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQWRvcHQgT2JqZWN0IExpdGVyYWwgU2hvcnRo YW5kIFByb3BlcnR5IENvbnN0cnVjdGlvbiBTeW50YXgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjM3NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIE1lY2hhbmljYWwgY2hhbmdlIHRvdWNoaW5nIGxvdHMg b2YgZmlsZXMuCisKKzIwMTUtMDMtMDUgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxl LmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBGb2xsb3ctdXAgZml4ZXMgdG8gT2JqZWN0 VHJlZUJhc2VUcmVlRWxlbWVudAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTQyMzY3CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0Jhc2UvRXZlbnRMaXN0ZW5lclNldC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvRXZlbnRMaXN0ZW5lclNldC5qcwppbmRleCAxMTk5ZTkz Li40MGQyY2RkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9CYXNlL0V2ZW50TGlzdGVuZXJTZXQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvQmFzZS9FdmVudExpc3RlbmVyU2V0LmpzCkBAIC00OCw3ICs0OCw3IEBAIFdl Ykluc3BlY3Rvci5FdmVudExpc3RlbmVyU2V0LnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKCFl bWl0dGVySXNWYWxpZCB8fCAhdHlwZSB8fCAhY2FsbGJhY2spCiAgICAgICAgICAgICByZXR1cm47 CiAKLSAgICAgICAgdGhpcy5fbGlzdGVuZXJzLnB1c2goe2xpc3RlbmVyOiBuZXcgV2ViSW5zcGVj dG9yLkV2ZW50TGlzdGVuZXIodGhpc09iamVjdCB8fCB0aGlzLl9kZWZhdWx0VGhpc09iamVjdCks IGVtaXR0ZXI6IGVtaXR0ZXIsIHR5cGU6IHR5cGUsIGNhbGxiYWNrOiBjYWxsYmFjaywgdXNlc0Nh cHR1cmU6IHVzZXNDYXB0dXJlfSk7CisgICAgICAgIHRoaXMuX2xpc3RlbmVycy5wdXNoKHtsaXN0 ZW5lcjogbmV3IFdlYkluc3BlY3Rvci5FdmVudExpc3RlbmVyKHRoaXNPYmplY3QgfHwgdGhpcy5f ZGVmYXVsdFRoaXNPYmplY3QpLCBlbWl0dGVyLCB0eXBlLCBjYWxsYmFjaywgdXNlc0NhcHR1cmV9 KTsKICAgICB9LAogCiAgICAgdW5yZWdpc3RlcjogZnVuY3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9PYmplY3QuanMgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL09iamVjdC5qcwppbmRleCA2MmI3ZGQz Li41MTRhZWYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9CYXNlL09iamVjdC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9CYXNlL09iamVjdC5qcwpAQCAtNjUsNyArNjUsNyBAQCBXZWJJbnNwZWN0b3IuT2JqZWN0LmFk ZEV2ZW50TGlzdGVuZXIgPSBmdW5jdGlvbihldmVudFR5cGUsIGxpc3RlbmVyLCB0aGlzT2JqZWN0 KQogICAgICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGxpc3RlbmVycy5wdXNoKHt0aGlz T2JqZWN0OiB0aGlzT2JqZWN0LCBsaXN0ZW5lcjogbGlzdGVuZXJ9KTsKKyAgICBsaXN0ZW5lcnMu cHVzaCh7dGhpc09iamVjdCwgbGlzdGVuZXJ9KTsKIH07CiAKIFdlYkluc3BlY3Rvci5PYmplY3Qu cmVtb3ZlRXZlbnRMaXN0ZW5lciA9IGZ1bmN0aW9uKGV2ZW50VHlwZSwgbGlzdGVuZXIsIHRoaXNP YmplY3QpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9C YXNlL1VSTFV0aWxpdGllcy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0Jhc2UvVVJMVXRpbGl0aWVzLmpzCmluZGV4IDJmN2NhNTQuLjQxNzc0NzYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvVVJMVXRpbGl0aWVzLmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvVVJMVXRpbGl0 aWVzLmpzCkBAIC02Nyw3ICs2Nyw3IEBAIGZ1bmN0aW9uIHBhcnNlU2VjdXJpdHlPcmlnaW4oc2Vj dXJpdHlPcmlnaW4pCiAgICAgdmFyIGhvc3QgPSBtYXRjaFsyXS50b0xvd2VyQ2FzZSgpOwogICAg IHZhciBwb3J0ID0gTnVtYmVyKG1hdGNoWzNdKSB8fCBudWxsOwogCi0gICAgcmV0dXJuIHtzY2hl bWU6IHNjaGVtZSwgaG9zdDogaG9zdCwgcG9ydDogcG9ydH07CisgICAgcmV0dXJuIHtzY2hlbWUs IGhvc3QsIHBvcnR9OwogfQogCiBmdW5jdGlvbiBwYXJzZVVSTCh1cmwpCkBAIC0xMDYsNyArMTA2 LDcgQEAgZnVuY3Rpb24gcGFyc2VVUkwodXJsKQogICAgICAgICAgICAgbGFzdFBhdGhDb21wb25l bnQgPSBwYXRoLnN1YnN0cmluZyhsYXN0U2xhc2hJbmRleCArIDEsIHBhdGgubGVuZ3RoIC0gZW5k T2Zmc2V0KTsKICAgICB9CiAKLSAgICByZXR1cm4ge3NjaGVtZTogc2NoZW1lLCBob3N0OiBob3N0 LCBwb3J0OiBwb3J0LCBwYXRoOiBwYXRoLCBxdWVyeVN0cmluZzogcXVlcnlTdHJpbmcsIGZyYWdt ZW50OiBmcmFnbWVudCwgbGFzdFBhdGhDb21wb25lbnQ6IGxhc3RQYXRoQ29tcG9uZW50fTsKKyAg ICByZXR1cm4ge3NjaGVtZSwgaG9zdCwgcG9ydCwgcGF0aCwgcXVlcnlTdHJpbmcsIGZyYWdtZW50 LCBsYXN0UGF0aENvbXBvbmVudH07CiB9CiAKIGZ1bmN0aW9uIGFic29sdXRlVVJMKHBhcnRpYWxV UkwsIGJhc2VVUkwpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9CYXNlL1V0aWxpdGllcy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL0Jhc2UvVXRpbGl0aWVzLmpzCmluZGV4IDdmNjdlYzUuLjUzNzgzOGEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpz CkBAIC01MjUsMTIgKzUyNSwxMiBAQCBPYmplY3QuZGVmaW5lUHJvcGVydHkoU3RyaW5nLCAidG9r ZW5pemVGb3JtYXRTdHJpbmciLAogCiAgICAgICAgIGZ1bmN0aW9uIGFkZFN0cmluZ1Rva2VuKHN0 cikKICAgICAgICAgewotICAgICAgICAgICAgdG9rZW5zLnB1c2goeyB0eXBlOiAic3RyaW5nIiwg dmFsdWU6IHN0ciB9KTsKKyAgICAgICAgICAgIHRva2Vucy5wdXNoKHt0eXBlOiAic3RyaW5nIiwg dmFsdWU6IHN0cn0pOwogICAgICAgICB9CiAKICAgICAgICAgZnVuY3Rpb24gYWRkU3BlY2lmaWVy VG9rZW4oc3BlY2lmaWVyLCBwcmVjaXNpb24sIHN1YnN0aXR1dGlvbkluZGV4KQogICAgICAgICB7 Ci0gICAgICAgICAgICB0b2tlbnMucHVzaCh7IHR5cGU6ICJzcGVjaWZpZXIiLCBzcGVjaWZpZXI6 IHNwZWNpZmllciwgcHJlY2lzaW9uOiBwcmVjaXNpb24sIHN1YnN0aXR1dGlvbkluZGV4OiBzdWJz dGl0dXRpb25JbmRleCB9KTsKKyAgICAgICAgICAgIHRva2Vucy5wdXNoKHt0eXBlOiAic3BlY2lm aWVyIiwgc3BlY2lmaWVyLCBwcmVjaXNpb24sIHN1YnN0aXR1dGlvbkluZGV4fSk7CiAgICAgICAg IH0KIAogICAgICAgICB2YXIgaW5kZXggPSAwOwpAQCAtNjU1LDcgKzY1NSw3IEBAIE9iamVjdC5k ZWZpbmVQcm9wZXJ0eShTdHJpbmcsICJmb3JtYXQiLAogICAgIHZhbHVlOiBmdW5jdGlvbihmb3Jt YXQsIHN1YnN0aXR1dGlvbnMsIGZvcm1hdHRlcnMsIGluaXRpYWxWYWx1ZSwgYXBwZW5kKQogICAg IHsKICAgICAgICAgaWYgKCFmb3JtYXQgfHwgIXN1YnN0aXR1dGlvbnMgfHwgIXN1YnN0aXR1dGlv bnMubGVuZ3RoKQotICAgICAgICAgICAgcmV0dXJuIHsgZm9ybWF0dGVkUmVzdWx0OiBhcHBlbmQo aW5pdGlhbFZhbHVlLCBmb3JtYXQpLCB1bnVzZWRTdWJzdGl0dXRpb25zOiBzdWJzdGl0dXRpb25z IH07CisgICAgICAgICAgICByZXR1cm4ge2Zvcm1hdHRlZFJlc3VsdDogYXBwZW5kKGluaXRpYWxW YWx1ZSwgZm9ybWF0KSwgdW51c2VkU3Vic3RpdHV0aW9uczogc3Vic3RpdHV0aW9uc307CiAKICAg ICAgICAgZnVuY3Rpb24gcHJldHR5RnVuY3Rpb25OYW1lKCkKICAgICAgICAgewpAQCAtNzE2LDcg KzcxNiw3IEBAIE9iamVjdC5kZWZpbmVQcm9wZXJ0eShTdHJpbmcsICJmb3JtYXQiLAogICAgICAg ICAgICAgdW51c2VkU3Vic3RpdHV0aW9ucy5wdXNoKHN1YnN0aXR1dGlvbnNbaV0pOwogICAgICAg ICB9CiAKLSAgICAgICAgcmV0dXJuIHtmb3JtYXR0ZWRSZXN1bHQ6IHJlc3VsdCwgdW51c2VkU3Vi c3RpdHV0aW9uczogdW51c2VkU3Vic3RpdHV0aW9uc307CisgICAgICAgIHJldHVybiB7Zm9ybWF0 dGVkUmVzdWx0OiByZXN1bHQsIHVudXNlZFN1YnN0aXR1dGlvbnN9OwogICAgIH0KIH0pOwogCkBA IC05MTAsNyArOTEwLDcgQEAgZnVuY3Rpb24gcGFyc2VNSU1FVHlwZShmdWxsTWltZVR5cGUpCiAg ICAgICAgICAgICBlbmNvZGluZyA9IHN1YnBhcnRzWzFdLnJlcGxhY2UoIl5cInxcIiQiLCAiIik7 IC8vIFRyaW0gcXVvdGVzLgogICAgIH0KIAotICAgIHJldHVybiB7dHlwZTogdHlwZSwgYm91bmRh cnk6IGJvdW5kYXJ5IHx8IG51bGwsIGVuY29kaW5nOiBlbmNvZGluZyB8fCBudWxsfTsKKyAgICBy ZXR1cm4ge3R5cGUsIGJvdW5kYXJ5OiBib3VuZGFyeSB8fCBudWxsLCBlbmNvZGluZzogZW5jb2Rp bmcgfHwgbnVsbH07CiB9CiAKIGZ1bmN0aW9uIHNpbXBsZUdsb2JTdHJpbmdUb1JlZ0V4cChnbG9i U3RyaW5nLCByZWdFeHBGbGFncykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0FwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyLmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQXBwbGljYXRpb25D YWNoZU1hbmFnZXIuanMKaW5kZXggODhkYzljYi4uZThhMDdiZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQXBwbGljYXRpb25DYWNo ZU1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29u dHJvbGxlcnMvQXBwbGljYXRpb25DYWNoZU1hbmFnZXIuanMKQEAgLTE5Miw3ICsxOTIsNyBAQCBX ZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZU1hbmFnZXIucHJvdG90eXBlID0gewogCiAgICAg ICAgIGRlbGV0ZSB0aGlzLl9hcHBsaWNhdGlvbkNhY2hlT2JqZWN0c1tmcmFtZS5pZF07CiAKLSAg ICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkFwcGxpY2F0 aW9uQ2FjaGVNYW5hZ2VyLkV2ZW50LkZyYW1lTWFuaWZlc3RSZW1vdmVkLCB7ZnJhbWU6IGZyYW1l fSk7CisgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5B cHBsaWNhdGlvbkNhY2hlTWFuYWdlci5FdmVudC5GcmFtZU1hbmlmZXN0UmVtb3ZlZCwge2ZyYW1l fSk7CiAgICAgfQogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvQ29udHJvbGxlcnMvQ29kZU1pcnJvckNvbXBsZXRpb25Db250cm9sbGVyLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ29kZU1pcnJv ckNvbXBsZXRpb25Db250cm9sbGVyLmpzCmluZGV4IDhiMjdiNTAuLjJkZDhhYWIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NvZGVN aXJyb3JDb21wbGV0aW9uQ29udHJvbGxlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Db250cm9sbGVycy9Db2RlTWlycm9yQ29tcGxldGlvbkNvbnRyb2xsZXIu anMKQEAgLTQzMiw3ICs0MzIsNyBAQCBXZWJJbnNwZWN0b3IuQ29kZU1pcnJvckNvbXBsZXRpb25D b250cm9sbGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHN0YXJ0T2Zmc2V0ID0gdGVtcEVu ZE9mZnNldDsKICAgICAgICAgfQogCi0gICAgICAgIHJldHVybiB7c3RyaW5nOiBzdHJpbmcuc3Vi c3RyaW5nKHN0YXJ0T2Zmc2V0LCBlbmRPZmZzZXQpLCBzdGFydE9mZnNldDogc3RhcnRPZmZzZXQs IGVuZE9mZnNldDogZW5kT2Zmc2V0fTsKKyAgICAgICAgcmV0dXJuIHtzdHJpbmc6IHN0cmluZy5z dWJzdHJpbmcoc3RhcnRPZmZzZXQsIGVuZE9mZnNldCksIHN0YXJ0T2Zmc2V0LCBlbmRPZmZzZXR9 OwogICAgIH0sCiAKICAgICBfY29tcGxldGVBdEN1cnJlbnRQb3NpdGlvbjogZnVuY3Rpb24oZm9y Y2UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250 cm9sbGVycy9Db2RlTWlycm9yRHJhZ1RvQWRqdXN0TnVtYmVyQ29udHJvbGxlci5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NvZGVNaXJyb3JEcmFn VG9BZGp1c3ROdW1iZXJDb250cm9sbGVyLmpzCmluZGV4IDVhYjVmYzYuLmIxYzNiOTQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0Nv ZGVNaXJyb3JEcmFnVG9BZGp1c3ROdW1iZXJDb250cm9sbGVyLmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NvZGVNaXJyb3JEcmFnVG9BZGp1 c3ROdW1iZXJDb250cm9sbGVyLmpzCkBAIC05Niw5ICs5Niw5IEBAIFdlYkluc3BlY3Rvci5Db2Rl TWlycm9yRHJhZ1RvQWRqdXN0TnVtYmVyQ29udHJvbGxlci5wcm90b3R5cGUgPSB7CiAKICAgICAg ICAgdmFyIGNvbnRhaW5zTnVtYmVyID0gdG9rZW4udHlwZS5pbmRleE9mKCJudW1iZXIiKSAhPT0g LTE7CiAgICAgICAgIHRoaXMuX2hvdmVyZWRUb2tlbkluZm8gPSB7Ci0gICAgICAgICAgICB0b2tl bjogdG9rZW4sCisgICAgICAgICAgICB0b2tlbiwKICAgICAgICAgICAgIGxpbmU6IHBvc2l0aW9u LmxpbmUsCi0gICAgICAgICAgICBjb250YWluc051bWJlcjogY29udGFpbnNOdW1iZXIsCisgICAg ICAgICAgICBjb250YWluc051bWJlciwKICAgICAgICAgICAgIHN0YXJ0UG9zaXRpb246IHsKICAg ICAgICAgICAgICAgICBjaDogdG9rZW4uc3RhcnQsCiAgICAgICAgICAgICAgICAgbGluZTogcG9z aXRpb24ubGluZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvQ29udHJvbGxlcnMvQ29kZU1pcnJvclRva2VuVHJhY2tpbmdDb250cm9sbGVyLmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ29kZU1pcnJvclRv a2VuVHJhY2tpbmdDb250cm9sbGVyLmpzCmluZGV4IGRkNjk5ZjEuLmQ3YThmZDkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NvZGVN aXJyb3JUb2tlblRyYWNraW5nQ29udHJvbGxlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9Db2RlTWlycm9yVG9rZW5UcmFja2luZ0NvbnRy b2xsZXIuanMKQEAgLTE3NCw3ICsxNzQsNyBAQCBXZWJJbnNwZWN0b3IuQ29kZU1pcnJvclRva2Vu VHJhY2tpbmdDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5yZW1vdmVIaWdo bGlnaHRlZFJhbmdlKCk7CiAKICAgICAgICAgdmFyIGNsYXNzTmFtZSA9IHRoaXMuX2NsYXNzTmFt ZUZvckhpZ2hsaWdodGVkUmFuZ2UgfHwgIiI7Ci0gICAgICAgIHRoaXMuX2NvZGVNaXJyb3JNYXJr ZWRUZXh0ID0gdGhpcy5fY29kZU1pcnJvci5tYXJrVGV4dChyYW5nZS5zdGFydCwgcmFuZ2UuZW5k LCB7Y2xhc3NOYW1lOiBjbGFzc05hbWV9KTsKKyAgICAgICAgdGhpcy5fY29kZU1pcnJvck1hcmtl ZFRleHQgPSB0aGlzLl9jb2RlTWlycm9yLm1hcmtUZXh0KHJhbmdlLnN0YXJ0LCByYW5nZS5lbmQs IHtjbGFzc05hbWV9KTsKIAogICAgICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vt b3ZlIiwgdGhpcywgdHJ1ZSk7CiAgICAgfSwKQEAgLTMyNiw5ICszMjYsOSBAQCBXZWJJbnNwZWN0 b3IuQ29kZU1pcnJvclRva2VuVHJhY2tpbmdDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKICAgICAg ICAgdmFyIGlubmVyTW9kZSA9IENvZGVNaXJyb3IuaW5uZXJNb2RlKHRoaXMuX2NvZGVNaXJyb3Iu Z2V0TW9kZSgpLCB0b2tlbi5zdGF0ZSk7CiAgICAgICAgIHZhciBjb2RlTWlycm9yTW9kZU5hbWUg PSBpbm5lck1vZGUubW9kZS5hbHRlcm5hdGVOYW1lIHx8IGlubmVyTW9kZS5tb2RlLm5hbWU7CiAg ICAgICAgIHRoaXMuX2hvdmVyZWRUb2tlbkluZm8gPSB7Ci0gICAgICAgICAgICB0b2tlbjogdG9r ZW4sCi0gICAgICAgICAgICBwb3NpdGlvbjogcG9zaXRpb24sCi0gICAgICAgICAgICBpbm5lck1v ZGU6IGlubmVyTW9kZSwKKyAgICAgICAgICAgIHRva2VuLAorICAgICAgICAgICAgcG9zaXRpb24s CisgICAgICAgICAgICBpbm5lck1vZGUsCiAgICAgICAgICAgICBtb2RlTmFtZTogY29kZU1pcnJv ck1vZGVOYW1lCiAgICAgICAgIH07CiAKQEAgLTQ5OSw3ICs0OTksNyBAQCBXZWJJbnNwZWN0b3Iu Q29kZU1pcnJvclRva2VuVHJhY2tpbmdDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAg cmV0dXJuIHsKICAgICAgICAgICAgIGhvdmVyZWRUb2tlbjogdGhpcy5faG92ZXJlZFRva2VuSW5m by50b2tlbiwKICAgICAgICAgICAgIGhvdmVyZWRUb2tlblJhbmdlOiB7c3RhcnQ6IHN0YXJ0UG9z aXRpb24sIGVuZDogZW5kUG9zaXRpb259LAotICAgICAgICAgICAgZXhwcmVzc2lvbjogZXhwcmVz c2lvbiwKKyAgICAgICAgICAgIGV4cHJlc3Npb24sCiAgICAgICAgICAgICBleHByZXNzaW9uUmFu Z2U6IHtzdGFydDogZXhwcmVzc2lvblN0YXJ0UG9zaXRpb24sIGVuZDogZW5kUG9zaXRpb259LAog ICAgICAgICB9OwogICAgIH0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Db250cm9sbGVycy9ET01UcmVlTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTVRyZWVNYW5hZ2VyLmpzCmluZGV4 IDA4ZWQ0OGUuLjg0ZTRjZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTVRyZWVNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTVRyZWVNYW5hZ2VyLmpzCkBA IC0xNDEsOCArMTQxLDggQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVNYW5hZ2VyLnByb3RvdHlwZSA9 IHsKICAgICAgICAgaWYgKCFub2RlKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBub2Rl Ll9zZXRBdHRyaWJ1dGUobmFtZSwgdmFsdWUpOwotICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRU b0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIuRXZlbnQuQXR0cmlidXRlTW9k aWZpZWQsIHsgbm9kZTogbm9kZSwgbmFtZTogbmFtZSB9KTsKLSAgICAgICAgbm9kZS5kaXNwYXRj aEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRPTU5vZGUuRXZlbnQuQXR0cmlidXRlTW9k aWZpZWQsIHtuYW1lOiBuYW1lfSk7CisgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVu ZXJzKFdlYkluc3BlY3Rvci5ET01UcmVlTWFuYWdlci5FdmVudC5BdHRyaWJ1dGVNb2RpZmllZCwg e25vZGUsIG5hbWV9KTsKKyAgICAgICAgbm9kZS5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2Vi SW5zcGVjdG9yLkRPTU5vZGUuRXZlbnQuQXR0cmlidXRlTW9kaWZpZWQsIHtuYW1lfSk7CiAgICAg fSwKIAogICAgIF9hdHRyaWJ1dGVSZW1vdmVkOiBmdW5jdGlvbihub2RlSWQsIG5hbWUpCkBAIC0x NTEsOCArMTUxLDggQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVNYW5hZ2VyLnByb3RvdHlwZSA9IHsK ICAgICAgICAgaWYgKCFub2RlKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBub2RlLl9y ZW1vdmVBdHRyaWJ1dGUobmFtZSk7Ci0gICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVu ZXJzKFdlYkluc3BlY3Rvci5ET01UcmVlTWFuYWdlci5FdmVudC5BdHRyaWJ1dGVSZW1vdmVkLCB7 IG5vZGU6IG5vZGUsIG5hbWU6IG5hbWUgfSk7Ci0gICAgICAgIG5vZGUuZGlzcGF0Y2hFdmVudFRv TGlzdGVuZXJzKFdlYkluc3BlY3Rvci5ET01Ob2RlLkV2ZW50LkF0dHJpYnV0ZVJlbW92ZWQsIHtu YW1lOiBuYW1lfSk7CisgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYklu c3BlY3Rvci5ET01UcmVlTWFuYWdlci5FdmVudC5BdHRyaWJ1dGVSZW1vdmVkLCB7bm9kZSwgbmFt ZX0pOworICAgICAgICBub2RlLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3Iu RE9NTm9kZS5FdmVudC5BdHRyaWJ1dGVSZW1vdmVkLCB7bmFtZX0pOwogICAgIH0sCiAKICAgICBf aW5saW5lU3R5bGVJbnZhbGlkYXRlZDogZnVuY3Rpb24obm9kZUlkcykKQEAgLTE3NSw3ICsxNzUs NyBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIucHJvdG90eXBlID0gewogICAgICAgICAg ICAgdmFyIG5vZGUgPSB0aGlzLl9pZFRvRE9NTm9kZVtub2RlSWRdOwogICAgICAgICAgICAgaWYg KG5vZGUpIHsKICAgICAgICAgICAgICAgICBub2RlLl9zZXRBdHRyaWJ1dGVzUGF5bG9hZChhdHRy aWJ1dGVzKTsKLSAgICAgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhX ZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIuRXZlbnQuQXR0cmlidXRlTW9kaWZpZWQsIHsgbm9k ZTogbm9kZSwgbmFtZTogInN0eWxlIiB9KTsKKyAgICAgICAgICAgICAgICB0aGlzLmRpc3BhdGNo RXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIuRXZlbnQuQXR0cmli dXRlTW9kaWZpZWQsIHsgbm9kZSwgbmFtZTogInN0eWxlIiB9KTsKICAgICAgICAgICAgICAgICBu b2RlLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRE9NTm9kZS5FdmVudC5B dHRyaWJ1dGVNb2RpZmllZCwge25hbWU6ICJzdHlsZSJ9KTsKICAgICAgICAgICAgIH0KICAgICAg ICAgfQpAQCAtMTkzLDcgKzE5Myw3IEBAIFdlYkluc3BlY3Rvci5ET01UcmVlTWFuYWdlci5wcm90 b3R5cGUgPSB7CiAgICAgewogICAgICAgICB2YXIgbm9kZSA9IHRoaXMuX2lkVG9ET01Ob2RlW25v ZGVJZF07CiAgICAgICAgIG5vZGUuX25vZGVWYWx1ZSA9IG5ld1ZhbHVlOwotICAgICAgICB0aGlz LmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIuRXZl bnQuQ2hhcmFjdGVyRGF0YU1vZGlmaWVkLCB7bm9kZTogbm9kZX0pOworICAgICAgICB0aGlzLmRp c3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIuRXZlbnQu Q2hhcmFjdGVyRGF0YU1vZGlmaWVkLCB7bm9kZX0pOwogICAgIH0sCiAKICAgICBub2RlRm9ySWQ6 IGZ1bmN0aW9uKG5vZGVJZCkKQEAgLTI0NSw3ICsyNDUsNyBAQCBXZWJJbnNwZWN0b3IuRE9NVHJl ZU1hbmFnZXIucHJvdG90eXBlID0gewogICAgICAgICB2YXIgcHJldiA9IHRoaXMuX2lkVG9ET01O b2RlW3ByZXZJZF07CiAgICAgICAgIHZhciBub2RlID0gcGFyZW50Ll9pbnNlcnRDaGlsZChwcmV2 LCBwYXlsb2FkKTsKICAgICAgICAgdGhpcy5faWRUb0RPTU5vZGVbbm9kZS5pZF0gPSBub2RlOwot ICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRE9NVHJl ZU1hbmFnZXIuRXZlbnQuTm9kZUluc2VydGVkLCB7bm9kZTogbm9kZSwgcGFyZW50OiBwYXJlbnR9 KTsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRP TVRyZWVNYW5hZ2VyLkV2ZW50Lk5vZGVJbnNlcnRlZCwge25vZGUsIHBhcmVudH0pOwogICAgIH0s CiAKICAgICBfY2hpbGROb2RlUmVtb3ZlZDogZnVuY3Rpb24ocGFyZW50SWQsIG5vZGVJZCkKQEAg LTI1NCw3ICsyNTQsNyBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIucHJvdG90eXBlID0g ewogICAgICAgICB2YXIgbm9kZSA9IHRoaXMuX2lkVG9ET01Ob2RlW25vZGVJZF07CiAgICAgICAg IHBhcmVudC5fcmVtb3ZlQ2hpbGQobm9kZSk7CiAgICAgICAgIHRoaXMuX3VuYmluZChub2RlKTsK LSAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRPTVRy ZWVNYW5hZ2VyLkV2ZW50Lk5vZGVSZW1vdmVkLCB7bm9kZTpub2RlLCBwYXJlbnQ6IHBhcmVudH0p OworICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRE9N VHJlZU1hbmFnZXIuRXZlbnQuTm9kZVJlbW92ZWQsIHtub2RlOm5vZGUsIHBhcmVudH0pOwogICAg IH0sCiAKICAgICBfdW5iaW5kOiBmdW5jdGlvbihub2RlKQpAQCAtMjc1LDcgKzI3NSw3IEBAIFdl Ykluc3BlY3Rvci5ET01UcmVlTWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICB2 YXIgbm9kZSA9IHRoaXMuX2lkVG9ET01Ob2RlW25vZGVJZF07CiAgICAgICAgIGlmIChub2RlKQot ICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRP TVRyZWVNYW5hZ2VyLkV2ZW50LkRPTU5vZGVXYXNJbnNwZWN0ZWQsIHtub2RlOiBub2RlfSk7Cisg ICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRE9N VHJlZU1hbmFnZXIuRXZlbnQuRE9NTm9kZVdhc0luc3BlY3RlZCwge25vZGV9KTsKIAogICAgICAg ICB0aGlzLl9pbnNwZWN0TW9kZUVuYWJsZWQgPSBmYWxzZTsKICAgICAgICAgdGhpcy5kaXNwYXRj aEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRPTVRyZWVNYW5hZ2VyLkV2ZW50Lkluc3Bl Y3RNb2RlU3RhdGVDaGFuZ2VkKTsKQEAgLTM2MCw3ICszNjAsNyBAQCBXZWJJbnNwZWN0b3IuRE9N VHJlZU1hbmFnZXIucHJvdG90eXBlID0gewogCiAgICAgICAgIHRoaXMuX2hpZ2hsaWdodGVkRE9N Tm9kZUlkID0gbm9kZUlkOwogICAgICAgICBpZiAobm9kZUlkKQotICAgICAgICAgICAgRE9NQWdl bnQuaGlnaGxpZ2h0Tm9kZS5pbnZva2Uoe25vZGVJZDogbm9kZUlkLCBoaWdobGlnaHRDb25maWc6 IHRoaXMuX2J1aWxkSGlnaGxpZ2h0Q29uZmlnKG1vZGUpfSk7CisgICAgICAgICAgICBET01BZ2Vu dC5oaWdobGlnaHROb2RlLmludm9rZSh7bm9kZUlkLCBoaWdobGlnaHRDb25maWc6IHRoaXMuX2J1 aWxkSGlnaGxpZ2h0Q29uZmlnKG1vZGUpfSk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIERP TUFnZW50LmhpZGVIaWdobGlnaHQoKTsKICAgICB9LApAQCAtMzc0LDcgKzM3NCw3IEBAIFdlYklu c3BlY3Rvci5ET01UcmVlTWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBoZWlnaHQ6 IHJlY3QuaGVpZ2h0LAogICAgICAgICAgICAgY29sb3I6IHtyOiAxMTEsIGc6IDE2OCwgYjogMjIw LCBhOiAwLjY2fSwKICAgICAgICAgICAgIG91dGxpbmVDb2xvcjoge3I6IDI1NSwgZzogMjI5LCBi OiAxNTMsIGE6IDAuNjZ9LAotICAgICAgICAgICAgdXNlUGFnZUNvb3JkaW5hdGVzOiB1c2VQYWdl Q29vcmRpbmF0ZXMKKyAgICAgICAgICAgIHVzZVBhZ2VDb29yZGluYXRlcwogICAgICAgICB9KTsK ICAgICB9LAogCkBAIC00NjgsNyArNDY4LDcgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVNYW5hZ2Vy LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgY29udGVu dEZsb3dzLnB1c2goY29udGVudEZsb3cpOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgdGhp cy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRPTVRyZWVNYW5hZ2VyLkV2 ZW50LkNvbnRlbnRGbG93TGlzdFdhc1VwZGF0ZWQsIHtkb2N1bWVudE5vZGVJZGVudGlmaWVyOiBk b2N1bWVudE5vZGVJZGVudGlmaWVyLCBmbG93czogY29udGVudEZsb3dzfSk7CisgICAgICAgICAg ICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFn ZXIuRXZlbnQuQ29udGVudEZsb3dMaXN0V2FzVXBkYXRlZCwge2RvY3VtZW50Tm9kZUlkZW50aWZp ZXIsIGZsb3dzOiBjb250ZW50Rmxvd3N9KTsKICAgICAgICAgfQogCiAgICAgICAgIGlmICh3aW5k b3cuQ1NTQWdlbnQgJiYgQ1NTQWdlbnQuZ2V0TmFtZWRGbG93Q29sbGVjdGlvbikKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RlYnVn Z2VyTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRy b2xsZXJzL0RlYnVnZ2VyTWFuYWdlci5qcwppbmRleCA3NDc3ZjdiLi4wMjFmOGM1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9EZWJ1 Z2dlck1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Q29udHJvbGxlcnMvRGVidWdnZXJNYW5hZ2VyLmpzCkBAIC0zMjksNyArMzI5LDcgQEAgV2ViSW5z cGVjdG9yLkRlYnVnZ2VyTWFuYWdlci5wcm90b3R5cGUgPSB7CiAKICAgICBjb250aW51ZVRvTG9j YXRpb246IGZ1bmN0aW9uKHNjcmlwdElkZW50aWZpZXIsIGxpbmVOdW1iZXIsIGNvbHVtbk51bWJl cikKICAgICB7Ci0gICAgICAgIERlYnVnZ2VyQWdlbnQuY29udGludWVUb0xvY2F0aW9uKHtzY3Jp cHRJZDogc2NyaXB0SWRlbnRpZmllciwgbGluZU51bWJlcjogbGluZU51bWJlciwgY29sdW1uTnVt YmVyOiBjb2x1bW5OdW1iZXJ9KTsKKyAgICAgICAgRGVidWdnZXJBZ2VudC5jb250aW51ZVRvTG9j YXRpb24oe3NjcmlwdElkOiBzY3JpcHRJZGVudGlmaWVyLCBsaW5lTnVtYmVyLCBjb2x1bW5OdW1i ZXJ9KTsKICAgICB9LAogCiAgICAgYWRkQnJlYWtwb2ludDogZnVuY3Rpb24oYnJlYWtwb2ludCwg c2tpcEV2ZW50RGlzcGF0Y2gsIHNob3VsZFNwZWN1bGF0aXZlbHlSZXNvbHZlKQpAQCAtMzYyLDcg KzM2Miw3IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1hbmFnZXIucHJvdG90eXBlID0gewogICAg ICAgICAgICAgdGhpcy5fc2V0QnJlYWtwb2ludChicmVha3BvaW50LCBzaG91bGRTcGVjdWxhdGl2 ZWx5UmVzb2x2ZSA/IHNwZWN1bGF0aXZlbHlSZXNvbHZlQnJlYWtwb2ludC5iaW5kKG51bGwsIGJy ZWFrcG9pbnQpIDogbnVsbCk7CiAKICAgICAgICAgaWYgKCFza2lwRXZlbnREaXNwYXRjaCkKLSAg ICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5EZWJ1 Z2dlck1hbmFnZXIuRXZlbnQuQnJlYWtwb2ludEFkZGVkLCB7YnJlYWtwb2ludDogYnJlYWtwb2lu dH0pOworICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVj dG9yLkRlYnVnZ2VyTWFuYWdlci5FdmVudC5CcmVha3BvaW50QWRkZWQsIHticmVha3BvaW50fSk7 CiAgICAgfSwKIAogICAgIHJlbW92ZUJyZWFrcG9pbnQ6IGZ1bmN0aW9uKGJyZWFrcG9pbnQpCkBA IC00MDIsNyArNDAyLDcgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTWFuYWdlci5wcm90b3R5cGUg PSB7CiAgICAgICAgIGJyZWFrcG9pbnQuZGlzYWJsZWQgPSB0cnVlOwogICAgICAgICBicmVha3Bv aW50LmNsZWFyQWN0aW9ucygpOwogCi0gICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVu ZXJzKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1hbmFnZXIuRXZlbnQuQnJlYWtwb2ludFJlbW92ZWQs IHticmVha3BvaW50OiBicmVha3BvaW50fSk7CisgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRv TGlzdGVuZXJzKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1hbmFnZXIuRXZlbnQuQnJlYWtwb2ludFJl bW92ZWQsIHticmVha3BvaW50fSk7CiAgICAgfSwKIAogICAgIGJyZWFrcG9pbnRSZXNvbHZlZDog ZnVuY3Rpb24oYnJlYWtwb2ludElkZW50aWZpZXIsIGxvY2F0aW9uKQpAQCAtNTUwLDcgKzU1MCw3 IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1hbmFnZXIucHJvdG90eXBlID0gewogICAgICAgICAg ICAgc2NyaXB0cy5wdXNoKHNjcmlwdCk7CiAgICAgICAgIH0KIAotICAgICAgICB0aGlzLmRpc3Bh dGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRGVidWdnZXJNYW5hZ2VyLkV2ZW50LlNj cmlwdEFkZGVkLCB7c2NyaXB0OiBzY3JpcHR9KTsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50 VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTWFuYWdlci5FdmVudC5TY3JpcHRBZGRl ZCwge3NjcmlwdH0pOwogICAgIH0sCiAKICAgICBpc0JyZWFrcG9pbnRSZW1vdmFibGU6IGZ1bmN0 aW9uKGJyZWFrcG9pbnQpCkBAIC03MTQsMTMgKzcxNCwxMyBAQCBXZWJJbnNwZWN0b3IuRGVidWdn ZXJNYW5hZ2VyLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICB1cmxSZWdleDogdW5kZWZp bmVkLAogICAgICAgICAgICAgICAgIGNvbHVtbk51bWJlcjogYnJlYWtwb2ludC5zb3VyY2VDb2Rl TG9jYXRpb24uY29sdW1uTnVtYmVyLAogICAgICAgICAgICAgICAgIGNvbmRpdGlvbjogYnJlYWtw b2ludC5jb25kaXRpb24sCi0gICAgICAgICAgICAgICAgb3B0aW9uczogb3B0aW9ucworICAgICAg ICAgICAgICAgIG9wdGlvbnMKICAgICAgICAgICAgIH0sIGRpZFNldEJyZWFrcG9pbnQuYmluZCh0 aGlzKSk7CiAgICAgICAgIH0gZWxzZSBpZiAoYnJlYWtwb2ludC5zY3JpcHRJZGVudGlmaWVyKSB7 CiAgICAgICAgICAgICBEZWJ1Z2dlckFnZW50LnNldEJyZWFrcG9pbnQuaW52b2tlKHsKICAgICAg ICAgICAgICAgICBsb2NhdGlvbjoge3NjcmlwdElkOiBicmVha3BvaW50LnNjcmlwdElkZW50aWZp ZXIsIGxpbmVOdW1iZXI6IGJyZWFrcG9pbnQuc291cmNlQ29kZUxvY2F0aW9uLmxpbmVOdW1iZXIs IGNvbHVtbk51bWJlcjogYnJlYWtwb2ludC5zb3VyY2VDb2RlTG9jYXRpb24uY29sdW1uTnVtYmVy fSwKICAgICAgICAgICAgICAgICBjb25kaXRpb246IGJyZWFrcG9pbnQuY29uZGl0aW9uLAotICAg ICAgICAgICAgICAgIG9wdGlvbnM6IG9wdGlvbnMKKyAgICAgICAgICAgICAgICBvcHRpb25zCiAg ICAgICAgICAgICB9LCBkaWRTZXRCcmVha3BvaW50LmJpbmQodGhpcykpOwogICAgICAgICB9CiAg ICAgfSwKQEAgLTc2Niw3ICs3NjYsNyBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJNYW5hZ2VyLnBy b3RvdHlwZSA9IHsKICAgICAgICAgICAgIC8vIEFkZCB0aGUgYnJlYWtwb2ludCBhdCBpdHMgbmV3 IGxpbmVOdW1iZXIgYW5kIGdldCBhIG5ldyBpZC4KICAgICAgICAgICAgIHRoaXMuX3NldEJyZWFr cG9pbnQoYnJlYWtwb2ludCk7CiAKLSAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlz dGVuZXJzKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1hbmFnZXIuRXZlbnQuQnJlYWtwb2ludE1vdmVk LCB7YnJlYWtwb2ludDogYnJlYWtwb2ludH0pOworICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2 ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTWFuYWdlci5FdmVudC5CcmVha3Bv aW50TW92ZWQsIHticmVha3BvaW50fSk7CiAgICAgICAgIH0KICAgICB9LAogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9Gb3JtYXR0 ZXJTb3VyY2VNYXAuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250 cm9sbGVycy9Gb3JtYXR0ZXJTb3VyY2VNYXAuanMKaW5kZXggNGVjYjJkZi4uMGFlMWMzYSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMv Rm9ybWF0dGVyU291cmNlTWFwLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0NvbnRyb2xsZXJzL0Zvcm1hdHRlclNvdXJjZU1hcC5qcwpAQCAtODMsNyArODMsNyBA QCBXZWJJbnNwZWN0b3IuRm9ybWF0dGVyU291cmNlTWFwLnByb3RvdHlwZSA9IHsKICAgICAgICAg ICAgIHZhciBjb2x1bW5OdW1iZXIgPSBwb3NpdGlvbjsKICAgICAgICAgZWxzZQogICAgICAgICAg ICAgdmFyIGNvbHVtbk51bWJlciA9IHBvc2l0aW9uIC0gbGluZUVuZGluZ3NbbGluZU51bWJlciAt IDFdIC0gMTsKLSAgICAgICAgcmV0dXJuIHtsaW5lTnVtYmVyOiBsaW5lTnVtYmVyLCBjb2x1bW5O dW1iZXI6IGNvbHVtbk51bWJlcn07CisgICAgICAgIHJldHVybiB7bGluZU51bWJlciwgY29sdW1u TnVtYmVyfTsKICAgICB9LAogCiAgICAgX2NvbnZlcnRQb3NpdGlvbjogZnVuY3Rpb24ocG9zaXRp b25zMSwgcG9zaXRpb25zMiwgcG9zaXRpb25JblBvc2l0aW9uMSkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0ZyYW1lUmVzb3VyY2VN YW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxl cnMvRnJhbWVSZXNvdXJjZU1hbmFnZXIuanMKaW5kZXggNDE1MDJlNC4uZDgyMTRlOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRnJh bWVSZXNvdXJjZU1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQ29udHJvbGxlcnMvRnJhbWVSZXNvdXJjZU1hbmFnZXIuanMKQEAgLTE3Miw3ICsxNzIs NyBAQCBXZWJJbnNwZWN0b3IuRnJhbWVSZXNvdXJjZU1hbmFnZXIucHJvdG90eXBlID0gewogCiAg ICAgICAgIGZyYW1lLmNsZWFyRXhlY3V0aW9uQ29udGV4dHMoKTsKIAotICAgICAgICB0aGlzLmRp c3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRnJhbWVSZXNvdXJjZU1hbmFnZXIu RXZlbnQuRnJhbWVXYXNSZW1vdmVkLCB7ZnJhbWU6IGZyYW1lfSk7CisgICAgICAgIHRoaXMuZGlz cGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5GcmFtZVJlc291cmNlTWFuYWdlci5F dmVudC5GcmFtZVdhc1JlbW92ZWQsIHtmcmFtZX0pOwogCiAgICAgICAgIGlmICh0aGlzLl9tYWlu RnJhbWUgIT09IG9sZE1haW5GcmFtZSkKICAgICAgICAgICAgIHRoaXMuX21haW5GcmFtZURpZENo YW5nZShvbGRNYWluRnJhbWUpOwpAQCAtNTc1LDcgKzU3NSw3IEBAIFdlYkluc3BlY3Rvci5GcmFt ZVJlc291cmNlTWFuYWdlci5wcm90b3R5cGUgPSB7CiAKICAgICBfZGlzcGF0Y2hGcmFtZVdhc0Fk ZGVkRXZlbnQ6IGZ1bmN0aW9uKGZyYW1lKQogICAgIHsKLSAgICAgICAgdGhpcy5kaXNwYXRjaEV2 ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkZyYW1lUmVzb3VyY2VNYW5hZ2VyLkV2ZW50LkZy YW1lV2FzQWRkZWQsIHtmcmFtZTogZnJhbWV9KTsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50 VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkZyYW1lUmVzb3VyY2VNYW5hZ2VyLkV2ZW50LkZyYW1l V2FzQWRkZWQsIHtmcmFtZX0pOwogICAgIH0sCiAKICAgICBfbWFpbkZyYW1lRGlkQ2hhbmdlOiBm dW5jdGlvbihvbGRNYWluRnJhbWUpCkBAIC01ODQsNyArNTg0LDcgQEAgV2ViSW5zcGVjdG9yLkZy YW1lUmVzb3VyY2VNYW5hZ2VyLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIG9sZE1haW5GcmFt ZS51bm1hcmtBc01haW5GcmFtZSgpOwogICAgICAgICBpZiAodGhpcy5fbWFpbkZyYW1lKQogICAg ICAgICAgICAgdGhpcy5fbWFpbkZyYW1lLm1hcmtBc01haW5GcmFtZSgpOwotICAgICAgICB0aGlz LmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRnJhbWVSZXNvdXJjZU1hbmFn ZXIuRXZlbnQuTWFpbkZyYW1lRGlkQ2hhbmdlLCB7b2xkTWFpbkZyYW1lOiBvbGRNYWluRnJhbWV9 KTsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkZy YW1lUmVzb3VyY2VNYW5hZ2VyLkV2ZW50Lk1haW5GcmFtZURpZENoYW5nZSwge29sZE1haW5GcmFt ZX0pOwogICAgIH0sCiAKICAgICBfZXh0cmFEb21haW5zQWN0aXZhdGVkOiBmdW5jdGlvbihldmVu dCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRy b2xsZXJzL0lzc3VlTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL0NvbnRyb2xsZXJzL0lzc3VlTWFuYWdlci5qcwppbmRleCA2ZGIzN2EyLi41OTBjZjgzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVy cy9Jc3N1ZU1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvQ29udHJvbGxlcnMvSXNzdWVNYW5hZ2VyLmpzCkBAIC02MSw3ICs2MSw3IEBAIFdlYkluc3Bl Y3Rvci5Jc3N1ZU1hbmFnZXIucHJvdG90eXBlID0gewogICAgICAgICB2YXIgaXNzdWUgPSBuZXcg V2ViSW5zcGVjdG9yLklzc3VlTWVzc2FnZShzb3VyY2UsIGxldmVsLCB0ZXh0LCB1cmwsIG1vZGlm aWVkTGluZU51bWJlciwgcGFyYW1ldGVycyk7CiAgICAgICAgIHRoaXMuX2lzc3Vlcy5wdXNoKGlz c3VlKTsKIAotICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0 b3IuSXNzdWVNYW5hZ2VyLkV2ZW50Lklzc3VlV2FzQWRkZWQsIHtpc3N1ZTogaXNzdWV9KTsKKyAg ICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLklzc3VlTWFu YWdlci5FdmVudC5Jc3N1ZVdhc0FkZGVkLCB7aXNzdWV9KTsKICAgICB9LAogCiAgICAgaXNzdWVz Rm9yU291cmNlQ29kZTogZnVuY3Rpb24oc291cmNlQ29kZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0xheWVyVHJlZU1hbmFnZXIu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9MYXll clRyZWVNYW5hZ2VyLmpzCmluZGV4IDBjOWJmOGQuLmRkZTQwZmEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0xheWVyVHJlZU1hbmFn ZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxl cnMvTGF5ZXJUcmVlTWFuYWdlci5qcwpAQCAtMTE5LDExICsxMTksNyBAQCBXZWJJbnNwZWN0b3Iu TGF5ZXJUcmVlTWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgcmV0dXJuICFu b2RlSWRzSW5OZXdMYXllcnMuY29udGFpbnMobm9kZUlkKSAmJiAhbGF5ZXJJZHNJbk5ld0xheWVy cy5jb250YWlucyhsYXllci5sYXllcklkKTsKICAgICAgICAgfSk7CiAKLSAgICAgICAgcmV0dXJu IHsKLSAgICAgICAgICAgIHByZXNlcnZlZDogcHJlc2VydmVkLAotICAgICAgICAgICAgYWRkaXRp b25zOiBhZGRpdGlvbnMsCi0gICAgICAgICAgICByZW1vdmFsczogcmVtb3ZhbHMKLSAgICAgICAg fTsKKyAgICAgICAgcmV0dXJuIHtwcmVzZXJ2ZWQsIGFkZGl0aW9ucywgcmVtb3ZhbHN9OwogICAg IH0sCiAKICAgICBsYXllcnNGb3JOb2RlOiBmdW5jdGlvbihub2RlLCBjYWxsYmFjaykKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0xv Z01hbmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9s bGVycy9Mb2dNYW5hZ2VyLmpzCmluZGV4IGY1OTEyNWIuLmEwOWQzMGYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0xvZ01hbmFnZXIu anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMv TG9nTWFuYWdlci5qcwpAQCAtNzUsNyArNzUsNyBAQCBXZWJJbnNwZWN0b3IuTG9nTWFuYWdlci5w cm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICAvLyBDYWxsZWQgZnJvbSBXZWJJbnNwZWN0b3Iu Q29uc29sZU9ic2VydmVyLgogCi0gICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJz KFdlYkluc3BlY3Rvci5Mb2dNYW5hZ2VyLkV2ZW50LlByZXZpb3VzTWVzc2FnZVJlcGVhdENvdW50 VXBkYXRlZCwge2NvdW50OiBjb3VudH0pOworICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xp c3RlbmVycyhXZWJJbnNwZWN0b3IuTG9nTWFuYWdlci5FdmVudC5QcmV2aW91c01lc3NhZ2VSZXBl YXRDb3VudFVwZGF0ZWQsIHtjb3VudH0pOwogICAgIH0sCiAKICAgICByZXF1ZXN0Q2xlYXJNZXNz YWdlczogZnVuY3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvQ29udHJvbGxlcnMvUHJvYmVNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvUHJvYmVNYW5hZ2VyLmpzCmluZGV4IDQyZGU1 OTIuLjlkOTQ1OWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL0NvbnRyb2xsZXJzL1Byb2JlTWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9Qcm9iZU1hbmFnZXIuanMKQEAgLTE2MCw3ICsx NjAsNyBAQCBXZWJJbnNwZWN0b3IuUHJvYmVNYW5hZ2VyLnByb3RvdHlwZSA9IHsKICAgICAgICAg ICAgIGlmICghcHJvYmVTZXQucHJvYmVzLmxlbmd0aCkgewogICAgICAgICAgICAgICAgIHRoaXMu X3Byb2JlU2V0c0J5QnJlYWtwb2ludC5kZWxldGUocHJvYmVTZXQuYnJlYWtwb2ludCk7CiAgICAg ICAgICAgICAgICAgcHJvYmVTZXQud2lsbFJlbW92ZSgpOwotICAgICAgICAgICAgICAgIHRoaXMu ZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5Qcm9iZU1hbmFnZXIuRXZlbnQu UHJvYmVTZXRSZW1vdmVkLCB7cHJvYmVTZXQ6IHByb2JlU2V0fSk7CisgICAgICAgICAgICAgICAg dGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlByb2JlTWFuYWdlci5F dmVudC5Qcm9iZVNldFJlbW92ZWQsIHtwcm9iZVNldH0pOwogICAgICAgICAgICAgfQogICAgICAg ICB9LCB0aGlzKTsKICAgICB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvUmVwbGF5TWFuYWdlci5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1JlcGxheU1hbmFnZXIuanMKaW5kZXgg Njk5NGJjMC4uNWNmOWRjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvQ29udHJvbGxlcnMvUmVwbGF5TWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9SZXBsYXlNYW5hZ2VyLmpzCkBAIC00 OTYsNyArNDk2LDcgQEAgV2ViSW5zcGVjdG9yLlJlcGxheU1hbmFnZXIucHJvdG90eXBlID0gewog ICAgICAgICAgICAgICAgIHRocm93IGVycm9yOwogICAgICAgICAgICAgfSk7CiAKLSAgICAgICAg dGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlJlcGxheU1hbmFnZXIu RXZlbnQuU2Vzc2lvbkFkZGVkLCB7c2Vzc2lvbklkOiBzZXNzaW9uSWR9KTsKKyAgICAgICAgdGhp cy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlJlcGxheU1hbmFnZXIuRXZl bnQuU2Vzc2lvbkFkZGVkLCB7c2Vzc2lvbklkfSk7CiAgICAgfSwKIAogICAgIHNlc3Npb25Nb2Rp ZmllZDogZnVuY3Rpb24oc2Vzc2lvbklkKQpAQCAtNTI4LDcgKzUyOCw3IEBAIFdlYkluc3BlY3Rv ci5SZXBsYXlNYW5hZ2VyLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICBtYW5hZ2VyLl9z ZXNzaW9uUHJvbWlzZXMuZGVsZXRlKHNlc3Npb25JZCk7CiAgICAgICAgICAgICAgICAgdmFyIHJl bW92ZWRTZXNzaW9uID0gbWFuYWdlci5fc2Vzc2lvbnMudGFrZShzZXNzaW9uSWQpOwogICAgICAg ICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHJlbW92ZWRTZXNzaW9uKTsKLSAgICAgICAgICAgICAg ICBtYW5hZ2VyLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuUmVwbGF5TWFu YWdlci5FdmVudC5TZXNzaW9uUmVtb3ZlZCwge3JlbW92ZWRTZXNzaW9uOiByZW1vdmVkU2Vzc2lv bn0pOworICAgICAgICAgICAgICAgIG1hbmFnZXIuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdl Ykluc3BlY3Rvci5SZXBsYXlNYW5hZ2VyLkV2ZW50LlNlc3Npb25SZW1vdmVkLCB7cmVtb3ZlZFNl c3Npb259KTsKICAgICAgICAgICAgIH0pOwogICAgIH0sCiAKQEAgLTU4OSw3ICs1ODksNyBAQCBX ZWJJbnNwZWN0b3IuUmVwbGF5TWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAg bWFuYWdlci5fc2VnbWVudFByb21pc2VzLmRlbGV0ZShzZWdtZW50SWQpOwogICAgICAgICAgICAg ICAgIHZhciByZW1vdmVkU2VnbWVudCA9IG1hbmFnZXIuX3NlZ21lbnRzLnRha2Uoc2VnbWVudElk KTsKICAgICAgICAgICAgICAgICBjb25zb2xlLmFzc2VydChyZW1vdmVkU2VnbWVudCk7Ci0gICAg ICAgICAgICAgICAgbWFuYWdlci5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9y LlJlcGxheU1hbmFnZXIuRXZlbnQuU2Vzc2lvblNlZ21lbnRSZW1vdmVkLCB7cmVtb3ZlZFNlZ21l bnQ6IHJlbW92ZWRTZWdtZW50fSk7CisgICAgICAgICAgICAgICAgbWFuYWdlci5kaXNwYXRjaEV2 ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlJlcGxheU1hbmFnZXIuRXZlbnQuU2Vzc2lvblNl Z21lbnRSZW1vdmVkLCB7cmVtb3ZlZFNlZ21lbnR9KTsKICAgICAgICAgICAgIH0pOwogICAgIH0s CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRy b2xsZXJzL1J1bnRpbWVNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQ29udHJvbGxlcnMvUnVudGltZU1hbmFnZXIuanMKaW5kZXggZDMwZTg1MC4uNzdkOTA0 NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJv bGxlcnMvUnVudGltZU1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvQ29udHJvbGxlcnMvUnVudGltZU1hbmFnZXIuanMKQEAgLTY3LDcgKzY3LDcgQEAg V2ViSW5zcGVjdG9yLlJ1bnRpbWVNYW5hZ2VyLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKFdl Ykluc3BlY3Rvci5kZWJ1Z2dlck1hbmFnZXIuYWN0aXZlQ2FsbEZyYW1lKSB7CiAgICAgICAgICAg ICAvLyBDT01QQVRJQklMSVRZIChpT1MgNik6ICJnZW5lcmF0ZVByZXZpZXciIGRpZCBub3QgZXhp c3QuCiAgICAgICAgICAgICAvLyBDT01QQVRJQklMSVRZIChpT1MgOCk6ICJzYXZlUmVzdWx0IiBk aWQgbm90IGV4aXN0LgotICAgICAgICAgICAgRGVidWdnZXJBZ2VudC5ldmFsdWF0ZU9uQ2FsbEZy YW1lLmludm9rZSh7Y2FsbEZyYW1lSWQ6IFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1hbmFnZXIuYWN0 aXZlQ2FsbEZyYW1lLmlkLCBleHByZXNzaW9uOiBleHByZXNzaW9uLCBvYmplY3RHcm91cDogb2Jq ZWN0R3JvdXAsIGluY2x1ZGVDb21tYW5kTGluZUFQSTogaW5jbHVkZUNvbW1hbmRMaW5lQVBJLCBk b05vdFBhdXNlT25FeGNlcHRpb25zQW5kTXV0ZUNvbnNvbGU6IGRvTm90UGF1c2VPbkV4Y2VwdGlv bnNBbmRNdXRlQ29uc29sZSwgcmV0dXJuQnlWYWx1ZTogcmV0dXJuQnlWYWx1ZSwgZ2VuZXJhdGVQ cmV2aWV3OiBnZW5lcmF0ZVByZXZpZXcsIHNhdmVSZXN1bHQ6IHNhdmVSZXN1bHR9LCBldmFsQ2Fs bGJhY2suYmluZCh0aGlzKSk7CisgICAgICAgICAgICBEZWJ1Z2dlckFnZW50LmV2YWx1YXRlT25D YWxsRnJhbWUuaW52b2tlKHtjYWxsRnJhbWVJZDogV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTWFuYWdl ci5hY3RpdmVDYWxsRnJhbWUuaWQsIGV4cHJlc3Npb24sIG9iamVjdEdyb3VwLCBpbmNsdWRlQ29t bWFuZExpbmVBUEksIGRvTm90UGF1c2VPbkV4Y2VwdGlvbnNBbmRNdXRlQ29uc29sZSwgcmV0dXJu QnlWYWx1ZSwgZ2VuZXJhdGVQcmV2aWV3LCBzYXZlUmVzdWx0fSwgZXZhbENhbGxiYWNrLmJpbmQo dGhpcykpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKQEAgLTc2LDcgKzc2LDcg QEAgV2ViSW5zcGVjdG9yLlJ1bnRpbWVNYW5hZ2VyLnByb3RvdHlwZSA9IHsKICAgICAgICAgLy8g Q09NUEFUSUJJTElUWSAoaU9TIDYpOiAiZ2VuZXJhdGVQcmV2aWV3IiBkaWQgbm90IGV4aXN0Lgog ICAgICAgICAvLyBDT01QQVRJQklMSVRZIChpT1MgOCk6ICJzYXZlUmVzdWx0IiBkaWQgbm90IGV4 aXN0LgogICAgICAgICB2YXIgY29udGV4dElkID0gV2ViSW5zcGVjdG9yLnF1aWNrQ29uc29sZS5l eGVjdXRpb25Db250ZXh0SWRlbnRpZmllcjsKLSAgICAgICAgUnVudGltZUFnZW50LmV2YWx1YXRl Lmludm9rZSh7ZXhwcmVzc2lvbjogZXhwcmVzc2lvbiwgb2JqZWN0R3JvdXA6IG9iamVjdEdyb3Vw LCBpbmNsdWRlQ29tbWFuZExpbmVBUEk6IGluY2x1ZGVDb21tYW5kTGluZUFQSSwgZG9Ob3RQYXVz ZU9uRXhjZXB0aW9uc0FuZE11dGVDb25zb2xlOiBkb05vdFBhdXNlT25FeGNlcHRpb25zQW5kTXV0 ZUNvbnNvbGUsIGNvbnRleHRJZDogY29udGV4dElkLCBmcmFtZUlkOiBjb250ZXh0SWQsIHJldHVy bkJ5VmFsdWU6IHJldHVybkJ5VmFsdWUsIGdlbmVyYXRlUHJldmlldzogZ2VuZXJhdGVQcmV2aWV3 LCBzYXZlUmVzdWx0OiBzYXZlUmVzdWx0fSwgZXZhbENhbGxiYWNrLmJpbmQodGhpcykpOworICAg ICAgICBSdW50aW1lQWdlbnQuZXZhbHVhdGUuaW52b2tlKHtleHByZXNzaW9uLCBvYmplY3RHcm91 cCwgaW5jbHVkZUNvbW1hbmRMaW5lQVBJLCBkb05vdFBhdXNlT25FeGNlcHRpb25zQW5kTXV0ZUNv bnNvbGUsIGNvbnRleHRJZCwgZnJhbWVJZDogY29udGV4dElkLCByZXR1cm5CeVZhbHVlLCBnZW5l cmF0ZVByZXZpZXcsIHNhdmVSZXN1bHR9LCBldmFsQ2FsbGJhY2suYmluZCh0aGlzKSk7CiAgICAg fSwKIAogICAgIHNhdmVSZXN1bHQ6IGZ1bmN0aW9uKHJlbW90ZU9iamVjdCwgY2FsbGJhY2spCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVy cy9TdG9yYWdlTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0NvbnRyb2xsZXJzL1N0b3JhZ2VNYW5hZ2VyLmpzCmluZGV4IDI5ZjM1YzcuLmNlZWNlMzAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJz L1N0b3JhZ2VNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL0NvbnRyb2xsZXJzL1N0b3JhZ2VNYW5hZ2VyLmpzCkBAIC03Nyw3ICs3Nyw3IEBAIFdlYklu c3BlY3Rvci5TdG9yYWdlTWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBkb21TdG9y YWdlID0gbmV3IFdlYkluc3BlY3Rvci5ET01TdG9yYWdlT2JqZWN0KGlkLCBob3N0LCBpc0xvY2Fs U3RvcmFnZSk7CiAKICAgICAgICAgdGhpcy5fZG9tU3RvcmFnZU9iamVjdHMucHVzaChkb21TdG9y YWdlKTsKLSAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9y LlN0b3JhZ2VNYW5hZ2VyLkV2ZW50LkRPTVN0b3JhZ2VPYmplY3RXYXNBZGRlZCwge2RvbVN0b3Jh Z2U6IGRvbVN0b3JhZ2V9KTsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMo V2ViSW5zcGVjdG9yLlN0b3JhZ2VNYW5hZ2VyLkV2ZW50LkRPTVN0b3JhZ2VPYmplY3RXYXNBZGRl ZCwge2RvbVN0b3JhZ2V9KTsKICAgICB9LAogCiAgICAgZGF0YWJhc2VXYXNBZGRlZDogZnVuY3Rp b24oaWQsIGhvc3QsIG5hbWUsIHZlcnNpb24pCkBAIC04NSw3ICs4NSw3IEBAIFdlYkluc3BlY3Rv ci5TdG9yYWdlTWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBkYXRhYmFzZSA9IG5l dyBXZWJJbnNwZWN0b3IuRGF0YWJhc2VPYmplY3QoaWQsIGhvc3QsIG5hbWUsIHZlcnNpb24pOwog CiAgICAgICAgIHRoaXMuX2RhdGFiYXNlT2JqZWN0cy5wdXNoKGRhdGFiYXNlKTsKLSAgICAgICAg dGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlN0b3JhZ2VNYW5hZ2Vy LkV2ZW50LkRhdGFiYXNlV2FzQWRkZWQsIHtkYXRhYmFzZTogZGF0YWJhc2V9KTsKKyAgICAgICAg dGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlN0b3JhZ2VNYW5hZ2Vy LkV2ZW50LkRhdGFiYXNlV2FzQWRkZWQsIHtkYXRhYmFzZX0pOwogICAgIH0sCiAKICAgICBkb21T dG9yYWdlV2FzVXBkYXRlZDogZnVuY3Rpb24oaWQpCkBAIC0xMTksNyArMTE5LDcgQEAgV2ViSW5z cGVjdG9yLlN0b3JhZ2VNYW5hZ2VyLnByb3RvdHlwZSA9IHsKICAgICAgICAgY29uc29sZS5hc3Nl cnQoZGF0YWJhc2UpOwogICAgICAgICBpZiAoIWRhdGFiYXNlKQogICAgICAgICAgICAgcmV0dXJu OwotICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuU3Rv cmFnZU1hbmFnZXIuRXZlbnQuRGF0YWJhc2VXYXNJbnNwZWN0ZWQsIHtkYXRhYmFzZTogZGF0YWJh c2V9KTsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9y LlN0b3JhZ2VNYW5hZ2VyLkV2ZW50LkRhdGFiYXNlV2FzSW5zcGVjdGVkLCB7ZGF0YWJhc2V9KTsK ICAgICB9LAogCiAgICAgaW5zcGVjdERPTVN0b3JhZ2U6IGZ1bmN0aW9uKGlkKQpAQCAtMTI4LDcg KzEyOCw3IEBAIFdlYkluc3BlY3Rvci5TdG9yYWdlTWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAg ICAgIGNvbnNvbGUuYXNzZXJ0KGRvbVN0b3JhZ2UpOwogICAgICAgICBpZiAoIWRvbVN0b3JhZ2Up CiAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVu ZXJzKFdlYkluc3BlY3Rvci5TdG9yYWdlTWFuYWdlci5FdmVudC5ET01TdG9yYWdlT2JqZWN0V2Fz SW5zcGVjdGVkLCB7ZG9tU3RvcmFnZTogZG9tU3RvcmFnZX0pOworICAgICAgICB0aGlzLmRpc3Bh dGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuU3RvcmFnZU1hbmFnZXIuRXZlbnQuRE9N U3RvcmFnZU9iamVjdFdhc0luc3BlY3RlZCwge2RvbVN0b3JhZ2V9KTsKICAgICB9LAogCiAgICAg Ly8gUHJvdGVjdGVkCkBAIC0yNTYsNyArMjU2LDcgQEAgV2ViSW5zcGVjdG9yLlN0b3JhZ2VNYW5h Z2VyLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHZhciBpbmRleGVkRGF0YWJhc2UgPSBuZXcg V2ViSW5zcGVjdG9yLkluZGV4ZWREYXRhYmFzZShkYXRhYmFzZVBheWxvYWQubmFtZSwgc2VjdXJp dHlPcmlnaW4sIGRhdGFiYXNlUGF5bG9hZC52ZXJzaW9uLCBvYmplY3RTdG9yZXMpOwogCiAgICAg ICAgICAgICB0aGlzLl9pbmRleGVkRGF0YWJhc2VzLnB1c2goaW5kZXhlZERhdGFiYXNlKTsKLSAg ICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5TdG9y YWdlTWFuYWdlci5FdmVudC5JbmRleGVkRGF0YWJhc2VXYXNBZGRlZCwge2luZGV4ZWREYXRhYmFz ZTogaW5kZXhlZERhdGFiYXNlfSk7CisgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xp c3RlbmVycyhXZWJJbnNwZWN0b3IuU3RvcmFnZU1hbmFnZXIuRXZlbnQuSW5kZXhlZERhdGFiYXNl V2FzQWRkZWQsIHtpbmRleGVkRGF0YWJhc2V9KTsKICAgICAgICAgfQogCiAgICAgICAgIGZ1bmN0 aW9uIHByb2Nlc3NLZXlQYXRoKGtleVBhdGhQYXlsb2FkKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxp bmVNYW5hZ2VyLmpzCmluZGV4IGFhNjUzYTMuLjk3MDExMTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1RpbWVsaW5lTWFuYWdlci5q cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9U aW1lbGluZU1hbmFnZXIuanMKQEAgLTQyOSw3ICs0MjksNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxp bmVNYW5hZ2VyLnByb3RvdHlwZSA9IHsKIAogICAgICAgICB0aGlzLl9sZWdhY3lGaXJzdFJlY29y ZGVkVGltZXN0YW1wID0gTmFOOwogICAgICAgICB0aGlzLl9hY3RpdmVSZWNvcmRpbmcgPSBuZXdS ZWNvcmRpbmc7Ci0gICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3Bl Y3Rvci5UaW1lbGluZU1hbmFnZXIuRXZlbnQuUmVjb3JkaW5nTG9hZGVkLCB7b2xkUmVjb3JkaW5n OiBvbGRSZWNvcmRpbmd9KTsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMo V2ViSW5zcGVjdG9yLlRpbWVsaW5lTWFuYWdlci5FdmVudC5SZWNvcmRpbmdMb2FkZWQsIHtvbGRS ZWNvcmRpbmd9KTsKICAgICB9LAogCiAgICAgX2NhbGxGcmFtZXNGcm9tUGF5bG9hZDogZnVuY3Rp b24ocGF5bG9hZCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL01vZGVscy9DU1NTdHlsZURlY2xhcmF0aW9uLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NTU1N0eWxlRGVjbGFyYXRpb24uanMKaW5kZXggNWZjMGNm Mi4uZWMwNTllMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvTW9kZWxzL0NTU1N0eWxlRGVjbGFyYXRpb24uanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NTU1N0eWxlRGVjbGFyYXRpb24uanMKQEAgLTE3MSw3 ICsxNzEsNyBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvbi5wcm90b3R5cGUgPSB7 CiAKICAgICAgICAgZnVuY3Rpb24gZGVsYXllZCgpCiAgICAgICAgIHsKLSAgICAgICAgICAgIHRo aXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0 aW9uLkV2ZW50LlByb3BlcnRpZXNDaGFuZ2VkLCB7YWRkZWRQcm9wZXJ0aWVzOiBhZGRlZFByb3Bl cnRpZXMsIHJlbW92ZWRQcm9wZXJ0aWVzOiByZW1vdmVkUHJvcGVydGllc30pOworICAgICAgICAg ICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVj bGFyYXRpb24uRXZlbnQuUHJvcGVydGllc0NoYW5nZWQsIHthZGRlZFByb3BlcnRpZXMsIHJlbW92 ZWRQcm9wZXJ0aWVzfSk7CiAgICAgICAgIH0KIAogICAgICAgICAvLyBEZWxheSBmaXJpbmcgdGhl IFByb3BlcnRpZXNDaGFuZ2VkIGV2ZW50IHNvIERPTU5vZGVTdHlsZXMgaGFzIGEgY2hhbmNlIHRv IG1hcmsgb3ZlcnJpZGRlbiBhbmQgYXNzb2NpYXRlZCBwcm9wZXJ0aWVzLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTU5vZGUuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZS5qcwppbmRl eCA1OTAyNmEzLi4yNWEzZWY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZS5qcwpAQCAtNTE3LDExICs1MTcsNyBAQCBXZWJJ bnNwZWN0b3IuRE9NTm9kZS5wcm90b3R5cGUgPSB7CiAKICAgICBfYWRkQXR0cmlidXRlOiBmdW5j dGlvbihuYW1lLCB2YWx1ZSkKICAgICB7Ci0gICAgICAgIHZhciBhdHRyID0gewotICAgICAgICAg ICAgbmFtZTogbmFtZSwKLSAgICAgICAgICAgIHZhbHVlOiB2YWx1ZSwKLSAgICAgICAgICAgIF9u b2RlOiB0aGlzCi0gICAgICAgIH07CisgICAgICAgIHZhciBhdHRyID0ge25hbWUsIHZhbHVlLCBf bm9kZTogdGhpc307CiAgICAgICAgIHRoaXMuX2F0dHJpYnV0ZXNNYXBbbmFtZV0gPSBhdHRyOwog ICAgICAgICB0aGlzLl9hdHRyaWJ1dGVzLnB1c2goYXR0cik7CiAgICAgfSwKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2RlU3R5bGVz LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTU5vZGVT dHlsZXMuanMKaW5kZXggYmIyMmEyNC4uNzI1MjY3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTU5vZGVTdHlsZXMuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTU5vZGVTdHlsZXMuanMK QEAgLTI0MCw3ICsyNDAsNyBAQCBXZWJJbnNwZWN0b3IuRE9NTm9kZVN0eWxlcy5wcm90b3R5cGUg PSB7CiAgICAgICAgICAgICAvLyBEZWxldGUgdGhlIHByZXZpb3VzIHNhdmVkIHNpZ25pZmljYW50 IGNoYW5nZSBmbGFnIHNvIHdlIHJlc2NhbiBmb3IgYSBzaWduaWZpY2FudCBjaGFuZ2UgbmV4dCB0 aW1lLgogICAgICAgICAgICAgZGVsZXRlIHRoaXMuX3ByZXZpb3VzU2lnbmlmaWNhbnRDaGFuZ2U7 CiAKLSAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rv ci5ET01Ob2RlU3R5bGVzLkV2ZW50LlJlZnJlc2hlZCwge3NpZ25pZmljYW50Q2hhbmdlOiBzaWdu aWZpY2FudENoYW5nZX0pOworICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5l cnMoV2ViSW5zcGVjdG9yLkRPTU5vZGVTdHlsZXMuRXZlbnQuUmVmcmVzaGVkLCB7c2lnbmlmaWNh bnRDaGFuZ2V9KTsKICAgICAgICAgfQogCiAgICAgICAgIENTU0FnZW50LmdldE1hdGNoZWRTdHls ZXNGb3JOb2RlLmludm9rZSh7bm9kZUlkOiB0aGlzLl9ub2RlLmlkLCBpbmNsdWRlUHNldWRvOiB0 cnVlLCBpbmNsdWRlSW5oZXJpdGVkOiB0cnVlfSwgZmV0Y2hlZE1hdGNoZWRTdHlsZXMuYmluZCh0 aGlzKSk7CkBAIC0yNjIsNyArMjYyLDcgQEAgV2ViSW5zcGVjdG9yLkRPTU5vZGVTdHlsZXMucHJv dG90eXBlID0gewogCiAgICAgICAgIHNlbGVjdG9yID0gdGhpcy5fbm9kZS5hcHByb3ByaWF0ZVNl bGVjdG9yRm9yKHRydWUpOwogCi0gICAgICAgIENTU0FnZW50LmFkZFJ1bGUuaW52b2tlKHtjb250 ZXh0Tm9kZUlkOiB0aGlzLl9ub2RlLmlkLCBzZWxlY3Rvcjogc2VsZWN0b3J9LCBhZGRlZFJ1bGUu YmluZCh0aGlzKSk7CisgICAgICAgIENTU0FnZW50LmFkZFJ1bGUuaW52b2tlKHtjb250ZXh0Tm9k ZUlkOiB0aGlzLl9ub2RlLmlkLCBzZWxlY3Rvcn0sIGFkZGVkUnVsZS5iaW5kKHRoaXMpKTsKICAg ICB9LAogCiAgICAgZ2V0IG1hdGNoZWRSdWxlcygpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NU3RvcmFnZU9iamVjdC5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01TdG9yYWdlT2JqZWN0Lmpz CmluZGV4IGIzZjhhNDAuLjhmMTc1OTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01TdG9yYWdlT2JqZWN0LmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01TdG9yYWdlT2JqZWN0LmpzCkBA IC0xMTQsMTkgKzExNCwxOSBAQCBXZWJJbnNwZWN0b3IuRE9NU3RvcmFnZU9iamVjdC5wcm90b3R5 cGUgPSB7CiAgICAgaXRlbVJlbW92ZWQ6IGZ1bmN0aW9uKGtleSkKICAgICB7CiAgICAgICAgIHRo aXMuX2VudHJpZXMuZGVsZXRlKGtleSk7Ci0gICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlz dGVuZXJzKFdlYkluc3BlY3Rvci5ET01TdG9yYWdlT2JqZWN0LkV2ZW50Lkl0ZW1SZW1vdmVkLCB7 a2V5OiBrZXl9KTsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5z cGVjdG9yLkRPTVN0b3JhZ2VPYmplY3QuRXZlbnQuSXRlbVJlbW92ZWQsIHtrZXl9KTsKICAgICB9 LAogCiAgICAgaXRlbUFkZGVkOiBmdW5jdGlvbihrZXksIHZhbHVlKQogICAgIHsKICAgICAgICAg dGhpcy5fZW50cmllcy5zZXQoa2V5LCB2YWx1ZSk7Ci0gICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVu dFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5ET01TdG9yYWdlT2JqZWN0LkV2ZW50Lkl0ZW1BZGRl ZCwge2tleToga2V5LCB2YWx1ZTogdmFsdWV9KTsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50 VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VPYmplY3QuRXZlbnQuSXRlbUFkZGVk LCB7a2V5LCB2YWx1ZX0pOwogICAgIH0sCiAKICAgICBpdGVtVXBkYXRlZDogZnVuY3Rpb24oa2V5 LCBvbGRWYWx1ZSwgdmFsdWUpCiAgICAgewogICAgICAgICB0aGlzLl9lbnRyaWVzLnNldChrZXks IHZhbHVlKTsKLSAgICAgICAgdmFyIGRhdGEgPSB7a2V5OiBrZXksIG9sZFZhbHVlOiBvbGRWYWx1 ZSwgdmFsdWU6IHZhbHVlfTsKKyAgICAgICAgdmFyIGRhdGEgPSB7a2V5LCBvbGRWYWx1ZSwgdmFs dWV9OwogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3Iu RE9NU3RvcmFnZU9iamVjdC5FdmVudC5JdGVtVXBkYXRlZCwgZGF0YSk7CiAgICAgfQogfTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01U cmVlLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTVRy ZWUuanMKaW5kZXggY2U2Mzg0My4uMDBjNWY1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTVRyZWUuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTVRyZWUuanMKQEAgLTIxMSw3ICsyMTEs NyBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAvLyBD T01QQVRJQklMSVRZIChpT1MgNik6IEV4ZWN1dGlvbiBjb250ZXh0IGlkZW50aWZpZXJzIChjb250 ZXh0SWQpIGRpZCBub3QgZXhpc3QKICAgICAgICAgICAgIC8vIGluIGlPUyA2LiBGYWxsYmFjayB0 byBpbmNsdWRpbmcgdGhlIGZyYW1lIGlkZW50aWZpZXIgKGZyYW1lSWQpLgogICAgICAgICAgICAg dmFyIGNvbnRleHRJZCA9IHRoaXMuX2ZyYW1lLnBhZ2VFeGVjdXRpb25Db250ZXh0ID8gdGhpcy5f ZnJhbWUucGFnZUV4ZWN1dGlvbkNvbnRleHQuaWQgOiB1bmRlZmluZWQ7Ci0gICAgICAgICAgICBS dW50aW1lQWdlbnQuZXZhbHVhdGUuaW52b2tlKHtleHByZXNzaW9uOiAiZG9jdW1lbnQiLCBvYmpl Y3RHcm91cDogIiIsIGluY2x1ZGVDb21tYW5kTGluZUFQSTogZmFsc2UsIGRvTm90UGF1c2VPbkV4 Y2VwdGlvbnNBbmRNdXRlQ29uc29sZTogdHJ1ZSwgY29udGV4dElkOiBjb250ZXh0SWQsIGZyYW1l SWQ6IHRoaXMuX2ZyYW1lLmlkLCByZXR1cm5CeVZhbHVlOiBmYWxzZSwgZ2VuZXJhdGVQcmV2aWV3 OiBmYWxzZX0sIHJvb3RPYmplY3RBdmFpbGFibGUuYmluZCh0aGlzKSk7CisgICAgICAgICAgICBS dW50aW1lQWdlbnQuZXZhbHVhdGUuaW52b2tlKHtleHByZXNzaW9uOiAiZG9jdW1lbnQiLCBvYmpl Y3RHcm91cDogIiIsIGluY2x1ZGVDb21tYW5kTGluZUFQSTogZmFsc2UsIGRvTm90UGF1c2VPbkV4 Y2VwdGlvbnNBbmRNdXRlQ29uc29sZTogdHJ1ZSwgY29udGV4dElkLCBmcmFtZUlkOiB0aGlzLl9m cmFtZS5pZCwgcmV0dXJuQnlWYWx1ZTogZmFsc2UsIGdlbmVyYXRlUHJldmlldzogZmFsc2V9LCBy b290T2JqZWN0QXZhaWxhYmxlLmJpbmQodGhpcykpOwogICAgICAgICB9CiAgICAgfSwKIApAQCAt MzE0LDcgKzMxNCw3IEBAIFdlYkluc3BlY3Rvci5ET01UcmVlLnByb3RvdHlwZSA9IHsKICAgICAg ICAgY29uc29sZS5hc3NlcnQoIXRoaXMuX2Zsb3dNYXAuaGFzT3duUHJvcGVydHkoZmxvd0lkKSk7 CiAgICAgICAgIHRoaXMuX2Zsb3dNYXBbZmxvd0lkXSA9IGZsb3c7CiAKLSAgICAgICAgdGhpcy5k aXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRPTVRyZWUuRXZlbnQuQ29udGVu dEZsb3dXYXNBZGRlZCwge2Zsb3c6IGZsb3d9KTsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50 VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRPTVRyZWUuRXZlbnQuQ29udGVudEZsb3dXYXNBZGRl ZCwge2Zsb3d9KTsKICAgICB9LAogCiAgICAgX2NvbnRlbnRGbG93V2FzUmVtb3ZlZDogZnVuY3Rp b24oZXZlbnQpCkBAIC0zMjcsNyArMzI3LDcgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWUucHJvdG90 eXBlID0gewogICAgICAgICBjb25zb2xlLmFzc2VydCh0aGlzLl9mbG93TWFwLmhhc093blByb3Bl cnR5KGZsb3dJZCkpOwogICAgICAgICBkZWxldGUgdGhpcy5fZmxvd01hcFtmbG93SWRdOwogCi0g ICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5ET01UcmVl LkV2ZW50LkNvbnRlbnRGbG93V2FzUmVtb3ZlZCwge2Zsb3c6IGZsb3d9KTsKKyAgICAgICAgdGhp cy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRPTVRyZWUuRXZlbnQuQ29u dGVudEZsb3dXYXNSZW1vdmVkLCB7Zmxvd30pOwogICAgIH0KIH07CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9GcmFtZS5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9GcmFtZS5qcwppbmRleCAwNmQy MDQ5Li44NDU0ZjIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9Nb2RlbHMvRnJhbWUuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvTW9kZWxzL0ZyYW1lLmpzCkBAIC0xMDgsMTAgKzEwOCwxMCBAQCBXZWJJbnNwZWN0b3Iu RnJhbWUucHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5fZGlzcGF0Y2hNYWluUmVzb3Vy Y2VEaWRDaGFuZ2VFdmVudChvbGRNYWluUmVzb3VyY2UpOwogCiAgICAgICAgIGlmICh0aGlzLl9z ZWN1cml0eU9yaWdpbiAhPT0gb2xkU2VjdXJpdHlPcmlnaW4pCi0gICAgICAgICAgICB0aGlzLmRp c3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRnJhbWUuRXZlbnQuU2VjdXJpdHlP cmlnaW5EaWRDaGFuZ2UsIHtvbGRTZWN1cml0eU9yaWdpbjogb2xkU2VjdXJpdHlPcmlnaW59KTsK KyAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5G cmFtZS5FdmVudC5TZWN1cml0eU9yaWdpbkRpZENoYW5nZSwge29sZFNlY3VyaXR5T3JpZ2lufSk7 CiAKICAgICAgICAgaWYgKHRoaXMuX25hbWUgIT09IG9sZE5hbWUpCi0gICAgICAgICAgICB0aGlz LmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRnJhbWUuRXZlbnQuTmFtZURp ZENoYW5nZSwge29sZE5hbWU6IG9sZE5hbWV9KTsKKyAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hF dmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5GcmFtZS5FdmVudC5OYW1lRGlkQ2hhbmdlLCB7 b2xkTmFtZX0pOwogICAgIH0sCiAKICAgICBzdGFydFByb3Zpc2lvbmFsTG9hZDogZnVuY3Rpb24o cHJvdmlzaW9uYWxNYWluUmVzb3VyY2UpCkBAIC0xNjMsNyArMTYzLDcgQEAgV2ViSW5zcGVjdG9y LkZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuX2Rpc3BhdGNoTWFpblJlc291 cmNlRGlkQ2hhbmdlRXZlbnQob2xkTWFpblJlc291cmNlKTsKIAogICAgICAgICBpZiAodGhpcy5f c2VjdXJpdHlPcmlnaW4gIT09IG9sZFNlY3VyaXR5T3JpZ2luKQotICAgICAgICAgICAgdGhpcy5k aXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkZyYW1lLkV2ZW50LlNlY3VyaXR5 T3JpZ2luRGlkQ2hhbmdlLCB7b2xkU2VjdXJpdHlPcmlnaW46IG9sZFNlY3VyaXR5T3JpZ2lufSk7 CisgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3Iu RnJhbWUuRXZlbnQuU2VjdXJpdHlPcmlnaW5EaWRDaGFuZ2UsIHtvbGRTZWN1cml0eU9yaWdpbn0p OwogICAgIH0sCiAKICAgICBjbGVhclByb3Zpc2lvbmFsTG9hZDogZnVuY3Rpb24oc2tpcFByb3Zp c2lvbmFsTG9hZENsZWFyZWRFdmVudCkKQEAgLTM1OCw3ICszNTgsNyBAQCBXZWJJbnNwZWN0b3Iu RnJhbWUucHJvdG90eXBlID0gewogCiAgICAgICAgIGNoaWxkRnJhbWUuX3BhcmVudEZyYW1lID0g bnVsbDsKIAotICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0 b3IuRnJhbWUuRXZlbnQuQ2hpbGRGcmFtZVdhc1JlbW92ZWQsIHtjaGlsZEZyYW1lOiBjaGlsZEZy YW1lfSk7CisgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rv ci5GcmFtZS5FdmVudC5DaGlsZEZyYW1lV2FzUmVtb3ZlZCwge2NoaWxkRnJhbWV9KTsKICAgICB9 LAogCiAgICAgcmVtb3ZlQWxsQ2hpbGRGcmFtZXM6IGZ1bmN0aW9uKCkKQEAgLTQyNywxMCArNDI3 LDEwIEBAIFdlYkluc3BlY3Rvci5GcmFtZS5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgaWYgKHRo aXMuX2lzUHJvdmlzaW9uYWxSZXNvdXJjZShyZXNvdXJjZSkpIHsKICAgICAgICAgICAgIHRoaXMu X3Byb3Zpc2lvbmFsUmVzb3VyY2VDb2xsZWN0aW9uLmFkZFJlc291cmNlKHJlc291cmNlKTsKLSAg ICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5GcmFt ZS5FdmVudC5Qcm92aXNpb25hbFJlc291cmNlV2FzQWRkZWQsIHtyZXNvdXJjZTogcmVzb3VyY2V9 KTsKKyAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rv ci5GcmFtZS5FdmVudC5Qcm92aXNpb25hbFJlc291cmNlV2FzQWRkZWQsIHtyZXNvdXJjZX0pOwog ICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgdGhpcy5fcmVzb3VyY2VDb2xsZWN0aW9uLmFk ZFJlc291cmNlKHJlc291cmNlKTsKLSAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlz dGVuZXJzKFdlYkluc3BlY3Rvci5GcmFtZS5FdmVudC5SZXNvdXJjZVdhc0FkZGVkLCB7cmVzb3Vy Y2U6IHJlc291cmNlfSk7CisgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVy cyhXZWJJbnNwZWN0b3IuRnJhbWUuRXZlbnQuUmVzb3VyY2VXYXNBZGRlZCwge3Jlc291cmNlfSk7 CiAgICAgICAgIH0KICAgICB9LAogCkBAIC00NDQsNyArNDQ0LDcgQEAgV2ViSW5zcGVjdG9yLkZy YW1lLnByb3RvdHlwZSA9IHsKIAogICAgICAgICB0aGlzLl9kaXNhc3NvY2lhdGVXaXRoUmVzb3Vy Y2UocmVzb3VyY2UpOwogCi0gICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdl Ykluc3BlY3Rvci5GcmFtZS5FdmVudC5SZXNvdXJjZVdhc1JlbW92ZWQsIHtyZXNvdXJjZTogcmVz b3VyY2V9KTsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVj dG9yLkZyYW1lLkV2ZW50LlJlc291cmNlV2FzUmVtb3ZlZCwge3Jlc291cmNlfSk7CiAgICAgfSwK IAogICAgIHJlbW92ZUFsbFJlc291cmNlczogZnVuY3Rpb24oKQpAQCAtNDk2LDcgKzQ5Niw3IEBA IFdlYkluc3BlY3Rvci5GcmFtZS5wcm90b3R5cGUgPSB7CiAKICAgICBfZGlzcGF0Y2hNYWluUmVz b3VyY2VEaWRDaGFuZ2VFdmVudDogZnVuY3Rpb24ob2xkTWFpblJlc291cmNlKQogICAgIHsKLSAg ICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkZyYW1lLkV2 ZW50Lk1haW5SZXNvdXJjZURpZENoYW5nZSwge29sZE1haW5SZXNvdXJjZTogb2xkTWFpblJlc291 cmNlfSk7CisgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rv ci5GcmFtZS5FdmVudC5NYWluUmVzb3VyY2VEaWRDaGFuZ2UsIHtvbGRNYWluUmVzb3VyY2V9KTsK ICAgICB9CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9Nb2RlbHMvR3JhZGllbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9Nb2RlbHMvR3JhZGllbnQuanMKaW5kZXggMDNmNjhkZi4uNzIwNGRlYiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0dyYWRpZW50Lmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9HcmFkaWVu dC5qcwpAQCAtMTA0LDcgKzEwNCw3IEBAIFdlYkluc3BlY3Rvci5HcmFkaWVudCA9IHsKICAgICAg ICAgICAgICAgICBpZiAoIWNvbG9yKQogICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKIAot ICAgICAgICAgICAgICAgIHZhciBzdG9wID0ge2NvbG9yOiBjb2xvcn07CisgICAgICAgICAgICAg ICAgdmFyIHN0b3AgPSB7Y29sb3J9OwogICAgICAgICAgICAgICAgIGlmIChjb21wb25lbnQubGVu Z3RoICYmIGNvbXBvbmVudFswXS5zdWJzdHIoLTEpID09PSAiJSIpCiAgICAgICAgICAgICAgICAg ICAgIHN0b3Aub2Zmc2V0ID0gcGFyc2VGbG9hdChjb21wb25lbnQuc2hpZnQoKSkgLyAxMDA7CiAg ICAgICAgICAgICAgICAgcmV0dXJuIHN0b3A7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvUHJvYmVTZXQuanMgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvUHJvYmVTZXQuanMKaW5kZXggZWRhZjc3ZS4uMWYw MjBmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9k ZWxzL1Byb2JlU2V0LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L01vZGVscy9Qcm9iZVNldC5qcwpAQCAtODYsNyArODYsNyBAQCBXZWJJbnNwZWN0b3IuUHJvYmVT ZXQucHJvdG90eXBlID0gewogCiAgICAgICAgIHZhciBvbGRUYWJsZSA9IHRoaXMuX2RhdGFUYWJs ZTsKICAgICAgICAgdGhpcy5fY3JlYXRlRGF0YVRhYmxlKCk7Ci0gICAgICAgIHRoaXMuZGlzcGF0 Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5Qcm9iZVNldC5FdmVudC5TYW1wbGVzQ2xl YXJlZCwge29sZFRhYmxlOiBvbGRUYWJsZX0pOworICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRU b0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuUHJvYmVTZXQuRXZlbnQuU2FtcGxlc0NsZWFyZWQsIHtv bGRUYWJsZX0pOwogICAgIH0sCiAKICAgICBjcmVhdGVQcm9iZTogZnVuY3Rpb24oZXhwcmVzc2lv bikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVs cy9Qcm9maWxlTm9kZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01v ZGVscy9Qcm9maWxlTm9kZS5qcwppbmRleCAyODdhMGJiLi44NGZkYWY2MCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1Byb2ZpbGVOb2RlLmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9Qcm9maWxl Tm9kZS5qcwpAQCAtMTc1LDcgKzE3NSw3IEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlTm9kZS5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHZhciBzZWxmVGltZSA9IHRvdGFsVGltZSAtIGNoaWxkTm9kZXNU b3RhbFRpbWU7CiAgICAgICAgIHZhciBhdmVyYWdlVGltZSA9IHNlbGZUaW1lIC8gY2FsbENvdW50 OwogCi0gICAgICAgIHJldHVybiB7c3RhcnRUaW1lOiBzdGFydFRpbWUsIGVuZFRpbWU6IGVuZFRp bWUsIHRvdGFsVGltZTogdG90YWxUaW1lLCBzZWxmVGltZTogc2VsZlRpbWUsIGNhbGxDb3VudDog Y2FsbENvdW50LCBhdmVyYWdlVGltZTogYXZlcmFnZVRpbWV9OworICAgICAgICByZXR1cm4ge3N0 YXJ0VGltZSwgZW5kVGltZSwgdG90YWxUaW1lLCBzZWxmVGltZSwgY2FsbENvdW50LCBhdmVyYWdl VGltZX07CiAgICAgfSwKIAogICAgIHRyYXZlcnNlTmV4dFByb2ZpbGVOb2RlOiBmdW5jdGlvbihz dGF5V2l0aGluKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvTW9kZWxzL1JlcGxheVNlc3Npb24uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9Nb2RlbHMvUmVwbGF5U2Vzc2lvbi5qcwppbmRleCBjMTFhM2VkLi45MmE2MjQyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvUmVw bGF5U2Vzc2lvbi5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9N b2RlbHMvUmVwbGF5U2Vzc2lvbi5qcwpAQCAtNzYsNyArNzYsNyBAQCBXZWJJbnNwZWN0b3IuUmVw bGF5U2Vzc2lvbi5wcm90b3R5cGUgPSB7CiAgICAgICAgIFByb21pc2UuYWxsKHBlbmRpbmdTZWdt ZW50cykudGhlbigKICAgICAgICAgICAgIGZ1bmN0aW9uKHNlZ21lbnRzQXJyYXkpIHsKICAgICAg ICAgICAgICAgICBzZXNzaW9uLl9zZWdtZW50cyA9IHNlZ21lbnRzQXJyYXk7Ci0gICAgICAgICAg ICAgICAgc2Vzc2lvbi5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlJlcGxh eVNlc3Npb24uRXZlbnQuU2VnbWVudHNDaGFuZ2VkLCB7b2xkU2VnbWVudHM6IG9sZFNlZ21lbnRz fSk7CisgICAgICAgICAgICAgICAgc2Vzc2lvbi5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2Vi SW5zcGVjdG9yLlJlcGxheVNlc3Npb24uRXZlbnQuU2VnbWVudHNDaGFuZ2VkLCB7b2xkU2VnbWVu dHN9KTsKICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICBmdW5jdGlvbihlcnJvcikgewogICAg ICAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoIlByb2JsZW0gcmVzb2x2aW5nIHNlZ21lbnRzOiAi LCBlcnJvcik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Nb2RlbHMvUmVzb3VyY2UuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Nb2RlbHMvUmVzb3VyY2UuanMKaW5kZXggNzYzZDAxMy4uMjE5ZjY0MCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1Jlc291cmNlLmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9SZXNvdXJjZS5q cwpAQCAtNDc3LDcgKzQ3Nyw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUgPSB7 CiAgICAgICAgICAgICAvLyBEZWxldGUgdGhlIFVSTCBjb21wb25lbnRzIHNvIHRoZSBVUkwgaXMg cmUtcGFyc2VkIHRoZSBuZXh0IHRpbWUgaXQgaXMgcmVxdWVzdGVkLgogICAgICAgICAgICAgZGVs ZXRlIHRoaXMuX3VybENvbXBvbmVudHM7CiAKLSAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVu dFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5FdmVudC5VUkxEaWRDaGFuZ2UsIHtv bGRVUkw6IG9sZFVSTH0pOworICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5l cnMoV2ViSW5zcGVjdG9yLlJlc291cmNlLkV2ZW50LlVSTERpZENoYW5nZSwge29sZFVSTH0pOwog ICAgICAgICB9CiAKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5z cGVjdG9yLlJlc291cmNlLkV2ZW50LlJlcXVlc3RIZWFkZXJzRGlkQ2hhbmdlKTsKQEAgLTUxNiwx OCArNTE2LDE4IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgICAg ICAgICAvLyBEZWxldGUgdGhlIFVSTCBjb21wb25lbnRzIHNvIHRoZSBVUkwgaXMgcmUtcGFyc2Vk IHRoZSBuZXh0IHRpbWUgaXQgaXMgcmVxdWVzdGVkLgogICAgICAgICAgICAgZGVsZXRlIHRoaXMu X3VybENvbXBvbmVudHM7CiAKLSAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVu ZXJzKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5FdmVudC5VUkxEaWRDaGFuZ2UsIHtvbGRVUkw6IG9s ZFVSTH0pOworICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5z cGVjdG9yLlJlc291cmNlLkV2ZW50LlVSTERpZENoYW5nZSwge29sZFVSTH0pOwogICAgICAgICB9 CiAKICAgICAgICAgaWYgKG9sZE1JTUVUeXBlICE9PSBtaW1lVHlwZSkgewogICAgICAgICAgICAg Ly8gRGVsZXRlIHRoZSBNSU1FLXR5cGUgY29tcG9uZW50cyBzbyB0aGUgTUlNRS10eXBlIGlzIHJl LXBhcnNlZCB0aGUgbmV4dCB0aW1lIGl0IGlzIHJlcXVlc3RlZC4KICAgICAgICAgICAgIGRlbGV0 ZSB0aGlzLl9taW1lVHlwZUNvbXBvbmVudHM7CiAKLSAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hF dmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5FdmVudC5NSU1FVHlwZURpZENo YW5nZSwge29sZE1JTUVUeXBlOiBvbGRNSU1FVHlwZX0pOworICAgICAgICAgICAgdGhpcy5kaXNw YXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlJlc291cmNlLkV2ZW50Lk1JTUVUeXBl RGlkQ2hhbmdlLCB7b2xkTUlNRVR5cGV9KTsKICAgICAgICAgfQogCiAgICAgICAgIGlmIChvbGRU eXBlICE9PSB0eXBlKQotICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMo V2ViSW5zcGVjdG9yLlJlc291cmNlLkV2ZW50LlR5cGVEaWRDaGFuZ2UsIHtvbGRUeXBlOiBvbGRU eXBlfSk7CisgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNw ZWN0b3IuUmVzb3VyY2UuRXZlbnQuVHlwZURpZENoYW5nZSwge29sZFR5cGV9KTsKIAogICAgICAg ICBjb25zb2xlLmFzc2VydChpc05hTih0aGlzLl9zaXplKSk7CiAgICAgICAgIGNvbnNvbGUuYXNz ZXJ0KGlzTmFOKHRoaXMuX3RyYW5zZmVyU2l6ZSkpOwpAQCAtNTczLDcgKzU3Myw3IEBAIFdlYklu c3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgdGhpcy5fbGFzdERhdGFS ZWNlaXZlZFRpbWVzdGFtcCA9IGVsYXBzZWRUaW1lIHx8IE5hTjsKIAotICAgICAgICB0aGlzLmRp c3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuUmVzb3VyY2UuRXZlbnQuU2l6ZURp ZENoYW5nZSwge3ByZXZpb3VzU2l6ZTogcHJldmlvdXNTaXplfSk7CisgICAgICAgIHRoaXMuZGlz cGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5FdmVudC5TaXplRGlk Q2hhbmdlLCB7cHJldmlvdXNTaXplfSk7CiAKICAgICAgICAgLy8gVGhlIHRyYW5zZmVyU2l6ZSBp cyBiYXNlZCBvZmYgb2Ygc2l6ZSB3aGVuIHN0YXR1cyBpcyBub3QgMzA0IG9yIENvbnRlbnQtTGVu Z3RoIGlzIG1pc3NpbmcuCiAgICAgICAgIGlmIChpc05hTih0aGlzLl90cmFuc2ZlclNpemUpICYm IHRoaXMuX3N0YXR1c0NvZGUgIT09IDMwNCAmJiAhdGhpcy5fcmVzcG9uc2VIZWFkZXJzLnZhbHVl Rm9yQ2FzZUluc2Vuc2l0aXZlS2V5KCJDb250ZW50LUxlbmd0aCIpKQpAQCAtNzA5LDcgKzcwOSw3 IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICh0aGlz Ll90eXBlID09PSBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuVHlwZS5PdGhlcikgewogICAgICAgICAg ICAgdmFyIG9sZFR5cGUgPSB0aGlzLl90eXBlOwogICAgICAgICAgICAgdGhpcy5fdHlwZSA9IFdl Ykluc3BlY3Rvci5SZXNvdXJjZS5UeXBlLlNjcmlwdDsKLSAgICAgICAgICAgIHRoaXMuZGlzcGF0 Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5FdmVudC5UeXBlRGlkQ2hh bmdlLCB7b2xkVHlwZTogb2xkVHlwZX0pOworICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50 VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlJlc291cmNlLkV2ZW50LlR5cGVEaWRDaGFuZ2UsIHtv bGRUeXBlfSk7CiAgICAgICAgIH0KICAgICB9LAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvU2NyaXB0U3ludGF4VHJlZS5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9TY3JpcHRTeW50YXhUcmVlLmpz CmluZGV4IGRlZTBjZWUuLjhlOGY2YmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL01vZGVscy9TY3JpcHRTeW50YXhUcmVlLmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9TY3JpcHRTeW50YXhUcmVlLmpzCkBA IC0yMTgsNyArMjE4LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdFN5bnRheFRyZWUucHJvdG90eXBl ID0gewogICAgICAgICAgICAgICAgIGZvciAodmFyIHBhcmFtIG9mIG5vZGUucGFyYW1zKSB7CiAg ICAgICAgICAgICAgICAgICAgIGFsbFJlcXVlc3RzLnB1c2goewogICAgICAgICAgICAgICAgICAg ICAgICAgdHlwZUluZm9ybWF0aW9uRGVzY3JpcHRvcjogV2ViSW5zcGVjdG9yLlNjcmlwdFN5bnRh eFRyZWUuVHlwZVByb2ZpbGVyU2VhcmNoRGVzY3JpcHRvci5Ob3JtYWxFeHByZXNzaW9uLAotICAg ICAgICAgICAgICAgICAgICAgICAgc291cmNlSUQ6IHNvdXJjZUlELAorICAgICAgICAgICAgICAg ICAgICAgICAgc291cmNlSUQsCiAgICAgICAgICAgICAgICAgICAgICAgICBkaXZvdDogcGFyYW0u cmFuZ2VbMF0KICAgICAgICAgICAgICAgICAgICAgfSk7CiAgICAgICAgICAgICAgICAgICAgIGFs bFJlcXVlc3ROb2Rlcy5wdXNoKHBhcmFtKTsKQEAgLTIyNiw3ICsyMjYsNyBAQCBXZWJJbnNwZWN0 b3IuU2NyaXB0U3ludGF4VHJlZS5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgICAgICAgICBhbGxS ZXF1ZXN0cy5wdXNoKHsKICAgICAgICAgICAgICAgICAgICAgdHlwZUluZm9ybWF0aW9uRGVzY3Jp cHRvcjogV2ViSW5zcGVjdG9yLlNjcmlwdFN5bnRheFRyZWUuVHlwZVByb2ZpbGVyU2VhcmNoRGVz Y3JpcHRvci5GdW5jdGlvblJldHVybiwKLSAgICAgICAgICAgICAgICAgICAgc291cmNlSUQ6IHNv dXJjZUlELAorICAgICAgICAgICAgICAgICAgICBzb3VyY2VJRCwKICAgICAgICAgICAgICAgICAg ICAgZGl2b3Q6IG5vZGUuYm9keS5yYW5nZVswXQogICAgICAgICAgICAgICAgIH0pOwogICAgICAg ICAgICAgICAgIGFsbFJlcXVlc3ROb2Rlcy5wdXNoKG5vZGUpOwpAQCAtMjM1LDcgKzIzNSw3IEBA IFdlYkluc3BlY3Rvci5TY3JpcHRTeW50YXhUcmVlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAg ICAgICBmb3IgKHZhciBpZGVudGlmaWVyIG9mIHRoaXMuZ2F0aGVySWRlbnRpZmllcnNJblZhcmlh YmxlRGVjbGFyYXRpb24obm9kZSkpIHsKICAgICAgICAgICAgICAgICAgICAgYWxsUmVxdWVzdHMu cHVzaCh7CiAgICAgICAgICAgICAgICAgICAgICAgICB0eXBlSW5mb3JtYXRpb25EZXNjcmlwdG9y OiBXZWJJbnNwZWN0b3IuU2NyaXB0U3ludGF4VHJlZS5UeXBlUHJvZmlsZXJTZWFyY2hEZXNjcmlw dG9yLk5vcm1hbEV4cHJlc3Npb24sCi0gICAgICAgICAgICAgICAgICAgICAgICBzb3VyY2VJRDog c291cmNlSUQsCisgICAgICAgICAgICAgICAgICAgICAgICBzb3VyY2VJRCwKICAgICAgICAgICAg ICAgICAgICAgICAgIGRpdm90OiBpZGVudGlmaWVyLnJhbmdlWzBdCiAgICAgICAgICAgICAgICAg ICAgIH0pOwogICAgICAgICAgICAgICAgICAgICBhbGxSZXF1ZXN0Tm9kZXMucHVzaChpZGVudGlm aWVyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01v ZGVscy9Tb3VyY2VDb2RlLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv TW9kZWxzL1NvdXJjZUNvZGUuanMKaW5kZXggN2VjYzFhZC4uOTk1OTc0OCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1NvdXJjZUNvZGUuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1NvdXJjZUNv ZGUuanMKQEAgLTIwNCw5ICsyMDQsOSBAQCBXZWJJbnNwZWN0b3IuU291cmNlQ29kZS5wcm90b3R5 cGUgPSB7CiAgICAgICAgIGRlbGV0ZSB0aGlzLl9pZ25vcmVSZXZpc2lvbkNvbnRlbnREaWRDaGFu Z2VFdmVudDsKIAogICAgICAgICByZXR1cm4gUHJvbWlzZS5yZXNvbHZlKHsKLSAgICAgICAgICAg IGVycm9yOiBlcnJvciwKKyAgICAgICAgICAgIGVycm9yLAogICAgICAgICAgICAgc291cmNlQ29k ZTogdGhpcywKLSAgICAgICAgICAgIGNvbnRlbnQ6IGNvbnRlbnQsCisgICAgICAgICAgICBjb250 ZW50LAogICAgICAgICB9KTsKICAgICB9CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1NvdXJjZUNvZGVMb2NhdGlvbi5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9Tb3VyY2VDb2RlTG9jYXRpb24u anMKaW5kZXggN2Q5NTM4NC4uNTc0M2M3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1NvdXJjZUNvZGVMb2NhdGlvbi5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvU291cmNlQ29kZUxvY2F0aW9u LmpzCkBAIC00MzQsMTQgKzQzNCwxNCBAQCBXZWJJbnNwZWN0b3IuU291cmNlQ29kZUxvY2F0aW9u LnByb3RvdHlwZSA9IHsKIAogICAgICAgICBpZiAoZGlzcGxheUxvY2F0aW9uQ2hhbmdlZCB8fCBh bnlMb2NhdGlvbkNoYW5nZWQpIHsKICAgICAgICAgICAgIHZhciBvbGREYXRhID0gewotICAgICAg ICAgICAgICAgIG9sZFNvdXJjZUNvZGU6IG9sZFNvdXJjZUNvZGUsCi0gICAgICAgICAgICAgICAg b2xkTGluZU51bWJlcjogb2xkTGluZU51bWJlciwKLSAgICAgICAgICAgICAgICBvbGRDb2x1bW5O dW1iZXI6IG9sZENvbHVtbk51bWJlciwKLSAgICAgICAgICAgICAgICBvbGRGb3JtYXR0ZWRMaW5l TnVtYmVyOiBvbGRGb3JtYXR0ZWRMaW5lTnVtYmVyLAotICAgICAgICAgICAgICAgIG9sZEZvcm1h dHRlZENvbHVtbk51bWJlcjogb2xkRm9ybWF0dGVkQ29sdW1uTnVtYmVyLAotICAgICAgICAgICAg ICAgIG9sZERpc3BsYXlTb3VyY2VDb2RlOiBvbGREaXNwbGF5U291cmNlQ29kZSwKLSAgICAgICAg ICAgICAgICBvbGREaXNwbGF5TGluZU51bWJlcjogb2xkRGlzcGxheUxpbmVOdW1iZXIsCi0gICAg ICAgICAgICAgICAgb2xkRGlzcGxheUNvbHVtbk51bWJlcjogb2xkRGlzcGxheUNvbHVtbk51bWJl cgorICAgICAgICAgICAgICAgIG9sZFNvdXJjZUNvZGUsCisgICAgICAgICAgICAgICAgb2xkTGlu ZU51bWJlciwKKyAgICAgICAgICAgICAgICBvbGRDb2x1bW5OdW1iZXIsCisgICAgICAgICAgICAg ICAgb2xkRm9ybWF0dGVkTGluZU51bWJlciwKKyAgICAgICAgICAgICAgICBvbGRGb3JtYXR0ZWRD b2x1bW5OdW1iZXIsCisgICAgICAgICAgICAgICAgb2xkRGlzcGxheVNvdXJjZUNvZGUsCisgICAg ICAgICAgICAgICAgb2xkRGlzcGxheUxpbmVOdW1iZXIsCisgICAgICAgICAgICAgICAgb2xkRGlz cGxheUNvbHVtbk51bWJlcgogICAgICAgICAgICAgfTsKICAgICAgICAgICAgIGlmIChkaXNwbGF5 TG9jYXRpb25DaGFuZ2VkKQogICAgICAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlz dGVuZXJzKFdlYkluc3BlY3Rvci5Tb3VyY2VDb2RlTG9jYXRpb24uRXZlbnQuRGlzcGxheUxvY2F0 aW9uQ2hhbmdlZCwgb2xkRGF0YSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Nb2RlbHMvU291cmNlTWFwUmVzb3VyY2UuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvU291cmNlTWFwUmVzb3VyY2UuanMKaW5kZXgg ZTIyNWVmZS4uMzA4YTY0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvTW9kZWxzL1NvdXJjZU1hcFJlc291cmNlLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9Tb3VyY2VNYXBSZXNvdXJjZS5qcwpAQCAtOTMs OSArOTMsOSBAQCBXZWJJbnNwZWN0b3IuU291cmNlTWFwUmVzb3VyY2UucHJvdG90eXBlID0gewog ICAgICAgICAgICAgdGhpcy5tYXJrQXNGYWlsZWQoKTsKICAgICAgICAgICAgIHJldHVybiBQcm9t aXNlLnJlc29sdmUoewogICAgICAgICAgICAgICAgIGVycm9yOiBXZWJJbnNwZWN0b3IuVUlTdHJp bmcoIkFuIGVycm9yIG9jY3VycmVkIHRyeWluZyB0byBsb2FkIHRoZSByZXNvdXJjZS4iKSwKLSAg ICAgICAgICAgICAgICBjb250ZW50OiBjb250ZW50LAotICAgICAgICAgICAgICAgIG1pbWVUeXBl OiBtaW1lVHlwZSwKLSAgICAgICAgICAgICAgICBzdGF0dXNDb2RlOiBzdGF0dXNDb2RlCisgICAg ICAgICAgICAgICAgY29udGVudCwKKyAgICAgICAgICAgICAgICBtaW1lVHlwZSwKKyAgICAgICAg ICAgICAgICBzdGF0dXNDb2RlCiAgICAgICAgICAgICB9KTsKICAgICAgICAgfQogCkBAIC0xMjIs MTAgKzEyMiwxMCBAQCBXZWJJbnNwZWN0b3IuU291cmNlTWFwUmVzb3VyY2UucHJvdG90eXBlID0g ewogICAgICAgICAgICAgdGhpcy5tYXJrQXNGaW5pc2hlZCgpOwogCiAgICAgICAgICAgICByZXR1 cm4gUHJvbWlzZS5yZXNvbHZlKHsKLSAgICAgICAgICAgICAgICBjb250ZW50OiBjb250ZW50LAot ICAgICAgICAgICAgICAgIG1pbWVUeXBlOiBtaW1lVHlwZSwKLSAgICAgICAgICAgICAgICBiYXNl NjRlbmNvZGVkOiBiYXNlNjRlbmNvZGVkLAotICAgICAgICAgICAgICAgIHN0YXR1c0NvZGU6IHN0 YXR1c0NvZGUKKyAgICAgICAgICAgICAgICBjb250ZW50LAorICAgICAgICAgICAgICAgIG1pbWVU eXBlLAorICAgICAgICAgICAgICAgIGJhc2U2NGVuY29kZWQsCisgICAgICAgICAgICAgICAgc3Rh dHVzQ29kZQogICAgICAgICAgICAgfSk7CiAgICAgICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1RpbWVsaW5lLmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1RpbWVsaW5lLmpzCmluZGV4IGVk MGJhNWUuLmU0MzVlOTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL01vZGVscy9UaW1lbGluZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Nb2RlbHMvVGltZWxpbmUuanMKQEAgLTExNyw3ICsxMTcsNyBAQCBXZWJJbnNw ZWN0b3IuVGltZWxpbmUucHJvdG90eXBlID0gewogCiAgICAgICAgIHRoaXMuX3VwZGF0ZVRpbWVz SWZOZWVkZWQocmVjb3JkKTsKIAotICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVy cyhXZWJJbnNwZWN0b3IuVGltZWxpbmUuRXZlbnQuUmVjb3JkQWRkZWQsIHtyZWNvcmQ6IHJlY29y ZH0pOworICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3Iu VGltZWxpbmUuRXZlbnQuUmVjb3JkQWRkZWQsIHtyZWNvcmR9KTsKICAgICB9LAogCiAgICAgc2F2 ZUlkZW50aXR5VG9Db29raWU6IGZ1bmN0aW9uKGNvb2tpZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9UaW1lbGluZVJlY29yZGluZy5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9UaW1lbGluZVJlY29y ZGluZy5qcwppbmRleCBkMjBhMmE0Li42OGM0NmE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvVGltZWxpbmVSZWNvcmRpbmcuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1RpbWVsaW5lUmVjb3Jk aW5nLmpzCkBAIC0xNDQsNyArMTQ0LDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5n LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fdGltZWxpbmVzLnNldCh0aW1lbGluZS50eXBl LCB0aW1lbGluZSk7CiAKICAgICAgICAgdGltZWxpbmUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNw ZWN0b3IuVGltZWxpbmUuRXZlbnQuVGltZXNVcGRhdGVkLCB0aGlzLl90aW1lbGluZVRpbWVzVXBk YXRlZCwgdGhpcyk7Ci0gICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYklu c3BlY3Rvci5UaW1lbGluZVJlY29yZGluZy5FdmVudC5UaW1lbGluZUFkZGVkLCB7dGltZWxpbmU6 IHRpbWVsaW5lfSk7CisgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYklu c3BlY3Rvci5UaW1lbGluZVJlY29yZGluZy5FdmVudC5UaW1lbGluZUFkZGVkLCB7dGltZWxpbmV9 KTsKICAgICB9LAogCiAgICAgcmVtb3ZlVGltZWxpbmU6IGZ1bmN0aW9uKHRpbWVsaW5lKQpAQCAt MTU2LDcgKzE1Niw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZy5wcm90b3R5cGUg PSB7CiAgICAgICAgIHRoaXMuX3RpbWVsaW5lcy5kZWxldGUodGltZWxpbmUudHlwZSk7CiAKICAg ICAgICAgdGltZWxpbmUucmVtb3ZlRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGltZWxpbmUu RXZlbnQuVGltZXNVcGRhdGVkLCB0aGlzLl90aW1lbGluZVRpbWVzVXBkYXRlZCwgdGhpcyk7Ci0g ICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5UaW1lbGlu ZVJlY29yZGluZy5FdmVudC5UaW1lbGluZVJlbW92ZWQsIHt0aW1lbGluZTogdGltZWxpbmV9KTsK KyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlRpbWVs aW5lUmVjb3JkaW5nLkV2ZW50LlRpbWVsaW5lUmVtb3ZlZCwge3RpbWVsaW5lfSk7CiAgICAgfSwK IAogICAgIGFkZEV2ZW50TWFya2VyOiBmdW5jdGlvbihldmVudE1hcmtlcikKQEAgLTIwMCw3ICsy MDAsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmcucHJvdG90eXBlID0gewogICAg ICAgICBzb3VyY2VDb2RlVGltZWxpbmUuYWRkUmVjb3JkKHJlY29yZCk7CiAKICAgICAgICAgaWYg KG5ld1RpbWVsaW5lKQotICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMo V2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nLkV2ZW50LlNvdXJjZUNvZGVUaW1lbGluZUFk ZGVkLCB7c291cmNlQ29kZVRpbWVsaW5lOiBzb3VyY2VDb2RlVGltZWxpbmV9KTsKKyAgICAgICAg ICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5UaW1lbGluZVJl Y29yZGluZy5FdmVudC5Tb3VyY2VDb2RlVGltZWxpbmVBZGRlZCwge3NvdXJjZUNvZGVUaW1lbGlu ZX0pOwogICAgIH0sCiAKICAgICBjb21wdXRlRWxhcHNlZFRpbWU6IGZ1bmN0aW9uKHRpbWVzdGFt cCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0JveE1vZGVsRGV0YWlsc1NlY3Rpb25Sb3cuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Cb3hNb2RlbERldGFpbHNTZWN0aW9uUm93LmpzCmluZGV4IDBkNGQ3 YzAuLjVjNDc4YmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0JveE1vZGVsRGV0YWlsc1NlY3Rpb25Sb3cuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQm94TW9kZWxEZXRhaWxzU2VjdGlvblJvdy5q cwpAQCAtNzYsNyArNzYsNyBAQCBXZWJJbnNwZWN0b3IuQm94TW9kZWxEZXRhaWxzU2VjdGlvblJv dy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciB0b3AgPSB0aGlzLl9nZXRQcm9wZXJ0eVZhbHVl QXNQeChjb21wdXRlZFN0eWxlLCBjb21wb25lbnROYW1lICsgIi10b3AiICsgc3VmZml4KTsKICAg ICAgICAgdmFyIHJpZ2h0ID0gdGhpcy5fZ2V0UHJvcGVydHlWYWx1ZUFzUHgoY29tcHV0ZWRTdHls ZSwgY29tcG9uZW50TmFtZSArICItcmlnaHQiICsgc3VmZml4KTsKICAgICAgICAgdmFyIGJvdHRv bSA9IHRoaXMuX2dldFByb3BlcnR5VmFsdWVBc1B4KGNvbXB1dGVkU3R5bGUsIGNvbXBvbmVudE5h bWUgKyAiLWJvdHRvbSIgKyBzdWZmaXgpOwotICAgICAgICByZXR1cm4geyBsZWZ0OiBsZWZ0LCB0 b3A6IHRvcCwgcmlnaHQ6IHJpZ2h0LCBib3R0b206IGJvdHRvbSB9OworICAgICAgICByZXR1cm4g e2xlZnQsIHRvcCwgcmlnaHQsIGJvdHRvbX07CiAgICAgfSwKIAogICAgIF9oaWdobGlnaHRET01O b2RlOiBmdW5jdGlvbihzaG93SGlnaGxpZ2h0LCBtb2RlLCBldmVudCkKQEAgLTI2NCw3ICsyNjQs NyBAQCBXZWJJbnNwZWN0b3IuQm94TW9kZWxEZXRhaWxzU2VjdGlvblJvdy5wcm90b3R5cGUgPSB7 CiAgICAgICAgIGlmICh0YXJnZXRFbGVtZW50LnRpdGxlKQogICAgICAgICAgICAgdGFyZ2V0RWxl bWVudC50ZXh0Q29udGVudCA9IHRhcmdldEVsZW1lbnQudGl0bGU7CiAKLSAgICAgICAgdmFyIGNv bnRleHQgPSB7Ym94OiBib3gsIHN0eWxlUHJvcGVydHk6IHN0eWxlUHJvcGVydHl9OworICAgICAg ICB2YXIgY29udGV4dCA9IHtib3gsIHN0eWxlUHJvcGVydHl9OwogICAgICAgICB2YXIgYm91bmRL ZXlEb3duID0gdGhpcy5faGFuZGxlS2V5RG93bi5iaW5kKHRoaXMsIGNvbnRleHQsIHN0eWxlUHJv cGVydHkpOwogICAgICAgICBjb250ZXh0LmtleURvd25IYW5kbGVyID0gYm91bmRLZXlEb3duOwog ICAgICAgICB0YXJnZXRFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImtleWRvd24iLCBib3VuZEtl eURvd24sIGZhbHNlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0NvZGVNaXJyb3JBZGRpdGlvbnMuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9Db2RlTWlycm9yQWRkaXRpb25zLmpzCmluZGV4IDczZjU4 OGUuLjE5MDQ1YjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0NvZGVNaXJyb3JBZGRpdGlvbnMuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29kZU1pcnJvckFkZGl0aW9ucy5qcwpAQCAtNDY1LDE3 ICs0NjUsMTcgQEAKIAogICAgICAgICAgICAgdmFyIHN0YXJ0Q2hhciA9IGxpbmUgPT09IHJhbmdl LnN0YXJ0LmxpbmUgPyByYW5nZS5zdGFydC5jaCA6IChsaW5lQ29udGVudC5sZW5ndGggLSBsaW5l Q29udGVudC50cmltTGVmdCgpLmxlbmd0aCk7CiAgICAgICAgICAgICB2YXIgZW5kQ2hhciA9IGxp bmUgPT09IHJhbmdlLmVuZC5saW5lID8gcmFuZ2UuZW5kLmNoIDogbGluZUNvbnRlbnQubGVuZ3Ro OwotICAgICAgICAgICAgdmFyIGZpcnN0Q2hhckNvb3JkcyA9IHRoaXMuY3Vyc29yQ29vcmRzKHtj aDogc3RhcnRDaGFyLCBsaW5lOiBsaW5lfSk7Ci0gICAgICAgICAgICB2YXIgZW5kQ2hhckNvb3Jk cyA9IHRoaXMuY3Vyc29yQ29vcmRzKHtjaDogZW5kQ2hhciwgbGluZTogbGluZX0pOworICAgICAg ICAgICAgdmFyIGZpcnN0Q2hhckNvb3JkcyA9IHRoaXMuY3Vyc29yQ29vcmRzKHtjaDogc3RhcnRD aGFyLCBsaW5lfSk7CisgICAgICAgICAgICB2YXIgZW5kQ2hhckNvb3JkcyA9IHRoaXMuY3Vyc29y Q29vcmRzKHtjaDogZW5kQ2hhciwgbGluZX0pOwogCiAgICAgICAgICAgICAvLyBIYW5kbGUgbGlu ZSB3cmFwcGluZy4KICAgICAgICAgICAgIGlmIChmaXJzdENoYXJDb29yZHMuYm90dG9tICE9PSBl bmRDaGFyQ29vcmRzLmJvdHRvbSkgewogICAgICAgICAgICAgICAgIHZhciBtYXhZID0gLU51bWJl ci5NQVhfVkFMVUU7CiAgICAgICAgICAgICAgICAgZm9yICh2YXIgY2ggPSBzdGFydENoYXI7IGNo IDw9IGVuZENoYXI7ICsrY2gpIHsKLSAgICAgICAgICAgICAgICAgICAgdmFyIGNvb3JkcyA9IHRo aXMuY3Vyc29yQ29vcmRzKHtjaDogY2gsIGxpbmU6IGxpbmV9KTsKKyAgICAgICAgICAgICAgICAg ICAgdmFyIGNvb3JkcyA9IHRoaXMuY3Vyc29yQ29vcmRzKHtjaCwgbGluZX0pOwogICAgICAgICAg ICAgICAgICAgICBpZiAoY29vcmRzLmJvdHRvbSA+IG1heFkpIHsKICAgICAgICAgICAgICAgICAg ICAgICAgIGlmIChjaCA+IHN0YXJ0Q2hhcikgewotICAgICAgICAgICAgICAgICAgICAgICAgICAg IHZhciBtYXhYID0gTWF0aC5jZWlsKHRoaXMuY3Vyc29yQ29vcmRzKHtjaDogY2ggLSAxLCBsaW5l OiBsaW5lfSkucmlnaHQpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZhciBtYXhYID0g TWF0aC5jZWlsKHRoaXMuY3Vyc29yQ29vcmRzKHtjaDogY2ggLSAxLCBsaW5lfSkucmlnaHQpOwog ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxpbmVSZWN0cy5wdXNoKG5ldyBXZWJJbnNwZWN0 b3IuUmVjdChtaW5YLCBtaW5ZLCBtYXhYIC0gbWluWCwgbWF4WSAtIG1pblkpKTsKICAgICAgICAg ICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgICAgIHZhciBtaW5YID0gTWF0 aC5mbG9vcihjb29yZHMubGVmdCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlUHJvbXB0LmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29uc29sZVByb21wdC5qcwppbmRleCA3YWNjNDdmLi4x Y2ZmYzQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9Db25zb2xlUHJvbXB0LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0NvbnNvbGVQcm9tcHQuanMKQEAgLTE0Miw3ICsxNDIsNyBAQCBXZWJJbnNw ZWN0b3IuQ29uc29sZVByb21wdC5wcm90b3R5cGUgPSB7CiAKICAgICBwdXNoSGlzdG9yeUl0ZW06 IGZ1bmN0aW9uKHRleHQpCiAgICAgewotICAgICAgICB0aGlzLl9jb21taXRIaXN0b3J5RW50cnko e3RleHQ6IHRleHR9KTsKKyAgICAgICAgdGhpcy5fY29tbWl0SGlzdG9yeUVudHJ5KHt0ZXh0fSk7 CiAgICAgfSwKIAogICAgIC8vIFByb3RlY3RlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NU3RvcmFnZUNvbnRlbnRWaWV3LmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NU3RvcmFnZUNvbnRlbnRW aWV3LmpzCmluZGV4IDU5YTY2MTEuLjQwNmEzNWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVN0b3JhZ2VDb250ZW50Vmlldy5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01TdG9yYWdlQ29u dGVudFZpZXcuanMKQEAgLTEyMiw3ICsxMjIsNyBAQCBXZWJJbnNwZWN0b3IuRE9NU3RvcmFnZUNv bnRlbnRWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAg IH0KIAotICAgICAgICB2YXIgZGF0YSA9IHtrZXk6IGtleSwgdmFsdWU6IHZhbHVlfTsKKyAgICAg ICAgdmFyIGRhdGEgPSB7a2V5LCB2YWx1ZX07CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmFwcGVu ZENoaWxkKG5ldyBXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlKGRhdGEsIGZhbHNlKSk7CiAgICAg ICAgIHRoaXMuX3NvcnREYXRhR3JpZCgpOwogICAgIH0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Gb2xkZXJpemVkVHJlZUVsZW1lbnQuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Gb2xkZXJpemVkVHJl ZUVsZW1lbnQuanMKaW5kZXggNTE2M2MwYi4uNGZmMDEwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRm9sZGVyaXplZFRyZWVFbGVtZW50Lmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZvbGRlcml6 ZWRUcmVlRWxlbWVudC5qcwpAQCAtNjYsMTEgKzY2LDExIEBAIFdlYkluc3BlY3Rvci5Gb2xkZXJp emVkVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICBjb25zb2xlLmFzc2VydCh0eXBl b2YgdHJlZUVsZW1lbnRDb25zdHJ1Y3RvciA9PT0gImZ1bmN0aW9uIik7CiAKICAgICAgICAgdmFy IHNldHRpbmdzID0gewotICAgICAgICAgICAgdHlwZTogdHlwZSwKLSAgICAgICAgICAgIGZvbGRl ckRpc3BsYXlOYW1lOiBmb2xkZXJEaXNwbGF5TmFtZSwKLSAgICAgICAgICAgIHZhbGlkYXRlUmVw cmVzZW50ZWRPYmplY3RDYWxsYmFjazogdmFsaWRhdGVSZXByZXNlbnRlZE9iamVjdENhbGxiYWNr LAotICAgICAgICAgICAgY291bnRDaGlsZHJlbkNhbGxiYWNrOiBjb3VudENoaWxkcmVuQ2FsbGJh Y2ssCi0gICAgICAgICAgICB0cmVlRWxlbWVudENvbnN0cnVjdG9yOiB0cmVlRWxlbWVudENvbnN0 cnVjdG9yCisgICAgICAgICAgICB0eXBlLAorICAgICAgICAgICAgZm9sZGVyRGlzcGxheU5hbWUs CisgICAgICAgICAgICB2YWxpZGF0ZVJlcHJlc2VudGVkT2JqZWN0Q2FsbGJhY2ssCisgICAgICAg ICAgICBjb3VudENoaWxkcmVuQ2FsbGJhY2ssCisgICAgICAgICAgICB0cmVlRWxlbWVudENvbnN0 cnVjdG9yCiAgICAgICAgIH07CiAKICAgICAgICAgdGhpcy5fZm9sZGVyaXplU2V0dGluZ3NNYXAu c2V0KHR5cGUsIHNldHRpbmdzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanMKaW5kZXggMzY2Y2Q4Yi4u NjliMmU3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvTG9nQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanMKQEAgLTkzNSw4ICs5MzUsOCBAQCBXZWJJ bnNwZWN0b3IuTG9nQ29udGVudFZpZXcucHJvdG90eXBlID0gewogCiAgICAgICAgIG1hdGNoUmFu Z2VzLmZvckVhY2goZnVuY3Rpb24gKHJhbmdlLCBpbmRleCkgewogICAgICAgICAgICAgdGhpcy5f c2VhcmNoTWF0Y2hlcy5wdXNoKHsKLSAgICAgICAgICAgICAgICBtZXNzYWdlOiBtZXNzYWdlLAot ICAgICAgICAgICAgICAgIHJhbmdlOiByYW5nZSwKKyAgICAgICAgICAgICAgICBtZXNzYWdlLAor ICAgICAgICAgICAgICAgIHJhbmdlLAogICAgICAgICAgICAgICAgIGhpZ2hsaWdodDogaGlnaGxp Z2h0ZWRFbGVtZW50c1tpbmRleF0KICAgICAgICAgICAgIH0pOwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qb3BvdmVyLmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUG9wb3Zlci5qcwppbmRleCBhNWY3 NGI4Li5lNDYwYzdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9Qb3BvdmVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1BvcG92ZXIuanMKQEAgLTIyMSw3ICsyMjEsNyBAQCBXZWJJbnNwZWN0b3Iu UG9wb3Zlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIGZvciAodmFyIGVkZ2VOYW1lIGluIFdlYklu c3BlY3Rvci5SZWN0RWRnZSkgewogICAgICAgICAgICAgdmFyIGVkZ2UgPSBXZWJJbnNwZWN0b3Iu UmVjdEVkZ2VbZWRnZU5hbWVdOwogICAgICAgICAgICAgdmFyIGl0ZW0gPSB7Ci0gICAgICAgICAg ICAgICAgZWRnZTogZWRnZSwKKyAgICAgICAgICAgICAgICBlZGdlLAogICAgICAgICAgICAgICAg IG1ldHJpY3M6IHRoaXMuX2Jlc3RNZXRyaWNzRm9yRWRnZSh0aGlzLl9wcmVmZXJyZWRTaXplLCB0 YXJnZXRGcmFtZSwgY29udGFpbmVyRnJhbWUsIGVkZ2UpCiAgICAgICAgICAgICB9OwogICAgICAg ICAgICAgdmFyIHByZWZlcnJlZEluZGV4ID0gcHJlZmVycmVkRWRnZXMuaW5kZXhPZihlZGdlKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jl c291cmNlRGV0YWlsc1NpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlRGV0YWlsc1NpZGViYXJQYW5lbC5qcwppbmRleCBjZGU3 ZDNjLi5lZDM2OTFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9SZXNvdXJjZURldGFpbHNTaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VEZXRhaWxzU2lkZWJhclBh bmVsLmpzCkBAIC0zNTQsNyArMzU0LDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlRGV0YWlsc1Np ZGViYXJQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgYWRkRGF0YUdyaWROb2Rl KGRhdGFbaV0pOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgZm9yICh2YXIgbmFtZSBp biBkYXRhKQotICAgICAgICAgICAgICAgIGFkZERhdGFHcmlkTm9kZSh7bmFtZTogbmFtZSwgdmFs dWU6IGRhdGFbbmFtZV0gfHwgIiJ9KTsKKyAgICAgICAgICAgICAgICBhZGREYXRhR3JpZE5vZGUo e25hbWUsIHZhbHVlOiBkYXRhW25hbWVdIHx8ICIifSk7CiAgICAgICAgIH0KIAogICAgICAgICBk YXRhR3JpZC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5FdmVudC5Tb3J0 Q2hhbmdlZCwgc29ydERhdGFHcmlkLCB0aGlzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Njb3BlQmFySXRlbS5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Njb3BlQmFySXRlbS5qcwppbmRleCA0ZGVm NTdlLi40MTM4ZmRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9TY29wZUJhckl0ZW0uanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvU2NvcGVCYXJJdGVtLmpzCkBAIC03NCw3ICs3NCw3IEBAIFdlYklu c3BlY3Rvci5TY29wZUJhckl0ZW0ucHJvdG90eXBlID0gewogCiAgICAgICAgIHRoaXMuX3NlbGVj dGVkU2V0dGluZy52YWx1ZSA9IHNlbGVjdGVkOwogCi0gICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVu dFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5TY29wZUJhckl0ZW0uRXZlbnQuU2VsZWN0aW9uQ2hh bmdlZCwge3dpdGhNb2RpZmllcjogd2l0aE1vZGlmaWVyfSk7CisgICAgICAgIHRoaXMuZGlzcGF0 Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5TY29wZUJhckl0ZW0uRXZlbnQuU2VsZWN0 aW9uQ2hhbmdlZCwge3dpdGhNb2RpZmllcn0pOwogICAgIH0sCiAKICAgICAvLyBQcml2YXRlCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY3Jp cHRDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1NjcmlwdENvbnRlbnRWaWV3LmpzCmluZGV4IGYyNzE5MGUuLmYzYTdhYmQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdENvbnRl bnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1NjcmlwdENvbnRlbnRWaWV3LmpzCkBAIC0xNDEsNyArMTQxLDcgQEAgV2ViSW5zcGVjdG9yLlNj cmlwdENvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsKICAgICBnZXQgc2F2ZURhdGEoKQogICAgIHsK ICAgICAgICAgdmFyIHVybCA9IHRoaXMuX3NjcmlwdC51cmwgfHwgIndlYi1pbnNwZWN0b3I6Ly8v IiArIGVuY29kZVVSSSh0aGlzLl9zY3JpcHQuZGlzcGxheU5hbWUpICsgIi5qcyI7Ci0gICAgICAg IHJldHVybiB7dXJsOiB1cmwsIGNvbnRlbnQ6IHRoaXMuX3RleHRFZGl0b3Iuc3RyaW5nfTsKKyAg ICAgICAgcmV0dXJuIHt1cmwsIGNvbnRlbnQ6IHRoaXMuX3RleHRFZGl0b3Iuc3RyaW5nfTsKICAg ICB9LAogCiAgICAgZ2V0IHN1cHBvcnRzU2VhcmNoKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRpbWVsaW5lRGF0YUdyaWROb2Rl LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0VGlt ZWxpbmVEYXRhR3JpZE5vZGUuanMKaW5kZXggODgxMTMyOC4uOTE1ZjJhZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0VGltZWxpbmVE YXRhR3JpZE5vZGUuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvU2NyaXB0VGltZWxpbmVEYXRhR3JpZE5vZGUuanMKQEAgLTc0LDcgKzc0LDcgQEAgV2Vi SW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lRGF0YUdyaWROb2RlLnByb3RvdHlwZSA9IHsKICAgICAg ICAgdmFyIGR1cmF0aW9uID0gTWF0aC5taW4odGhpcy5fcmVjb3JkLnN0YXJ0VGltZSArIHRoaXMu X3JlY29yZC5kdXJhdGlvbiwgdGhpcy5fcmFuZ2VFbmRUaW1lKSAtIHN0YXJ0VGltZTsKICAgICAg ICAgdmFyIGNhbGxGcmFtZU9yU291cmNlQ29kZUxvY2F0aW9uID0gdGhpcy5fcmVjb3JkLmluaXRp YXRvckNhbGxGcmFtZSB8fCB0aGlzLl9yZWNvcmQuc291cmNlQ29kZUxvY2F0aW9uOwogCi0gICAg ICAgIHJldHVybiB7ZXZlbnRUeXBlOiB0aGlzLl9yZWNvcmQuZXZlbnRUeXBlLCBzdGFydFRpbWU6 IHN0YXJ0VGltZSwgc2VsZlRpbWU6IGR1cmF0aW9uLCB0b3RhbFRpbWU6IGR1cmF0aW9uLAorICAg ICAgICByZXR1cm4ge2V2ZW50VHlwZTogdGhpcy5fcmVjb3JkLmV2ZW50VHlwZSwgc3RhcnRUaW1l LCBzZWxmVGltZTogZHVyYXRpb24sIHRvdGFsVGltZTogZHVyYXRpb24sCiAgICAgICAgICAgICBh dmVyYWdlVGltZTogZHVyYXRpb24sIGNhbGxDb3VudDogMSwgbG9jYXRpb246IGNhbGxGcmFtZU9y U291cmNlQ29kZUxvY2F0aW9ufTsKICAgICB9LAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VDb2RlVGV4dEVkaXRvci5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZUNvZGVUZXh0RWRp dG9yLmpzCmluZGV4IDdjZWQwMGMuLjA5MjBlOTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZUNvZGVUZXh0RWRpdG9yLmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZUNvZGVUZXh0 RWRpdG9yLmpzCkBAIC04NjcsNyArODY3LDcgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVUZXh0 RWRpdG9yLnByb3RvdHlwZSA9IHsKIAogICAgICAgICAvLyBQYXVzZWQuIEFkZCBDb250aW51ZSB0 byBIZXJlIG9wdGlvbiBvbmx5IGlmIHdlIGhhdmUgYSBzY3JpcHQgaWRlbnRpZmllciBmb3IgdGhl IGxvY2F0aW9uLgogICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTWFuYWdlci5wYXVz ZWQpIHsKLSAgICAgICAgICAgIHZhciBlZGl0b3JMaW5lSW5mbyA9IHtsaW5lTnVtYmVyOmxpbmVO dW1iZXIsIGNvbHVtbk51bWJlcjpjb2x1bW5OdW1iZXJ9OworICAgICAgICAgICAgdmFyIGVkaXRv ckxpbmVJbmZvID0ge2xpbmVOdW1iZXIsIGNvbHVtbk51bWJlcn07CiAgICAgICAgICAgICB2YXIg dW5mb3JtYXR0ZWRMaW5lSW5mbyA9IHRoaXMuX3VuZm9ybWF0dGVkTGluZUluZm9Gb3JFZGl0b3JM aW5lSW5mbyhlZGl0b3JMaW5lSW5mbyk7CiAgICAgICAgICAgICB2YXIgc291cmNlQ29kZUxvY2F0 aW9uID0gdGhpcy5fc291cmNlQ29kZS5jcmVhdGVTb3VyY2VDb2RlTG9jYXRpb24odW5mb3JtYXR0 ZWRMaW5lSW5mby5saW5lTnVtYmVyLCB1bmZvcm1hdHRlZExpbmVJbmZvLmNvbHVtbk51bWJlcik7 CiAKQEAgLTk2NCw3ICs5NjQsNyBAQCBXZWJJbnNwZWN0b3IuU291cmNlQ29kZVRleHRFZGl0b3Iu cHJvdG90eXBlID0gewogICAgICAgICBpZiAoIXRoaXMuX3N1cHBvcnRzRGVidWdnaW5nKQogICAg ICAgICAgICAgcmV0dXJuIG51bGw7CiAKLSAgICAgICAgdmFyIGVkaXRvckxpbmVJbmZvID0ge2xp bmVOdW1iZXI6bGluZU51bWJlciwgY29sdW1uTnVtYmVyOmNvbHVtbk51bWJlcn07CisgICAgICAg IHZhciBlZGl0b3JMaW5lSW5mbyA9IHtsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXJ9OwogICAgICAg ICB2YXIgdW5mb3JtYXR0ZWRMaW5lSW5mbyA9IHRoaXMuX3VuZm9ybWF0dGVkTGluZUluZm9Gb3JF ZGl0b3JMaW5lSW5mbyhlZGl0b3JMaW5lSW5mbyk7CiAgICAgICAgIHZhciBzb3VyY2VDb2RlTG9j YXRpb24gPSB0aGlzLl9zb3VyY2VDb2RlLmNyZWF0ZVNvdXJjZUNvZGVMb2NhdGlvbih1bmZvcm1h dHRlZExpbmVJbmZvLmxpbmVOdW1iZXIsIHVuZm9ybWF0dGVkTGluZUluZm8uY29sdW1uTnVtYmVy KTsKICAgICAgICAgdmFyIGJyZWFrcG9pbnQgPSBuZXcgV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnQo c291cmNlQ29kZUxvY2F0aW9uKTsKQEAgLTk5Myw3ICs5OTMsNyBAQCBXZWJJbnNwZWN0b3IuU291 cmNlQ29kZVRleHRFZGl0b3IucHJvdG90eXBlID0gewogICAgICAgICBpZiAoIXRoaXMuX3N1cHBv cnRzRGVidWdnaW5nKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHZhciBsaW5lSW5m byA9IHtsaW5lTnVtYmVyOiBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXI6IGNvbHVtbk51bWJlcn07 CisgICAgICAgIHZhciBsaW5lSW5mbyA9IHtsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXJ9OwogICAg ICAgICB2YXIgYnJlYWtwb2ludCA9IHRoaXMuX2JyZWFrcG9pbnRGb3JFZGl0b3JMaW5lSW5mbyhs aW5lSW5mbyk7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGJyZWFrcG9pbnQpOwogICAgICAgICBp ZiAoIWJyZWFrcG9pbnQpCkBAIC0xMDM5LDcgKzEwMzksNyBAQCBXZWJJbnNwZWN0b3IuU291cmNl Q29kZVRleHRFZGl0b3IucHJvdG90eXBlID0gewogICAgICAgICBpZiAoIXRoaXMuX3N1cHBvcnRz RGVidWdnaW5nKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHZhciBicmVha3BvaW50 ID0gdGhpcy5fYnJlYWtwb2ludEZvckVkaXRvckxpbmVJbmZvKHtsaW5lTnVtYmVyOiBsaW5lTnVt YmVyLCBjb2x1bW5OdW1iZXI6IGNvbHVtbk51bWJlcn0pOworICAgICAgICB2YXIgYnJlYWtwb2lu dCA9IHRoaXMuX2JyZWFrcG9pbnRGb3JFZGl0b3JMaW5lSW5mbyh7bGluZU51bWJlciwgY29sdW1u TnVtYmVyfSk7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGJyZWFrcG9pbnQpOwogICAgICAgICBp ZiAoIWJyZWFrcG9pbnQpCiAgICAgICAgICAgICByZXR1cm47CkBAIC0xMjgyLDcgKzEyODIsNyBA QCBXZWJJbnNwZWN0b3IuU291cmNlQ29kZVRleHRFZGl0b3IucHJvdG90eXBlID0gewogCiAgICAg ICAgIHZhciBhbGxSZXF1ZXN0cyA9IFt7CiAgICAgICAgICAgICB0eXBlSW5mb3JtYXRpb25EZXNj cmlwdG9yOiBXZWJJbnNwZWN0b3IuU2NyaXB0U3ludGF4VHJlZS5UeXBlUHJvZmlsZXJTZWFyY2hE ZXNjcmlwdG9yLk5vcm1hbEV4cHJlc3Npb24sCi0gICAgICAgICAgICBzb3VyY2VJRDogc291cmNl SUQsCisgICAgICAgICAgICBzb3VyY2VJRCwKICAgICAgICAgICAgIGRpdm90OiBvZmZzZXQKICAg ICAgICAgfV07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1RleHRDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1RleHRDb250ZW50Vmlldy5qcwppbmRleCA4ODUxM2YzLi5kMWM1NjI3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9U ZXh0Q29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvVGV4dENvbnRlbnRWaWV3LmpzCkBAIC0xMDgsNyArMTA4LDcgQEAgV2ViSW5zcGVj dG9yLlRleHRDb250ZW50Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgZ2V0IHNhdmVEYXRhKCkKICAg ICB7CiAgICAgICAgIHZhciB1cmwgPSAid2ViLWluc3BlY3RvcjovLy8iICsgZW5jb2RlVVJJKFdl Ykluc3BlY3Rvci5VSVN0cmluZygiVW50aXRsZWQiKSkgKyAiLnR4dCI7Ci0gICAgICAgIHJldHVy biB7dXJsOiB1cmwsIGNvbnRlbnQ6IHRoaXMuX3RleHRFZGl0b3Iuc3RyaW5nLCBmb3JjZVNhdmVB czogdHJ1ZX07CisgICAgICAgIHJldHVybiB7dXJsLCBjb250ZW50OiB0aGlzLl90ZXh0RWRpdG9y LnN0cmluZywgZm9yY2VTYXZlQXM6IHRydWV9OwogICAgIH0sCiAKICAgICBnZXQgc3VwcG9ydHNT ZWFyY2goKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvVGV4dEVkaXRvci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1RleHRFZGl0b3IuanMKaW5kZXggMDVkOTMwMC4uOTJmM2U5ZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGV4dEVkaXRvci5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UZXh0RWRpdG9y LmpzCkBAIC02NzMsNyArNjczLDcgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3IucHJvdG90eXBl ID0gewogICAgICAgICAgICAgZW5kT2Zmc2V0ID0gdGhpcy5fY29kZU1pcnJvci5nZXREb2MoKS5p bmRleEZyb21Qb3Moe2xpbmU6IHZpc2libGVSYW5nZS50bywgY2g6IDB9KTsKICAgICAgICAgfQog Ci0gICAgICAgIHJldHVybiB7c3RhcnRPZmZzZXQ6IHN0YXJ0T2Zmc2V0LCBlbmRPZmZzZXQ6IGVu ZE9mZnNldH07CisgICAgICAgIHJldHVybiB7c3RhcnRPZmZzZXQsIGVuZE9mZnNldH07CiAgICAg fSwKIAogICAgIG9yaWdpbmFsT2Zmc2V0VG9DdXJyZW50UG9zaXRpb246IGZ1bmN0aW9uKG9mZnNl dCkKQEAgLTg4NCw3ICs4ODQsNyBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvci5wcm90b3R5cGUg PSB7CiAKICAgICAgICAgdmFyIHN0YXJ0ID0ge2xpbmU6IHRleHRSYW5nZS5zdGFydExpbmUsIGNo OiB0ZXh0UmFuZ2Uuc3RhcnRDb2x1bW59OwogICAgICAgICB2YXIgZW5kID0ge2xpbmU6IHRleHRS YW5nZS5lbmRMaW5lLCBjaDogdGV4dFJhbmdlLmVuZENvbHVtbn07Ci0gICAgICAgIHJldHVybiB7 c3RhcnQ6IHN0YXJ0LCBlbmQ6IGVuZH07CisgICAgICAgIHJldHVybiB7c3RhcnQsIGVuZH07CiAg ICAgfSwKIAogICAgIF9yZXZlYWxQZW5kaW5nUG9zaXRpb25JZlBvc3NpYmxlOiBmdW5jdGlvbigp CkBAIC0xMjYwLDcgKzEyNjAsNyBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvci5wcm90b3R5cGUg PSB7CiAgICAgICAgIGlmICh0aGlzLl9kZWxlZ2F0ZSAmJiB0eXBlb2YgdGhpcy5fZGVsZWdhdGUu dGV4dEVkaXRvckd1dHRlckNvbnRleHRNZW51ID09PSAiZnVuY3Rpb24iKSB7CiAgICAgICAgICAg ICB2YXIgYnJlYWtwb2ludHMgPSBbXTsKICAgICAgICAgICAgIGZvciAodmFyIGNvbHVtbk51bWJl ciBpbiB0aGlzLl9icmVha3BvaW50c1tsaW5lTnVtYmVyXSkKLSAgICAgICAgICAgICAgICBicmVh a3BvaW50cy5wdXNoKHtsaW5lTnVtYmVyOmxpbmVOdW1iZXIsIGNvbHVtbk51bWJlcjpjb2x1bW5O dW1iZXJ9KTsKKyAgICAgICAgICAgICAgICBicmVha3BvaW50cy5wdXNoKHtsaW5lTnVtYmVyLCBj b2x1bW5OdW1iZXJ9KTsKIAogICAgICAgICAgICAgdGhpcy5fZGVsZWdhdGUudGV4dEVkaXRvckd1 dHRlckNvbnRleHRNZW51KHRoaXMsIGxpbmVOdW1iZXIsIDAsIGJyZWFrcG9pbnRzLCBldmVudCk7 CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1RpbWVsaW5lRGF0YUdyaWQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9UaW1lbGluZURhdGFHcmlkLmpzCmluZGV4IDI3ZjJjZjMuLjc0Y2Ez ZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1RpbWVsaW5lRGF0YUdyaWQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvVGltZWxpbmVEYXRhR3JpZC5qcwpAQCAtMzY3LDcgKzM2Nyw3IEBAIFdlYklu c3BlY3Rvci5UaW1lbGluZURhdGFHcmlkLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fdXBk YXRlU2NvcGVCYXJGb3JjZWRWaXNpYmlsaXR5KCk7CiAKICAgICAgICAgdmFyIGNvbHVtbklkZW50 aWZpZXIgPSBldmVudC50YXJnZXQuY29sdW1uSWRlbnRpZmllcjsKLSAgICAgICAgdGhpcy5kaXNw YXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlRpbWVsaW5lRGF0YUdyaWQuRXZlbnQu RmlsdGVyc0RpZENoYW5nZSwge2NvbHVtbklkZW50aWZpZXI6IGNvbHVtbklkZW50aWZpZXJ9KTsK KyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlRpbWVs aW5lRGF0YUdyaWQuRXZlbnQuRmlsdGVyc0RpZENoYW5nZSwge2NvbHVtbklkZW50aWZpZXJ9KTsK ICAgICB9LAogCiAgICAgX2RhdGFHcmlkU2VsZWN0ZWROb2RlQ2hhbmdlZDogZnVuY3Rpb24oZXZl bnQpCg==