195805 2019-03-15 11:12:32 -0700 Web Inspector: DOM: selecting a node in a different frame should automatically switch the console prompt's execution context 2019-07-30 13:27:09 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=200279 InRadar P2 Normal --- 1 hi hi commit-queue hi inspector-bugzilla-changes timothy webkit-bug-importer oldest_to_newest 1517020 0 hi 2019-03-15 11:12:32 -0700 It's very annoying to have to deal with `TypeError: null is not an object (evaluating '$0')` :( 1517021 1 webkit-bug-importer 2019-03-15 11:12:53 -0700 <rdar://problem/48930866> 1517378 2 364919 hi 2019-03-15 23:05:04 -0700 Created attachment 364919 Patch 1518984 3 364919 commit-queue 2019-03-20 10:45:08 -0700 Comment on attachment 364919 Patch Clearing flags on attachment: 364919 Committed r243214: <https://trac.webkit.org/changeset/243214> 1518985 4 commit-queue 2019-03-20 10:45:10 -0700 All reviewed patches have been landed. Closing bug. 364919 2019-03-15 23:05:04 -0700 2019-03-20 10:45:08 -0700 Patch bug-195805-20190315230503.patch text/plain 22563 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGM2YWZjYmJhYTdhOGQ5MWY0MWJlNDViOWVkZDdi NWNhYmYzN2MwZWIuLjQwMjlhMjMxZDRhYWE1ODVlZDdmZWI4Mjc2OGM5OGFhMjVlOGZkZjggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU0IEBACisyMDE5LTAzLTE1ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBE T006IHNlbGVjdGluZyBhIG5vZGUgaW4gYSBkaWZmZXJlbnQgZnJhbWUgc2hvdWxkIGF1dG9tYXRp Y2FsbHkgc3dpdGNoIHRoZSBjb25zb2xlIHByb21wdCdzIGV4ZWN1dGlvbiBjb250ZXh0CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTU4MDUKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzQ4OTMwODY2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhbiAiQXV0byIgZXhlY3V0aW9uIGNvbnRleHQgaXRl bSB0aGF0IGlzIHNlbGVjdGVkIGJ5IGRlZmF1bHQgYW5kIHdpbGwgdXBkYXRlIHRoZQorICAgICAg ICBzZWxlY3RlZCBleGVjdXRpb24gY29udGV4dCB3aGVuZXZlciB0aGUgaW5zcGVjdGVkIG5vZGUg Y2hhbmdlcy4gSXQgd2lsbCBhbHNvIGRpc3BsYXkgdGhlCisgICAgICAgIHByZWZlcnJlZCBuYW1l IGZvciB3aGF0ZXZlciBleGVjdXRpb24gY29udGV4dCBpcyBjdXJyZW50bHkgYWN0aXZlLgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9RdWlja0NvbnNvbGUuanM6CisgICAgICAgIChX SS5RdWlja0NvbnNvbGUpOgorICAgICAgICAoV0kuUXVpY2tDb25zb2xlLnByb3RvdHlwZS5pbml0 aWFsaXplTWFpbkV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50KToKKyAgICAgICAgKFdJLlF1 aWNrQ29uc29sZS5wcm90b3R5cGUuX3ByZWZlcnJlZE5hbWVGb3JGcmFtZSk6IEFkZGVkLgorICAg ICAgICAoV0kuUXVpY2tDb25zb2xlLnByb3RvdHlwZS5fc2VsZWN0RXhlY3V0aW9uQ29udGV4dCk6 IEFkZGVkLgorICAgICAgICAoV0kuUXVpY2tDb25zb2xlLnByb3RvdHlwZS5fZXhlY3V0aW9uQ29u dGV4dFBhdGhDb21wb25lbnRzVG9EaXNwbGF5KToKKyAgICAgICAgKFdJLlF1aWNrQ29uc29sZS5w cm90b3R5cGUuX3JlYnVpbGRFeGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudHMpOgorICAgICAg ICAoV0kuUXVpY2tDb25zb2xlLnByb3RvdHlwZS5fZnJhbWVQYWdlRXhlY3V0aW9uQ29udGV4dHND aGFuZ2VkKToKKyAgICAgICAgKFdJLlF1aWNrQ29uc29sZS5wcm90b3R5cGUuX2ZyYW1lRXhlY3V0 aW9uQ29udGV4dHNDbGVhcmVkKToKKyAgICAgICAgKFdJLlF1aWNrQ29uc29sZS5wcm90b3R5cGUu X2FjdGl2ZUV4ZWN1dGlvbkNvbnRleHRDaGFuZ2VkKToKKyAgICAgICAgKFdJLlF1aWNrQ29uc29s ZS5wcm90b3R5cGUuX2NyZWF0ZUV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50KToKKyAgICAg ICAgKFdJLlF1aWNrQ29uc29sZS5wcm90b3R5cGUuX2luc2VydE90aGVyRXhlY3V0aW9uQ29udGV4 dFBhdGhDb21wb25lbnQpOgorICAgICAgICAoV0kuUXVpY2tDb25zb2xlLnByb3RvdHlwZS5fcmVt b3ZlT3RoZXJFeGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudCk6CisgICAgICAgIChXSS5RdWlj a0NvbnNvbGUucHJvdG90eXBlLl9pbnNlcnRFeGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudEZv ckZyYW1lKToKKyAgICAgICAgKFdJLlF1aWNrQ29uc29sZS5wcm90b3R5cGUuX3JlbW92ZUV4ZWN1 dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50Rm9yRnJhbWUpOgorICAgICAgICAoV0kuUXVpY2tDb25z b2xlLnByb3RvdHlwZS5fdGFyZ2V0UmVtb3ZlZCk6CisgICAgICAgIChXSS5RdWlja0NvbnNvbGUu cHJvdG90eXBlLl9wYXRoQ29tcG9uZW50U2VsZWN0ZWQpOgorICAgICAgICAoV0kuUXVpY2tDb25z b2xlLnByb3RvdHlwZS5faGFuZGxlSW5zcGVjdGVkTm9kZUNoYW5nZWQpOiBBZGRlZC4KKyAgICAg ICAgKFdJLlF1aWNrQ29uc29sZS5wcm90b3R5cGUuZ2V0IHNlbGVjdGVkRXhlY3V0aW9uQ29udGV4 dCk6IERlbGV0ZWQuCisgICAgICAgIChXSS5RdWlja0NvbnNvbGUucHJvdG90eXBlLnNldCBzZWxl Y3RlZEV4ZWN1dGlvbkNvbnRleHQpOiBEZWxldGVkLgorICAgICAgICAoV0kuUXVpY2tDb25zb2xl LnByb3RvdHlwZS5fY3JlYXRlRXhlY3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnRGcm9tRnJhbWUp OiBEZWxldGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUXVpY2tDb25zb2xlLmNz czoKKyAgICAgICAgKC5xdWljay1jb25zb2xlID4gLm5hdmlnYXRpb24tYmFyID4gLmhpZXJhcmNo aWNhbC1wYXRoOm5vdCguYXV0b21hdGljLWV4ZWN1dGlvbi1jb250ZXh0KSk6IEFkZGVkLgorICAg ICAgICAoLnF1aWNrLWNvbnNvbGUgPiAubmF2aWdhdGlvbi1iYXIgPiAuaGllcmFyY2hpY2FsLXBh dGg6bm90KC5hdXRvbWF0aWMtZXhlY3V0aW9uLWNvbnRleHQpIC5leGVjdXRpb24tY29udGV4dCk6 IEFkZGVkLgorICAgICAgICAoLnF1aWNrLWNvbnNvbGUgPiAubmF2aWdhdGlvbi1iYXIgPiAuaGll cmFyY2hpY2FsLXBhdGg6bm90KC5hdXRvbWF0aWMtZXhlY3V0aW9uLWNvbnRleHQpIC5leGVjdXRp b24tY29udGV4dCAuc2VsZWN0b3ItYXJyb3dzKTogQWRkZWQuCisgICAgICAgICgucXVpY2stY29u c29sZSA+IC5uYXZpZ2F0aW9uLWJhciA+IC5oaWVyYXJjaGljYWwtcGF0aC5ub24tZGVmYXVsdC1l eGVjdXRpb24tY29udGV4dCAuZXhlY3V0aW9uLWNvbnRleHQpOiBEZWxldGVkLgorICAgICAgICAo LnF1aWNrLWNvbnNvbGUgPiAubmF2aWdhdGlvbi1iYXIgPiAuaGllcmFyY2hpY2FsLXBhdGgubm9u LWRlZmF1bHQtZXhlY3V0aW9uLWNvbnRleHQgLmV4ZWN1dGlvbi1jb250ZXh0IC5zZWxlY3Rvci1h cnJvd3MpOiBEZWxldGVkLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9sbGVycy9E T01NYW5hZ2VyLmpzOgorICAgICAgICAoV0kuRE9NTWFuYWdlci5wcm90b3R5cGUuZ2V0IGluc3Bl Y3RlZE5vZGUpOiBBZGRlZC4KKyAgICAgICAgKFdJLkRPTU1hbmFnZXIucHJvdG90eXBlLnNldElu c3BlY3RlZE5vZGUpOgorICAgICAgICBCcm9hZGNhc3Qgd2hlbiB0aGUgaW5zcGVjdGVkIG5vZGUg Y2hhbmdlcy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvbkJhci5q czoKKyAgICAgICAgKFdJLk5hdmlnYXRpb25CYXIucHJvdG90eXBlLmxheW91dCk6CisgICAgICAg IFdoZW4gYHNpemVzVG9GaXRgIGlzIGVuYWJsZWQsIGRvbid0IGZvcmNlIGFueSBpdGVtcyB0byBi ZSBoaWRkZW4uCisKKyAgICAgICAgKiBMb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0 cmluZ3MuanM6CisKIDIwMTktMDMtMTUgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxl LmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBDUFUgVXNhZ2UgVGltZWxpbmUgLSBHaXZl IGxvbmcgdGhyZWFkIG5hbWVzIGEgdG9vbHRpcCBpZiB0aGV5IGNvdWxkIGJlIGVsbGlwc2l6ZWQK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9q L2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9u cy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IDJkOGIyZDE0NDU4NmNiZDM1MjI0 ODRhODA2ZGM0MzhhZTgyMmZhNWIuLjdmNTI2YzE4Zjg5YmI5YmU0ZWIzNWYzN2FkMmIxMGMyODE1 ZWFkYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2Vu Lmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xv Y2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwpAQCAtMTQyLDYgKzE0Miw4 IEBAIGxvY2FsaXplZFN0cmluZ3NbIkF1ZGl0IFdhcm5pbmc6ICVzIl0gPSAiQXVkaXQgV2Fybmlu ZzogJXMiOwogbG9jYWxpemVkU3RyaW5nc1siQXVkaXQgdmVyc2lvbjogJXMiXSA9ICJBdWRpdCB2 ZXJzaW9uOiAlcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJBdWRpdHMiXSA9ICJBdWRpdHMiOwogbG9j YWxpemVkU3RyaW5nc1siQXV0aG9yIFN0eWxlc2hlZXQiXSA9ICJBdXRob3IgU3R5bGVzaGVldCI7 Citsb2NhbGl6ZWRTdHJpbmdzWyJBdXRvIl0gPSAiQXV0byI7Citsb2NhbGl6ZWRTdHJpbmdzWyJB dXRvIC0gJXMiXSA9ICJBdXRvIC0gJXMiOwogbG9jYWxpemVkU3RyaW5nc1siQXV0byBJbmNyZW1l bnQiXSA9ICJBdXRvIEluY3JlbWVudCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJBdXRvbWF0aWNhbGx5 IGNvbnRpbnVlIGFmdGVyIGV2YWx1YXRpbmciXSA9ICJBdXRvbWF0aWNhbGx5IGNvbnRpbnVlIGFm dGVyIGV2YWx1YXRpbmciOwogbG9jYWxpemVkU3RyaW5nc1siQXZhaWxhYmxlIFN0eWxlIFNoZWV0 cyJdID0gIkF2YWlsYWJsZSBTdHlsZSBTaGVldHMiOwpAQCAtNDM3LDYgKzQzOSw3IEBAIGxvY2Fs aXplZFN0cmluZ3NbIkV2ZW50cyJdID0gIkV2ZW50cyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJFdmVu dHM6Il0gPSAiRXZlbnRzOiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJFeGFtcGxlOiBcdTIwMUMlc1x1 MjAxRCJdID0gIkV4YW1wbGU6IFx1MjAxQyVzXHUyMDFEIjsKIGxvY2FsaXplZFN0cmluZ3NbIkV4 Y2VwdGlvbiB3aXRoIHRocm93biB2YWx1ZTogJXMiXSA9ICJFeGNlcHRpb24gd2l0aCB0aHJvd24g dmFsdWU6ICVzIjsKK2xvY2FsaXplZFN0cmluZ3NbIkV4ZWN1dGlvbiBjb250ZXh0IGZvciAkMCJd ID0gIkV4ZWN1dGlvbiBjb250ZXh0IGZvciAkMCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJFeGl0ZWQg RnVsbC1TY3JlZW4gTW9kZSJdID0gIkV4aXRlZCBGdWxsLVNjcmVlbiBNb2RlIjsKIGxvY2FsaXpl ZFN0cmluZ3NbIkV4aXRlZCBMb3ctUG93ZXIgTW9kZSJdID0gIkV4aXRlZCBMb3ctUG93ZXIgTW9k ZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJFeHBhbmQgQWxsIl0gPSAiRXhwYW5kIEFsbCI7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9E T01NYW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJv bGxlcnMvRE9NTWFuYWdlci5qcwppbmRleCA5NWVjZmM2ZjU0MTQxZjkxODE4MjNhZWEyNjlhNDU3 YzljNjhlMjFmLi45MjVjNGNmNDBmOGQzZWJjNGU0ZTViMDg3ZThiZWJlYjhhYjJhMGQzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9E T01NYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Nv bnRyb2xsZXJzL0RPTU1hbmFnZXIuanMKQEAgLTc1LDYgKzc1LDggQEAgV0kuRE9NTWFuYWdlciA9 IGNsYXNzIERPTU1hbmFnZXIgZXh0ZW5kcyBXSS5PYmplY3QKIAogICAgIC8vIFB1YmxpYwogCisg ICAgZ2V0IGluc3BlY3RlZE5vZGUoKSB7IHJldHVybiB0aGlzLl9pbnNwZWN0ZWROb2RlOyB9CisK ICAgICBnZXQgZXZlbnRMaXN0ZW5lckJyZWFrcG9pbnRzKCkKICAgICB7CiAgICAgICAgIHJldHVy biBBcnJheS5mcm9tKHRoaXMuX2JyZWFrcG9pbnRzRm9yRXZlbnRMaXN0ZW5lcnMudmFsdWVzKCkp OwpAQCAtNTk1LDYgKzU5Nyw4IEBAIFdJLkRPTU1hbmFnZXIgPSBjbGFzcyBET01NYW5hZ2VyIGV4 dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgICAgICB0 aGlzLl9pbnNwZWN0ZWROb2RlID0gbm9kZTsKKworICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2 ZW50VG9MaXN0ZW5lcnMoV0kuRE9NTWFuYWdlci5FdmVudC5JbnNwZWN0ZWROb2RlQ2hhbmdlZCk7 CiAgICAgICAgIH07CiAKICAgICAgICAgLy8gQ09NUEFUSUJJTElUWSAoaU9TIDExKTogRE9NLnNl dEluc3BlY3RlZE5vZGUgZGlkIG5vdCBleGlzdC4KQEAgLTcwNyw0ICs3MTEsNSBAQCBXSS5ET01N YW5hZ2VyLkV2ZW50ID0gewogICAgIENoaWxkTm9kZUNvdW50VXBkYXRlZDogImRvbS1tYW5hZ2Vy LWNoaWxkLW5vZGUtY291bnQtdXBkYXRlZCIsCiAgICAgRE9NTm9kZVdhc0luc3BlY3RlZDogImRv bS1tYW5hZ2VyLWRvbS1ub2RlLXdhcy1pbnNwZWN0ZWQiLAogICAgIEluc3BlY3RNb2RlU3RhdGVD aGFuZ2VkOiAiZG9tLW1hbmFnZXItaW5zcGVjdC1tb2RlLXN0YXRlLWNoYW5nZWQiLAorICAgIElu c3BlY3RlZE5vZGVDaGFuZ2VkOiAiZG9tLW1hbmFnZXItaW5zcGVjdGVkLW5vZGUtY2hhbmdlZCIs CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvTmF2aWdhdGlvbkJhci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL05hdmlnYXRpb25CYXIuanMKaW5kZXggN2MwMzI5M2IyNmM0MzFiZDk4YTQxYTA4MTMz OWVjYTI1NWVmOTU4Zi4uMTQ0ZmUxNjRmOWRhNzQ3N2JkYWE3MDFiNmJiNjYzMTdmMGJmM2NhZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmF2 aWdhdGlvbkJhci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9OYXZpZ2F0aW9uQmFyLmpzCkBAIC0yMzMsNiArMjMzLDkgQEAgV0kuTmF2aWdhdGlvbkJh ciA9IGNsYXNzIE5hdmlnYXRpb25CYXIgZXh0ZW5kcyBXSS5WaWV3CiAgICAgICAgICAgICBpdGVt LnVwZGF0ZUxheW91dCh0cnVlKTsKICAgICAgICAgfQogCisgICAgICAgIGlmICh0aGlzLnNpemVz VG9GaXQpCisgICAgICAgICAgICByZXR1cm47CisKICAgICAgICAgbGV0IHZpc2libGVOYXZpZ2F0 aW9uSXRlbXMgPSB0aGlzLl92aXNpYmxlTmF2aWdhdGlvbkl0ZW1zOwogCiAgICAgICAgIGZ1bmN0 aW9uIGNhbGN1bGF0ZVZpc2libGVJdGVtV2lkdGgoKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9RdWlja0NvbnNvbGUuY3NzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUXVpY2tDb25zb2xlLmNzcwppbmRl eCA5OWZiNDljYjM2ZThmZDVlYjA3ODNmZjEyYjA4OGJhYTRhMzNiMGRkLi5mNGJmOTQwOGM2NWE0 MmJkNDI4MjJiM2E2YjU4NGRmYjM0MjA0MTMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9RdWlja0NvbnNvbGUuY3NzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1F1aWNrQ29uc29sZS5jc3MKQEAgLTk3 LDEzICs5NywxNyBAQAogICAgIGRpc3BsYXk6IG5vbmU7CiB9CiAKLS5xdWljay1jb25zb2xlID4g Lm5hdmlnYXRpb24tYmFyID4gLmhpZXJhcmNoaWNhbC1wYXRoLm5vbi1kZWZhdWx0LWV4ZWN1dGlv bi1jb250ZXh0IC5leGVjdXRpb24tY29udGV4dCB7CisucXVpY2stY29uc29sZSA+IC5uYXZpZ2F0 aW9uLWJhciA+IC5oaWVyYXJjaGljYWwtcGF0aDpub3QoLmF1dG9tYXRpYy1leGVjdXRpb24tY29u dGV4dCkgeworICAgIC13ZWJraXQtcGFkZGluZy1zdGFydDogNXB4OworfQorCisucXVpY2stY29u c29sZSA+IC5uYXZpZ2F0aW9uLWJhciA+IC5oaWVyYXJjaGljYWwtcGF0aDpub3QoLmF1dG9tYXRp Yy1leGVjdXRpb24tY29udGV4dCkgLmV4ZWN1dGlvbi1jb250ZXh0IHsKICAgICBiYWNrZ3JvdW5k OiB2YXIoLS1zZWxlY3RlZC1iYWNrZ3JvdW5kLWNvbG9yKTsKICAgICBib3JkZXItcmFkaXVzOiAz cHg7CiAgICAgY29sb3I6IHZhcigtLXNlbGVjdGVkLWZvcmVncm91bmQtY29sb3IpOwogfQogCi0u cXVpY2stY29uc29sZSA+IC5uYXZpZ2F0aW9uLWJhciA+IC5oaWVyYXJjaGljYWwtcGF0aC5ub24t ZGVmYXVsdC1leGVjdXRpb24tY29udGV4dCAuZXhlY3V0aW9uLWNvbnRleHQgLnNlbGVjdG9yLWFy cm93cyB7CisucXVpY2stY29uc29sZSA+IC5uYXZpZ2F0aW9uLWJhciA+IC5oaWVyYXJjaGljYWwt cGF0aDpub3QoLmF1dG9tYXRpYy1leGVjdXRpb24tY29udGV4dCkgLmV4ZWN1dGlvbi1jb250ZXh0 IC5zZWxlY3Rvci1hcnJvd3MgewogICAgIGNvbG9yOiB2YXIoLS1zZWxlY3RlZC1mb3JlZ3JvdW5k LWNvbG9yKTsKICAgICBvcGFjaXR5OiAxOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUXVpY2tDb25zb2xlLmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUXVpY2tDb25zb2xlLmpzCmluZGV4IDFkMjNi YzQzNmExNmY1Zjc4N2Q4NjQzYmI3N2UyOGZhM2NlMDhjOTQuLmYzYTU1ZTdkMjRiMWUyOWM5NWVl ZWZhMmFlZjI4NWQ5NmI4ODFmZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1F1aWNrQ29uc29sZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9RdWlja0NvbnNvbGUuanMKQEAgLTMyLDEzICszMiwx NiBAQCBXSS5RdWlja0NvbnNvbGUgPSBjbGFzcyBRdWlja0NvbnNvbGUgZXh0ZW5kcyBXSS5WaWV3 CiAgICAgICAgIHRoaXMuX3RvZ2dsZU9yRm9jdXNLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdJLktl eWJvYXJkU2hvcnRjdXQobnVsbCwgV0kuS2V5Ym9hcmRTaG9ydGN1dC5LZXkuRXNjYXBlLCB0aGlz Ll90b2dnbGVPckZvY3VzLmJpbmQodGhpcykpOwogICAgICAgICB0aGlzLl90b2dnbGVPckZvY3Vz S2V5Ym9hcmRTaG9ydGN1dC5pbXBsaWNpdGx5UHJldmVudHNEZWZhdWx0ID0gZmFsc2U7CiAKLSAg ICAgICAgdGhpcy5fbWFpbkV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50ID0gbnVsbDsKLSAg ICAgICAgdGhpcy5pbml0aWFsaXplTWFpbkV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50KCk7 CisgICAgICAgIHRoaXMuX2F1dG9tYXRpY0V4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50ID0g dGhpcy5fY3JlYXRlRXhlY3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnQobnVsbCwgV0kuVUlTdHJp bmcoIkF1dG8iKSk7CisgICAgICAgIHRoaXMuX2F1dG9tYXRpY0V4ZWN1dGlvbkNvbnRleHRQYXRo Q29tcG9uZW50LnRvb2x0aXAgPSBXSS5VSVN0cmluZygiRXhlY3V0aW9uIGNvbnRleHQgZm9yICQw Iik7CiAKKyAgICAgICAgdGhpcy5fbWFpbkV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50ID0g bnVsbDsKICAgICAgICAgdGhpcy5fb3RoZXJFeGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudHMg PSBbXTsKKwogICAgICAgICB0aGlzLl9mcmFtZVRvUGF0aENvbXBvbmVudCA9IG5ldyBNYXA7CiAg ICAgICAgIHRoaXMuX3RhcmdldFRvUGF0aENvbXBvbmVudCA9IG5ldyBNYXA7CiAKKyAgICAgICAg dGhpcy5fc2hvdWxkQXV0b21hdGljYWxseVNlbGVjdEV4ZWN1dGlvbkNvbnRleHQgPSB0cnVlOwog ICAgICAgICB0aGlzLl9yZXN0b3JlU2VsZWN0ZWRFeGVjdXRpb25Db250ZXh0Rm9yRnJhbWUgPSBm YWxzZTsKIAogICAgICAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgicXVpY2stY29uc29s ZSIpOwpAQCAtNjQsNyArNjcsNyBAQCBXSS5RdWlja0NvbnNvbGUgPSBjbGFzcyBRdWlja0NvbnNv bGUgZXh0ZW5kcyBXSS5WaWV3CiAgICAgICAgIHRoaXMuX2V4ZWN1dGlvbkNvbnRleHRTZWxlY3Rv ckRpdmlkZXIgPSBuZXcgV0kuRGl2aWRlck5hdmlnYXRpb25JdGVtOwogICAgICAgICB0aGlzLl9u YXZpZ2F0aW9uQmFyLmFkZE5hdmlnYXRpb25JdGVtKHRoaXMuX2V4ZWN1dGlvbkNvbnRleHRTZWxl Y3RvckRpdmlkZXIpOwogCi0gICAgICAgIHRoaXMuX3JlYnVpbGRFeGVjdXRpb25Db250ZXh0UGF0 aENvbXBvbmVudHMoKTsKKyAgICAgICAgdGhpcy5pbml0aWFsaXplTWFpbkV4ZWN1dGlvbkNvbnRl eHRQYXRoQ29tcG9uZW50KCk7CiAKICAgICAgICAgV0kuY29uc29sZURyYXdlci50b2dnbGVCdXR0 b25TaG9ydGN1dFRvb2x0aXAodGhpcy5fdG9nZ2xlT3JGb2N1c0tleWJvYXJkU2hvcnRjdXQpOwog ICAgICAgICBXSS5jb25zb2xlRHJhd2VyLmFkZEV2ZW50TGlzdGVuZXIoV0kuQ29uc29sZURyYXdl ci5FdmVudC5Db2xsYXBzZWRTdGF0ZUNoYW5nZWQsIHRoaXMuX3VwZGF0ZVN0eWxlcywgdGhpcyk7 CkBAIC03OSw2ICs4Miw4IEBAIFdJLlF1aWNrQ29uc29sZSA9IGNsYXNzIFF1aWNrQ29uc29sZSBl eHRlbmRzIFdJLlZpZXcKICAgICAgICAgV0kudGFyZ2V0TWFuYWdlci5hZGRFdmVudExpc3RlbmVy KFdJLlRhcmdldE1hbmFnZXIuRXZlbnQuVGFyZ2V0QWRkZWQsIHRoaXMuX3RhcmdldEFkZGVkLCB0 aGlzKTsKICAgICAgICAgV0kudGFyZ2V0TWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdJLlRhcmdl dE1hbmFnZXIuRXZlbnQuVGFyZ2V0UmVtb3ZlZCwgdGhpcy5fdGFyZ2V0UmVtb3ZlZCwgdGhpcyk7 CiAKKyAgICAgICAgV0kuZG9tTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdJLkRPTU1hbmFnZXIu RXZlbnQuSW5zcGVjdGVkTm9kZUNoYW5nZWQsIHRoaXMuX2hhbmRsZUluc3BlY3RlZE5vZGVDaGFu Z2VkLCB0aGlzKTsKKwogICAgICAgICBXSS5UYWJCcm93c2VyLmFkZEV2ZW50TGlzdGVuZXIoV0ku VGFiQnJvd3Nlci5FdmVudC5TZWxlY3RlZFRhYkNvbnRlbnRWaWV3RGlkQ2hhbmdlLCB0aGlzLl91 cGRhdGVTdHlsZXMsIHRoaXMpOwogICAgIH0KIApAQCAtODksMTYgKzk0LDYgQEAgV0kuUXVpY2tD b25zb2xlID0gY2xhc3MgUXVpY2tDb25zb2xlIGV4dGVuZHMgV0kuVmlldwogICAgICAgICByZXR1 cm4gdGhpcy5fbmF2aWdhdGlvbkJhcjsKICAgICB9CiAKLSAgICBnZXQgc2VsZWN0ZWRFeGVjdXRp b25Db250ZXh0KCkKLSAgICB7Ci0gICAgICAgIHJldHVybiBXSS5ydW50aW1lTWFuYWdlci5hY3Rp dmVFeGVjdXRpb25Db250ZXh0OwotICAgIH0KLQotICAgIHNldCBzZWxlY3RlZEV4ZWN1dGlvbkNv bnRleHQoZXhlY3V0aW9uQ29udGV4dCkKLSAgICB7Ci0gICAgICAgIFdJLnJ1bnRpbWVNYW5hZ2Vy LmFjdGl2ZUV4ZWN1dGlvbkNvbnRleHQgPSBleGVjdXRpb25Db250ZXh0OwotICAgIH0KLQogICAg IGNsb3NlZCgpCiAgICAgewogICAgICAgICBXSS5GcmFtZS5yZW1vdmVFdmVudExpc3RlbmVyKG51 bGwsIG51bGwsIHRoaXMpOwpAQCAtMTE3LDYgKzExMiwxMyBAQCBXSS5RdWlja0NvbnNvbGUgPSBj bGFzcyBRdWlja0NvbnNvbGUgZXh0ZW5kcyBXSS5WaWV3CiAgICAgICAgICAgICByZXR1cm47CiAK ICAgICAgICAgdGhpcy5fbWFpbkV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50ID0gdGhpcy5f Y3JlYXRlRXhlY3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnQoV0kubWFpblRhcmdldC5leGVjdXRp b25Db250ZXh0KTsKKyAgICAgICAgdGhpcy5fbWFpbkV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9u ZW50LnByZXZpb3VzU2libGluZyA9IHRoaXMuX2F1dG9tYXRpY0V4ZWN1dGlvbkNvbnRleHRQYXRo Q29tcG9uZW50OworCisgICAgICAgIHRoaXMuX2F1dG9tYXRpY0V4ZWN1dGlvbkNvbnRleHRQYXRo Q29tcG9uZW50Lm5leHRTaWJsaW5nID0gdGhpcy5fbWFpbkV4ZWN1dGlvbkNvbnRleHRQYXRoQ29t cG9uZW50OworCisgICAgICAgIHRoaXMuX3Nob3VsZEF1dG9tYXRpY2FsbHlTZWxlY3RFeGVjdXRp b25Db250ZXh0ID0gdHJ1ZTsKKyAgICAgICAgdGhpcy5fc2VsZWN0RXhlY3V0aW9uQ29udGV4dChX SS5tYWluVGFyZ2V0LmV4ZWN1dGlvbkNvbnRleHQpOworICAgICAgICB0aGlzLl9yZWJ1aWxkRXhl Y3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnRzKCk7CiAgICAgfQogCiAgICAgLy8gUHJvdGVjdGVk CkBAIC0xMzAsNiArMTMyLDM3IEBAIFdJLlF1aWNrQ29uc29sZSA9IGNsYXNzIFF1aWNrQ29uc29s ZSBleHRlbmRzIFdJLlZpZXcKIAogICAgIC8vIFByaXZhdGUKIAorICAgIF9wcmVmZXJyZWROYW1l Rm9yRnJhbWUoZnJhbWUpCisgICAgeworICAgICAgICBpZiAoZnJhbWUubmFtZSkKKyAgICAgICAg ICAgIHJldHVybiBXSS5VSVN0cmluZygiJXMgKCVzKSIpLmZvcm1hdChmcmFtZS5uYW1lLCBmcmFt ZS5tYWluUmVzb3VyY2UuZGlzcGxheU5hbWUpOworICAgICAgICByZXR1cm4gZnJhbWUubWFpblJl c291cmNlLmRpc3BsYXlOYW1lOworICAgIH0KKworICAgIF9zZWxlY3RFeGVjdXRpb25Db250ZXh0 KGV4ZWN1dGlvbkNvbnRleHQpCisgICAgeworICAgICAgICBsZXQgcHJlZmVycmVkTmFtZSA9IG51 bGw7CisKKyAgICAgICAgbGV0IGluc3BlY3RlZE5vZGUgPSBXSS5kb21NYW5hZ2VyLmluc3BlY3Rl ZE5vZGU7CisgICAgICAgIGlmIChpbnNwZWN0ZWROb2RlKSB7CisgICAgICAgICAgICBsZXQgZnJh bWUgPSBpbnNwZWN0ZWROb2RlLm93bmVyRG9jdW1lbnQuZnJhbWU7CisgICAgICAgICAgICBpZiAo ZnJhbWUpIHsKKyAgICAgICAgICAgICAgICBpZiAodGhpcy5fc2hvdWxkQXV0b21hdGljYWxseVNl bGVjdEV4ZWN1dGlvbkNvbnRleHQpCisgICAgICAgICAgICAgICAgICAgIGV4ZWN1dGlvbkNvbnRl eHQgPSBmcmFtZS5wYWdlRXhlY3V0aW9uQ29udGV4dDsKKworICAgICAgICAgICAgICAgIHByZWZl cnJlZE5hbWUgPSB0aGlzLl9wcmVmZXJyZWROYW1lRm9yRnJhbWUoZnJhbWUpOworICAgICAgICAg ICAgfQorICAgICAgICB9CisKKyAgICAgICAgY29uc29sZS5hc3NlcnQoZXhlY3V0aW9uQ29udGV4 dCk7CisgICAgICAgIGlmICghZXhlY3V0aW9uQ29udGV4dCkKKyAgICAgICAgICAgIGV4ZWN1dGlv bkNvbnRleHQgPSBXSS5tYWluVGFyZ2V0LmV4ZWN1dGlvbkNvbnRleHQ7CisKKyAgICAgICAgV0ku cnVudGltZU1hbmFnZXIuYWN0aXZlRXhlY3V0aW9uQ29udGV4dCA9IGV4ZWN1dGlvbkNvbnRleHQ7 CisKKyAgICAgICAgdGhpcy5fYXV0b21hdGljRXhlY3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnQu ZGlzcGxheU5hbWUgPSBXSS5VSVN0cmluZygiQXV0byAtICVzIikuZm9ybWF0KHByZWZlcnJlZE5h bWUgfHwgZXhlY3V0aW9uQ29udGV4dC5uYW1lKTsKKyAgICB9CisKICAgICBfaGFuZGxlTW91c2VE b3duKGV2ZW50KQogICAgIHsKICAgICAgICAgaWYgKGV2ZW50LnRhcmdldCAhPT0gdGhpcy5lbGVt ZW50KQpAQCAtMTQ5LDEwICsxODIsMTMgQEAgV0kuUXVpY2tDb25zb2xlID0gY2xhc3MgUXVpY2tD b25zb2xlIGV4dGVuZHMgV0kuVmlldwogICAgICAgICBpZiAoIXRoaXMuX290aGVyRXhlY3V0aW9u Q29udGV4dFBhdGhDb21wb25lbnRzLmxlbmd0aCkKICAgICAgICAgICAgIHJldHVybiBbXTsKIAot ICAgICAgICBpZiAodGhpcy5zZWxlY3RlZEV4ZWN1dGlvbkNvbnRleHQgPT09IFdJLm1haW5UYXJn ZXQuZXhlY3V0aW9uQ29udGV4dCkKKyAgICAgICAgaWYgKHRoaXMuX3Nob3VsZEF1dG9tYXRpY2Fs bHlTZWxlY3RFeGVjdXRpb25Db250ZXh0KQorICAgICAgICAgICAgcmV0dXJuIFt0aGlzLl9hdXRv bWF0aWNFeGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudF07CisKKyAgICAgICAgaWYgKFdJLnJ1 bnRpbWVNYW5hZ2VyLmFjdGl2ZUV4ZWN1dGlvbkNvbnRleHQgPT09IFdJLm1haW5UYXJnZXQuZXhl Y3V0aW9uQ29udGV4dCkKICAgICAgICAgICAgIHJldHVybiBbdGhpcy5fbWFpbkV4ZWN1dGlvbkNv bnRleHRQYXRoQ29tcG9uZW50XTsKIAotICAgICAgICByZXR1cm4gdGhpcy5fb3RoZXJFeGVjdXRp b25Db250ZXh0UGF0aENvbXBvbmVudHMuZmlsdGVyKChjb21wb25lbnQpID0+IGNvbXBvbmVudC5y ZXByZXNlbnRlZE9iamVjdCA9PT0gdGhpcy5zZWxlY3RlZEV4ZWN1dGlvbkNvbnRleHQpOworICAg ICAgICByZXR1cm4gdGhpcy5fb3RoZXJFeGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudHMuZmls dGVyKChjb21wb25lbnQpID0+IGNvbXBvbmVudC5yZXByZXNlbnRlZE9iamVjdCA9PT0gV0kucnVu dGltZU1hbmFnZXIuYWN0aXZlRXhlY3V0aW9uQ29udGV4dCk7CiAgICAgfQogCiAgICAgX3JlYnVp bGRFeGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudHMoKQpAQCAtMTYwLDIzICsxOTYsMjQgQEAg V0kuUXVpY2tDb25zb2xlID0gY2xhc3MgUXVpY2tDb25zb2xlIGV4dGVuZHMgV0kuVmlldwogICAg ICAgICBsZXQgY29tcG9uZW50cyA9IHRoaXMuX2V4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50 c1RvRGlzcGxheSgpOwogICAgICAgICBsZXQgaXNFbXB0eSA9ICFjb21wb25lbnRzLmxlbmd0aDsK IAorICAgICAgICB0aGlzLl9leGVjdXRpb25Db250ZXh0U2VsZWN0b3JJdGVtLmVsZW1lbnQuY2xh c3NMaXN0LnRvZ2dsZSgiYXV0b21hdGljLWV4ZWN1dGlvbi1jb250ZXh0IiwgdGhpcy5fc2hvdWxk QXV0b21hdGljYWxseVNlbGVjdEV4ZWN1dGlvbkNvbnRleHQpOwogICAgICAgICB0aGlzLl9leGVj dXRpb25Db250ZXh0U2VsZWN0b3JJdGVtLmNvbXBvbmVudHMgPSBjb21wb25lbnRzOwogCiAgICAg ICAgIHRoaXMuX2V4ZWN1dGlvbkNvbnRleHRTZWxlY3Rvckl0ZW0uaGlkZGVuID0gaXNFbXB0eTsK ICAgICAgICAgdGhpcy5fZXhlY3V0aW9uQ29udGV4dFNlbGVjdG9yRGl2aWRlci5oaWRkZW4gPSBp c0VtcHR5OworCiAgICAgfQogCiAgICAgX2ZyYW1lUGFnZUV4ZWN1dGlvbkNvbnRleHRzQ2hhbmdl ZChldmVudCkKICAgICB7CiAgICAgICAgIGxldCBmcmFtZSA9IGV2ZW50LnRhcmdldDsKIAotICAg ICAgICBsZXQgc2hvdWxkQXV0b21hdGljYWxseVNlbGVjdCA9IHRoaXMuX3Jlc3RvcmVTZWxlY3Rl ZEV4ZWN1dGlvbkNvbnRleHRGb3JGcmFtZSA9PT0gZnJhbWU7CisgICAgICAgIGxldCBuZXdFeGVj dXRpb25Db250ZXh0UGF0aENvbXBvbmVudCA9IHRoaXMuX2luc2VydEV4ZWN1dGlvbkNvbnRleHRQ YXRoQ29tcG9uZW50Rm9yRnJhbWUoZnJhbWUpOwogCi0gICAgICAgIGxldCBuZXdFeGVjdXRpb25D b250ZXh0UGF0aENvbXBvbmVudCA9IHRoaXMuX2luc2VydEV4ZWN1dGlvbkNvbnRleHRQYXRoQ29t cG9uZW50Rm9yRnJhbWUoZnJhbWUsIHNob3VsZEF1dG9tYXRpY2FsbHlTZWxlY3QpOwotCi0gICAg ICAgIGlmIChzaG91bGRBdXRvbWF0aWNhbGx5U2VsZWN0KSB7CisgICAgICAgIGlmICh0aGlzLl9y ZXN0b3JlU2VsZWN0ZWRFeGVjdXRpb25Db250ZXh0Rm9yRnJhbWUgPT09IGZyYW1lKSB7CiAgICAg ICAgICAgICB0aGlzLl9yZXN0b3JlU2VsZWN0ZWRFeGVjdXRpb25Db250ZXh0Rm9yRnJhbWUgPSBu dWxsOwotICAgICAgICAgICAgdGhpcy5zZWxlY3RlZEV4ZWN1dGlvbkNvbnRleHQgPSBuZXdFeGVj dXRpb25Db250ZXh0UGF0aENvbXBvbmVudC5yZXByZXNlbnRlZE9iamVjdDsKKworICAgICAgICAg ICAgdGhpcy5fc2VsZWN0RXhlY3V0aW9uQ29udGV4dChuZXdFeGVjdXRpb25Db250ZXh0UGF0aENv bXBvbmVudC5yZXByZXNlbnRlZE9iamVjdCk7CiAgICAgICAgIH0KICAgICB9CiAKQEAgLTE4Nywx MCArMjI0LDEyIEBAIFdJLlF1aWNrQ29uc29sZSA9IGNsYXNzIFF1aWNrQ29uc29sZSBleHRlbmRz IFdJLlZpZXcKICAgICAgICAgLy8gSWYgdGhpcyBmcmFtZSBpcyBuYXZpZ2F0aW5nIGFuZCBpdCBp cyBzZWxlY3RlZCBpbiB0aGUgVUkgd2Ugd2FudCB0byByZXNlbGVjdCBpdHMgbmV3IGl0ZW0gYWZ0 ZXIgbmF2aWdhdGlvbi4KICAgICAgICAgaWYgKGV2ZW50LmRhdGEuY29tbWl0dGluZ1Byb3Zpc2lv bmFsTG9hZCAmJiAhdGhpcy5fcmVzdG9yZVNlbGVjdGVkRXhlY3V0aW9uQ29udGV4dEZvckZyYW1l KSB7CiAgICAgICAgICAgICBsZXQgZXhlY3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnQgPSB0aGlz Ll9mcmFtZVRvUGF0aENvbXBvbmVudC5nZXQoZnJhbWUpOwotICAgICAgICAgICAgaWYgKGV4ZWN1 dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50ICYmIGV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50 LnJlcHJlc2VudGVkT2JqZWN0ID09PSB0aGlzLnNlbGVjdGVkRXhlY3V0aW9uQ29udGV4dCkgewor ICAgICAgICAgICAgaWYgKGV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50ICYmIGV4ZWN1dGlv bkNvbnRleHRQYXRoQ29tcG9uZW50LnJlcHJlc2VudGVkT2JqZWN0ID09PSBXSS5ydW50aW1lTWFu YWdlci5hY3RpdmVFeGVjdXRpb25Db250ZXh0KSB7CiAgICAgICAgICAgICAgICAgdGhpcy5fcmVz dG9yZVNlbGVjdGVkRXhlY3V0aW9uQ29udGV4dEZvckZyYW1lID0gZnJhbWU7CiAgICAgICAgICAg ICAgICAgLy8gQXMgYSBmYWlsIHNhZmUsIGlmIHRoZSBmcmFtZSBuZXZlciBnZXRzIGFuIGV4ZWN1 dGlvbiBjb250ZXh0LCBjbGVhciB0aGUgcmVzdG9yZSB2YWx1ZS4KLSAgICAgICAgICAgICAgICBz ZXRUaW1lb3V0KCgpID0+IHsgdGhpcy5fcmVzdG9yZVNlbGVjdGVkRXhlY3V0aW9uQ29udGV4dEZv ckZyYW1lID0gZmFsc2U7IH0sIDEwKTsKKyAgICAgICAgICAgICAgICBzZXRUaW1lb3V0KCgpID0+ IHsKKyAgICAgICAgICAgICAgICAgICAgdGhpcy5fcmVzdG9yZVNlbGVjdGVkRXhlY3V0aW9uQ29u dGV4dEZvckZyYW1lID0gZmFsc2U7CisgICAgICAgICAgICAgICAgfSwgMTApOwogICAgICAgICAg ICAgfQogICAgICAgICB9CiAKQEAgLTIwMCwxMyArMjM5LDExIEBAIFdJLlF1aWNrQ29uc29sZSA9 IGNsYXNzIFF1aWNrQ29uc29sZSBleHRlbmRzIFdJLlZpZXcKICAgICBfYWN0aXZlRXhlY3V0aW9u Q29udGV4dENoYW5nZWQoZXZlbnQpCiAgICAgewogICAgICAgICB0aGlzLl9yZWJ1aWxkRXhlY3V0 aW9uQ29udGV4dFBhdGhDb21wb25lbnRzKCk7Ci0KLSAgICAgICAgdGhpcy5fZXhlY3V0aW9uQ29u dGV4dFNlbGVjdG9ySXRlbS5lbGVtZW50LmNsYXNzTGlzdC50b2dnbGUoIm5vbi1kZWZhdWx0LWV4 ZWN1dGlvbi1jb250ZXh0IiwgdGhpcy5zZWxlY3RlZEV4ZWN1dGlvbkNvbnRleHQgIT09IFdJLm1h aW5UYXJnZXQuZXhlY3V0aW9uQ29udGV4dCk7CiAgICAgfQogCiAgICAgX2NyZWF0ZUV4ZWN1dGlv bkNvbnRleHRQYXRoQ29tcG9uZW50KGV4ZWN1dGlvbkNvbnRleHQsIHByZWZlcnJlZE5hbWUpCiAg ICAgewotICAgICAgICBjb25zb2xlLmFzc2VydChleGVjdXRpb25Db250ZXh0IGluc3RhbmNlb2Yg V0kuRXhlY3V0aW9uQ29udGV4dCk7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KCFleGVjdXRpb25D b250ZXh0IHx8IGV4ZWN1dGlvbkNvbnRleHQgaW5zdGFuY2VvZiBXSS5FeGVjdXRpb25Db250ZXh0 KTsKIAogICAgICAgICBsZXQgcGF0aENvbXBvbmVudCA9IG5ldyBXSS5IaWVyYXJjaGljYWxQYXRo Q29tcG9uZW50KHByZWZlcnJlZE5hbWUgfHwgZXhlY3V0aW9uQ29udGV4dC5uYW1lLCAiZXhlY3V0 aW9uLWNvbnRleHQiLCBleGVjdXRpb25Db250ZXh0LCB0cnVlLCB0cnVlKTsKICAgICAgICAgcGF0 aENvbXBvbmVudC5hZGRFdmVudExpc3RlbmVyKFdJLkhpZXJhcmNoaWNhbFBhdGhDb21wb25lbnQu RXZlbnQuU2libGluZ1dhc1NlbGVjdGVkLCB0aGlzLl9wYXRoQ29tcG9uZW50U2VsZWN0ZWQsIHRo aXMpOwpAQCAtMjE1LDEyICsyNTIsNiBAQCBXSS5RdWlja0NvbnNvbGUgPSBjbGFzcyBRdWlja0Nv bnNvbGUgZXh0ZW5kcyBXSS5WaWV3CiAgICAgICAgIHJldHVybiBwYXRoQ29tcG9uZW50OwogICAg IH0KIAotICAgIF9jcmVhdGVFeGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudEZyb21GcmFtZShm cmFtZSkKLSAgICB7Ci0gICAgICAgIGxldCBwcmVmZXJyZWROYW1lID0gZnJhbWUubmFtZSA/IFdJ LlVJU3RyaW5nKCIlcyAoJXMpIikuZm9ybWF0KGZyYW1lLm5hbWUsIGZyYW1lLm1haW5SZXNvdXJj ZS5kaXNwbGF5TmFtZSkgOiBmcmFtZS5tYWluUmVzb3VyY2UuZGlzcGxheU5hbWU7Ci0gICAgICAg IHJldHVybiB0aGlzLl9jcmVhdGVFeGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudChmcmFtZS5w YWdlRXhlY3V0aW9uQ29udGV4dCwgcHJlZmVycmVkTmFtZSk7Ci0gICAgfQotCiAgICAgX2NvbXBh cmVFeGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudHMoYSwgYikKICAgICB7CiAgICAgICAgIGxl dCBhRXhlY3V0aW9uQ29udGV4dCA9IGEucmVwcmVzZW50ZWRPYmplY3Q7CkBAIC0yNTUsNyArMjg2 LDcgQEAgV0kuUXVpY2tDb25zb2xlID0gY2xhc3MgUXVpY2tDb25zb2xlIGV4dGVuZHMgV0kuVmll dwogICAgICAgICByZXR1cm4gYS5kaXNwbGF5TmFtZS5leHRlbmRlZExvY2FsZUNvbXBhcmUoYi5k aXNwbGF5TmFtZSk7CiAgICAgfQogCi0gICAgX2luc2VydE90aGVyRXhlY3V0aW9uQ29udGV4dFBh dGhDb21wb25lbnQoZXhlY3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnQsIHNraXBSZWJ1aWxkKQor ICAgIF9pbnNlcnRPdGhlckV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50KGV4ZWN1dGlvbkNv bnRleHRQYXRoQ29tcG9uZW50KQogICAgIHsKICAgICAgICAgbGV0IGluZGV4ID0gaW5zZXJ0aW9u SW5kZXhGb3JPYmplY3RJbkxpc3RTb3J0ZWRCeUZ1bmN0aW9uKGV4ZWN1dGlvbkNvbnRleHRQYXRo Q29tcG9uZW50LCB0aGlzLl9vdGhlckV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50cywgdGhp cy5fY29tcGFyZUV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50cyk7CiAKQEAgLTI3MiwxMSAr MzAzLDEwIEBAIFdJLlF1aWNrQ29uc29sZSA9IGNsYXNzIFF1aWNrQ29uc29sZSBleHRlbmRzIFdJ LlZpZXcKIAogICAgICAgICB0aGlzLl9vdGhlckV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50 cy5zcGxpY2UoaW5kZXgsIDAsIGV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50KTsKIAotICAg ICAgICBpZiAoIXNraXBSZWJ1aWxkKQotICAgICAgICAgICAgdGhpcy5fcmVidWlsZEV4ZWN1dGlv bkNvbnRleHRQYXRoQ29tcG9uZW50cygpOworICAgICAgICB0aGlzLl9yZWJ1aWxkRXhlY3V0aW9u Q29udGV4dFBhdGhDb21wb25lbnRzKCk7CiAgICAgfQogCi0gICAgX3JlbW92ZU90aGVyRXhlY3V0 aW9uQ29udGV4dFBhdGhDb21wb25lbnQoZXhlY3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnQsIHNr aXBSZWJ1aWxkKQorICAgIF9yZW1vdmVPdGhlckV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50 KGV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50KQogICAgIHsKICAgICAgICAgZXhlY3V0aW9u Q29udGV4dFBhdGhDb21wb25lbnQucmVtb3ZlRXZlbnRMaXN0ZW5lcihXSS5IaWVyYXJjaGljYWxQ YXRoQ29tcG9uZW50LkV2ZW50LlNpYmxpbmdXYXNTZWxlY3RlZCwgdGhpcy5fcGF0aENvbXBvbmVu dFNlbGVjdGVkLCB0aGlzKTsKICAgICAgICAgZXhlY3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnQu cmVtb3ZlRXZlbnRMaXN0ZW5lcihXSS5IaWVyYXJjaGljYWxQYXRoQ29tcG9uZW50LkV2ZW50LkNs aWNrZWQsIHRoaXMuX3BhdGhDb21wb25lbnRDbGlja2VkLCB0aGlzKTsKQEAgLTI5MCwyOSArMzIw LDI5IEBAIFdJLlF1aWNrQ29uc29sZSA9IGNsYXNzIFF1aWNrQ29uc29sZSBleHRlbmRzIFdJLlZp ZXcKIAogICAgICAgICB0aGlzLl9vdGhlckV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50cy5y ZW1vdmUoZXhlY3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnQsIHRydWUpOwogCi0gICAgICAgIGlm ICghc2tpcFJlYnVpbGQpCi0gICAgICAgICAgICB0aGlzLl9yZWJ1aWxkRXhlY3V0aW9uQ29udGV4 dFBhdGhDb21wb25lbnRzKCk7CisgICAgICAgIHRoaXMuX3JlYnVpbGRFeGVjdXRpb25Db250ZXh0 UGF0aENvbXBvbmVudHMoKTsKICAgICB9CiAKLSAgICBfaW5zZXJ0RXhlY3V0aW9uQ29udGV4dFBh dGhDb21wb25lbnRGb3JGcmFtZShmcmFtZSwgc2tpcFJlYnVpbGQpCisgICAgX2luc2VydEV4ZWN1 dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50Rm9yRnJhbWUoZnJhbWUpCiAgICAgewogICAgICAgICBp ZiAoZnJhbWUuaXNNYWluRnJhbWUoKSkKICAgICAgICAgICAgIHJldHVybiB0aGlzLl9tYWluRXhl Y3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnQ7CiAKLSAgICAgICAgbGV0IGV4ZWN1dGlvbkNvbnRl eHRQYXRoQ29tcG9uZW50ID0gdGhpcy5fY3JlYXRlRXhlY3V0aW9uQ29udGV4dFBhdGhDb21wb25l bnRGcm9tRnJhbWUoZnJhbWUpOwotICAgICAgICB0aGlzLl9pbnNlcnRPdGhlckV4ZWN1dGlvbkNv bnRleHRQYXRoQ29tcG9uZW50KGV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50LCBza2lwUmVi dWlsZCk7CisgICAgICAgIGxldCBleGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudCA9IHRoaXMu X2NyZWF0ZUV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50KGZyYW1lLnBhZ2VFeGVjdXRpb25D b250ZXh0LCB0aGlzLl9wcmVmZXJyZWROYW1lRm9yRnJhbWUoZnJhbWUpKTsKKyAgICAgICAgdGhp cy5faW5zZXJ0T3RoZXJFeGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudChleGVjdXRpb25Db250 ZXh0UGF0aENvbXBvbmVudCk7CiAgICAgICAgIHRoaXMuX2ZyYW1lVG9QYXRoQ29tcG9uZW50LnNl dChmcmFtZSwgZXhlY3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnQpOwotCiAgICAgICAgIHJldHVy biBleGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudDsKICAgICB9CiAKLSAgICBfcmVtb3ZlRXhl Y3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnRGb3JGcmFtZShmcmFtZSwgc2tpcFJlYnVpbGQpCisg ICAgX3JlbW92ZUV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50Rm9yRnJhbWUoZnJhbWUpCiAg ICAgewotICAgICAgICBpZiAoZnJhbWUuaXNNYWluRnJhbWUoKSkKKyAgICAgICAgaWYgKGZyYW1l LmlzTWFpbkZyYW1lKCkpIHsKKyAgICAgICAgICAgIHRoaXMuX3Nob3VsZEF1dG9tYXRpY2FsbHlT ZWxlY3RFeGVjdXRpb25Db250ZXh0ID0gdHJ1ZTsKICAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgfQogCiAgICAgICAgIGxldCBleGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudCA9IHRoaXMu X2ZyYW1lVG9QYXRoQ29tcG9uZW50LnRha2UoZnJhbWUpOwotICAgICAgICB0aGlzLl9yZW1vdmVP dGhlckV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50KGV4ZWN1dGlvbkNvbnRleHRQYXRoQ29t cG9uZW50LCBza2lwUmVidWlsZCk7CisgICAgICAgIHRoaXMuX3JlbW92ZU90aGVyRXhlY3V0aW9u Q29udGV4dFBhdGhDb21wb25lbnQoZXhlY3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnQpOwogICAg IH0KIAogICAgIF90YXJnZXRBZGRlZChldmVudCkKQEAgLTMzNiwxNiArMzY2LDE5IEBAIFdJLlF1 aWNrQ29uc29sZSA9IGNsYXNzIFF1aWNrQ29uc29sZSBleHRlbmRzIFdJLlZpZXcKICAgICAgICAg ICAgIHJldHVybjsKIAogICAgICAgICBsZXQgZXhlY3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnQg PSB0aGlzLl90YXJnZXRUb1BhdGhDb21wb25lbnQudGFrZSh0YXJnZXQpOwotICAgICAgICB0aGlz Ll9yZW1vdmVPdGhlckV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50KGV4ZWN1dGlvbkNvbnRl eHRQYXRoQ29tcG9uZW50KTsKIAotICAgICAgICBpZiAodGhpcy5zZWxlY3RlZEV4ZWN1dGlvbkNv bnRleHQgPT09IGV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50LnJlcHJlc2VudGVkT2JqZWN0 KQotICAgICAgICAgICAgdGhpcy5zZWxlY3RlZEV4ZWN1dGlvbkNvbnRleHQgPSBXSS5tYWluVGFy Z2V0LmV4ZWN1dGlvbkNvbnRleHQ7CisgICAgICAgIGlmIChXSS5ydW50aW1lTWFuYWdlci5hY3Rp dmVFeGVjdXRpb25Db250ZXh0ID09PSBleGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudC5yZXBy ZXNlbnRlZE9iamVjdCkgeworICAgICAgICAgICAgdGhpcy5fc2hvdWxkQXV0b21hdGljYWxseVNl bGVjdEV4ZWN1dGlvbkNvbnRleHQgPSB0cnVlOworICAgICAgICAgICAgdGhpcy5fc2VsZWN0RXhl Y3V0aW9uQ29udGV4dCgpOworICAgICAgICB9CisKKyAgICAgICAgdGhpcy5fcmVtb3ZlT3RoZXJF eGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudChleGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVu dCk7CiAgICAgfQogCiAgICAgX3BhdGhDb21wb25lbnRTZWxlY3RlZChldmVudCkKICAgICB7Ci0g ICAgICAgIGxldCBleGVjdXRpb25Db250ZXh0ID0gZXZlbnQuZGF0YS5wYXRoQ29tcG9uZW50LnJl cHJlc2VudGVkT2JqZWN0OwotICAgICAgICB0aGlzLnNlbGVjdGVkRXhlY3V0aW9uQ29udGV4dCA9 IGV4ZWN1dGlvbkNvbnRleHQ7CisgICAgICAgIHRoaXMuX3Nob3VsZEF1dG9tYXRpY2FsbHlTZWxl Y3RFeGVjdXRpb25Db250ZXh0ID0gZXZlbnQuZGF0YS5wYXRoQ29tcG9uZW50ID09PSB0aGlzLl9h dXRvbWF0aWNFeGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudDsKKyAgICAgICAgdGhpcy5fc2Vs ZWN0RXhlY3V0aW9uQ29udGV4dChldmVudC5kYXRhLnBhdGhDb21wb25lbnQucmVwcmVzZW50ZWRP YmplY3QpOwogICAgIH0KIAogICAgIF9wYXRoQ29tcG9uZW50Q2xpY2tlZChldmVudCkKQEAgLTM3 Myw0ICs0MDYsOSBAQCBXSS5RdWlja0NvbnNvbGUgPSBjbGFzcyBRdWlja0NvbnNvbGUgZXh0ZW5k cyBXSS5WaWV3CiAgICAgewogICAgICAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LnRvZ2dsZSgi c2hvd2luZy1sb2ciLCBXSS5pc1Nob3dpbmdDb25zb2xlVGFiKCkgfHwgV0kuaXNTaG93aW5nU3Bs aXRDb25zb2xlKCkpOwogICAgIH0KKworICAgIF9oYW5kbGVJbnNwZWN0ZWROb2RlQ2hhbmdlZChl dmVudCkKKyAgICB7CisgICAgICAgIHRoaXMuX3NlbGVjdEV4ZWN1dGlvbkNvbnRleHQoV0kucnVu dGltZU1hbmFnZXIuYWN0aXZlRXhlY3V0aW9uQ29udGV4dCk7CisgICAgfQogfTsK