171971 2017-05-11 02:54:33 -0700 Web Inspector: Cannot delete a disabled XHR breakpoint 2017-05-23 15:58:28 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 mattbaker mattbaker commit-queue hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1307228 0 mattbaker 2017-05-11 02:54:33 -0700 Summary: Wrong event dispatched when XHR breakpoint removed. The XHRBReakpointRemoved event is dispatched correctly, but only after dispatching a DOMBreakpointRemoved event. The spurious event isn't causing any errors, and should just be removed. 1307229 1 mattbaker 2017-05-11 03:01:02 -0700 While investigating I discovered a real bug in DOMDebuggerManager.removeXHRBreakpoint: Summary: Cannot delete a disabled XHR breakpoint. Steps to Reproduce: 1. Inspect any page > Debugger tab 2. Add an XHR breakpoint 3. Disable it 4. Remove the breakpoint (by pressing delete or right-clicking and using the context menu) => Breakpoint is not deleted 5. Enable the breakpoint then remove it again => Breakpoint is deleted Will retitle this bug and fix here. 1307230 2 webkit-bug-importer 2017-05-11 03:02:23 -0700 <rdar://problem/32129527> 1309810 3 310443 mattbaker 2017-05-17 14:07:50 -0700 Created attachment 310443 Patch 1312078 4 310443 hi 2017-05-23 15:22:28 -0700 Comment on attachment 310443 Patch r=me 1312103 5 310443 commit-queue 2017-05-23 15:58:26 -0700 Comment on attachment 310443 Patch Clearing flags on attachment: 310443 Committed r217306: <http://trac.webkit.org/changeset/217306> 1312104 6 commit-queue 2017-05-23 15:58:28 -0700 All reviewed patches have been landed. Closing bug. 310443 2017-05-17 14:07:50 -0700 2017-05-23 15:58:26 -0700 Patch bug-171971-20170517140750.patch text/plain 10448 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjE2OTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAx MjZjMTYxMGFlYjVmMTY2MDc5YmM5MTY3NjYzMmVhYTBhODc5YjdmLi4yNDliY2VmNGJiYmQ3NDZl YTg3ZTcyNWM4MWU2NjU0NGU1ODM5Y2RkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAxNy0wNS0xNyAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQ2Fubm90IGRlbGV0ZSBhIGRpc2FibGVkIFhIUiBi cmVha3BvaW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNzE5NzEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMyMTI5NTI3PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Db250 cm9sbGVycy9ET01EZWJ1Z2dlck1hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9N RGVidWdnZXJNYW5hZ2VyLnByb3RvdHlwZS5yZW1vdmVYSFJCcmVha3BvaW50KToKKyAgICAgICAg RGlzcGF0Y2ggWEhSQnJlYWtwb2ludFJlbW92ZWQgZXZlbnQgYmVmb3JlIHJlbW92aW5nIHRoZSBi cmVha3BvaW50IGZyb20KKyAgICAgICAgdGhlIGJhY2tlbmQuIEEgZGlzYWJsZWQgYnJlYWtwb2lu dCB3aWxsIGhhdmUgYWxyZWFkeSBiZWVuIHJlbW92ZWQsIGFuZAorICAgICAgICBhbiBlbmFibGVk IGJyZWFrcG9pbnQgdGhhdCBmYWlscyB0byBnZXQgcmVtb3ZlZCBmcm9tIHRoZSBiYWNrZW5kIHNo b3VsZAorICAgICAgICBiZSByZW1vdmVkIGZyb20gdGhlIGZyb250ZW5kLCB0byBwcmV2ZW50IGl0 IGJlaW5nIHJlc29sdmVkIGluIHRoZSBmdXR1cmUuCisgICAgICAgIERyaXZlLWJ5IGZpeDogcmVt b3ZlIHNwdXJpb3VzIGRpc3BhdGNoIG9mIERPTUJyZWFrcG9pbnRSZW1vdmVkIGV2ZW50LgorCisg ICAgICAgIChXZWJJbnNwZWN0b3IuRE9NRGVidWdnZXJNYW5hZ2VyLnByb3RvdHlwZS5fZGV0YWNo WEhSQnJlYWtwb2ludCk6IERlbGV0ZWQuCisgICAgICAgIE1lcmdlZCB3aXRoIHJlbW92ZVhIUkJy ZWFrcG9pbnQgdG8gc2ltcGxpZnkgaW1wbGVtZW50YXRpb24uCisKIDIwMTctMDUtMTUgIEZ1amlp IEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CiAKICAgICAgICAgW0dUS10gV2Vi IEluc3BlY3RvcjogQWRkIG5ldyBHVEsrIGljb25zIGZvciBTZWFyY2ggaWNvbiBvZiBRdWljayBP cGVuIGRpYWxvZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvQ29udHJvbGxlcnMvRE9NRGVidWdnZXJNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRE9NRGVidWdnZXJNYW5hZ2VyLmpzCmluZGV4 IDRmZDkwOWE4NzAwODIyZjJmZDczMjQyNjZmMWRkMzRlZjk5ZGI2MWEuLjg0YjE0NGFjZDFhM2Zi MWIxY2U1ZDA4ZWY4NTQ2MDgzNjNmYzMzNjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTURlYnVnZ2VyTWFuYWdlci5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9ET01EZWJ1 Z2dlck1hbmFnZXIuanMKQEAgLTIyMSwxMCArMjIxLDE2IEBAIFdlYkluc3BlY3Rvci5ET01EZWJ1 Z2dlck1hbmFnZXIgPSBjbGFzcyBET01EZWJ1Z2dlck1hbmFnZXIgZXh0ZW5kcyBXZWJJbnNwZWN0 b3IuCiAKICAgICAgICAgdGhpcy5feGhyQnJlYWtwb2ludHMucmVtb3ZlKGJyZWFrcG9pbnQsIHRy dWUpOwogCi0gICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rv ci5ET01EZWJ1Z2dlck1hbmFnZXIuRXZlbnQuRE9NQnJlYWtwb2ludFJlbW92ZWQsIHticmVha3Bv aW50fSk7Ci0KLSAgICAgICAgdGhpcy5fZGV0YWNoWEhSQnJlYWtwb2ludChicmVha3BvaW50KTsK ICAgICAgICAgdGhpcy5fc2F2ZVhIUkJyZWFrcG9pbnRzKCk7CisgICAgICAgIHRoaXMuZGlzcGF0 Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5ET01EZWJ1Z2dlck1hbmFnZXIuRXZlbnQu WEhSQnJlYWtwb2ludFJlbW92ZWQsIHticmVha3BvaW50fSk7CisKKyAgICAgICAgaWYgKGJyZWFr cG9pbnQuZGlzYWJsZWQpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgRE9NRGVidWdn ZXJBZ2VudC5yZW1vdmVYSFJCcmVha3BvaW50KGJyZWFrcG9pbnQudXJsLCAoZXJyb3IpID0+IHsK KyAgICAgICAgICAgIGlmIChlcnJvcikKKyAgICAgICAgICAgICAgICBjb25zb2xlLmVycm9yKGVy cm9yKTsKKyAgICAgICAgfSk7CiAgICAgfQogCiAgICAgLy8gUHJpdmF0ZQpAQCAtMzQxLDE5ICsz NDcsNiBAQCBXZWJJbnNwZWN0b3IuRE9NRGVidWdnZXJNYW5hZ2VyID0gY2xhc3MgRE9NRGVidWdn ZXJNYW5hZ2VyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLgogICAgICAgICAgICAgRE9NRGVidWdnZXJB Z2VudC5zZXRET01CcmVha3BvaW50KG5vZGVJZGVudGlmaWVyLCBicmVha3BvaW50LnR5cGUsIGJy ZWFrcG9pbnRVcGRhdGVkKTsKICAgICB9CiAKLSAgICBfZGV0YWNoWEhSQnJlYWtwb2ludChicmVh a3BvaW50KQotICAgIHsKLSAgICAgICAgaWYgKGJyZWFrcG9pbnQuZGlzYWJsZWQpCi0gICAgICAg ICAgICByZXR1cm47Ci0KLSAgICAgICAgRE9NRGVidWdnZXJBZ2VudC5yZW1vdmVYSFJCcmVha3Bv aW50KGJyZWFrcG9pbnQudXJsLCAoZXJyb3IpID0+IHsKLSAgICAgICAgICAgIGlmIChlcnJvcikK LSAgICAgICAgICAgICAgICBjb25zb2xlLmVycm9yKGVycm9yKTsKLQotICAgICAgICAgICAgdGhp cy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRPTURlYnVnZ2VyTWFuYWdl ci5FdmVudC5YSFJCcmVha3BvaW50UmVtb3ZlZCwge2JyZWFrcG9pbnR9KTsKLSAgICAgICAgfSk7 Ci0gICAgfQotCiAgICAgX3VwZGF0ZVhIUkJyZWFrcG9pbnQoYnJlYWtwb2ludCwgY2FsbGJhY2sp CiAgICAgewogICAgICAgICBmdW5jdGlvbiBicmVha3BvaW50VXBkYXRlZChlcnJvcikKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRl eCAyODljYWI2MzdiNzIzYmQxMjdiY2MyMjdhNjI5OTYyNDEzNGUxMWZhLi41NjhiOTQxN2FkODVl MTZiMmM0YmVmMTkyODc3YmM2OTFjMDRhYWI3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTct MDUtMTcgIE1hdHQgQmFrZXIgIDxtYXR0YmFrZXJAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJ bnNwZWN0b3I6IENhbm5vdCBkZWxldGUgYSBkaXNhYmxlZCBYSFIgYnJlYWtwb2ludAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcxOTcxCisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS8zMjEyOTUyNz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9kb20tZGVidWdnZXIveGhyLWJyZWFrcG9p bnRzLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZG9tLWRlYnVnZ2VyL3hoci1i cmVha3BvaW50cy5odG1sOgorCiAyMDE3LTA1LTE3ICBSeWFuIEhhZGRhZCAgPHJ5YW5oYWRkYWRA YXBwbGUuY29tPgogCiAgICAgICAgIE1hcmsgdHdvIGh0dHAvdGVzdHMvbWVkaWEvaGxzL3ZpZGVv IHRlc3RzIGFzIGZhaWxpbmcgZHVyaW5nIGludmVzdGlnYXRpb24uCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvZG9tLWRlYnVnZ2VyL3hoci1icmVha3BvaW50cy1leHBlY3RlZC50 eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZG9tLWRlYnVnZ2VyL3hoci1icmVha3BvaW50cy1l eHBlY3RlZC50eHQKaW5kZXggMWYyMmY4MDRmMzczMTZhNjRiNGE0OGFlMmVmOWE0YjIxMjE5YWNk OC4uMzA0ZjIzYTgwMWM2MDJjZjc2OTlmYzFiMWFjMjEwNjJkOGZjNDU5NyAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RvbS1kZWJ1Z2dlci94aHItYnJlYWtwb2ludHMtZXhwZWN0 ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kb20tZGVidWdnZXIveGhyLWJyZWFr cG9pbnRzLWV4cGVjdGVkLnR4dApAQCAtMTQsOCArMTQsOCBAQCBDQUxMIFNUQUNLOgogLS0gUnVu bmluZyB0ZXN0IHRlYXJkb3duLgogCiAtLSBSdW5uaW5nIHRlc3QgY2FzZTogQnJlYWtPblhNTEh0 dHBSZXF1ZXN0Q29udGFpbmluZ1RleHQKLVBBU1M6IEJyZWFrcG9pbnQgc2hvdWxkIG5vdCBiZSBk aXNhYmxlZCBpbml0aWFsbHkuCiBQQVNTOiBBZGRlZCBicmVha3BvaW50IGZvciBVUkw6IGRhdGEK K1BBU1M6IEJyZWFrcG9pbnQgc2hvdWxkIG5vdCBiZSBkaXNhYmxlZCBpbml0aWFsbHkuCiBTZW5k aW5nIFhNTEh0dHBSZXF1ZXN0LgogUEFVU0VEOgogUEFTUzogUGF1c2UgcmVhc29uIHNob3VsZCBi ZSBYSFIuCkBAIC0yNiw4ICsyNiw4IEBAIENBTEwgU1RBQ0s6CiAtLSBSdW5uaW5nIHRlc3QgdGVh cmRvd24uCiAKIC0tIFJ1bm5pbmcgdGVzdCBjYXNlOiBCcmVha09uWE1MSHR0cFJlcXVlc3RNYXRj aGluZ1JlZ3VsYXJFeHByZXNzaW9uCi1QQVNTOiBCcmVha3BvaW50IHNob3VsZCBub3QgYmUgZGlz YWJsZWQgaW5pdGlhbGx5LgogUEFTUzogQWRkZWQgYnJlYWtwb2ludCBmb3IgVVJMOiBkYXRhW0Et Wl0qLihqc29ufHR4dHxwbmcpCitQQVNTOiBCcmVha3BvaW50IHNob3VsZCBub3QgYmUgZGlzYWJs ZWQgaW5pdGlhbGx5LgogU2VuZGluZyBYTUxIdHRwUmVxdWVzdC4KIFBBVVNFRDoKIFBBU1M6IFBh dXNlIHJlYXNvbiBzaG91bGQgYmUgWEhSLgpAQCAtMzgsMjcgKzM4LDM1IEBAIENBTEwgU1RBQ0s6 CiAtLSBSdW5uaW5nIHRlc3QgdGVhcmRvd24uCiAKIC0tIFJ1bm5pbmcgdGVzdCBjYXNlOiBTaG91 bGROb3RQYXVzZU9uRGlzYWJsZWRCcmVha3BvaW50Ci1QQVNTOiBCcmVha3BvaW50IHNob3VsZCBu b3QgYmUgZGlzYWJsZWQgaW5pdGlhbGx5LgotRGlzYWJsaW5nIGJyZWFrcG9pbnQuCiBQQVNTOiBB ZGRlZCBicmVha3BvaW50IGZvciBVUkw6IGRhdGEKK1BBU1M6IEJyZWFrcG9pbnQgc2hvdWxkIG5v dCBiZSBkaXNhYmxlZCBpbml0aWFsbHkuCitCcmVha3BvaW50IGRpc2FibGVkLgogU2VuZGluZyBY TUxIdHRwUmVxdWVzdC4KIFdhaXQgZm9yIGV2YWx1YXRlIGluIHBhZ2UgdG8gcmV0dXJuLgogUEFT UzogU2hvdWxkIG5vdCBwYXVzZSBmb3IgZGlzYWJsZWQgYnJlYWtwb2ludC4KIC0tIFJ1bm5pbmcg dGVzdCB0ZWFyZG93bi4KIAogLS0gUnVubmluZyB0ZXN0IGNhc2U6IFNob3VsZE5vdFBhdXNlT25Y TUxIdHRwUmVxdWVzdE5vdENvbnRhaW5pbmdVUkwKLVBBU1M6IEJyZWFrcG9pbnQgc2hvdWxkIG5v dCBiZSBkaXNhYmxlZCBpbml0aWFsbHkuCiBQQVNTOiBBZGRlZCBicmVha3BvaW50IGZvciBVUkw6 IG5vbmV4aXN0YW50LXVybAorUEFTUzogQnJlYWtwb2ludCBzaG91bGQgbm90IGJlIGRpc2FibGVk IGluaXRpYWxseS4KIFNlbmRpbmcgWE1MSHR0cFJlcXVlc3QuCiBXYWl0IGZvciBldmFsdWF0ZSBp biBwYWdlIHRvIHJldHVybi4KIFBBU1M6IFNob3VsZCBub3QgcGF1c2UgZm9yIGJyZWFrcG9pbnQg d2l0aCBkaWZmZXJlbnQgVVJMLgogLS0gUnVubmluZyB0ZXN0IHRlYXJkb3duLgogCiAtLSBSdW5u aW5nIHRlc3QgY2FzZTogUmVtb3ZlQnJlYWtwb2ludAotUEFTUzogQnJlYWtwb2ludCBzaG91bGQg bm90IGJlIGRpc2FibGVkIGluaXRpYWxseS4KIFBBU1M6IEFkZGVkIGJyZWFrcG9pbnQgZm9yIFVS TDogZGF0YQotUmVtb3ZlIGJyZWFrcG9pbnQuCitQQVNTOiBCcmVha3BvaW50IHNob3VsZCBub3Qg YmUgZGlzYWJsZWQgaW5pdGlhbGx5LgorQnJlYWtwb2ludCByZW1vdmVkLgogV2FpdCBmb3IgZXZh bHVhdGUgaW4gcGFnZSB0byByZXR1cm4uCiBQQVNTOiBTaG91bGQgbm90IHBhdXNlIGZvciByZW1v dmVkIGJyZWFrcG9pbnQuCiAtLSBSdW5uaW5nIHRlc3QgdGVhcmRvd24uCiAKKy0tIFJ1bm5pbmcg dGVzdCBjYXNlOiBSZW1vdmVEaXNhYmxlZEJyZWFrcG9pbnQKK1BBU1M6IEFkZGVkIGJyZWFrcG9p bnQgZm9yIFVSTDogZGF0YQorUEFTUzogQnJlYWtwb2ludCBzaG91bGQgbm90IGJlIGRpc2FibGVk IGluaXRpYWxseS4KK0JyZWFrcG9pbnQgZGlzYWJsZWQuCitCcmVha3BvaW50IHJlbW92ZWQuCitX YWl0IGZvciBldmFsdWF0ZSBpbiBwYWdlIHRvIHJldHVybi4KK1BBU1M6IFNob3VsZCBub3QgcGF1 c2UgZm9yIHJlbW92ZWQgZGlzYWJsZWQgYnJlYWtwb2ludC4KKwpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2RvbS1kZWJ1Z2dlci94aHItYnJlYWtwb2ludHMuaHRtbCBiL0xheW91 dFRlc3RzL2luc3BlY3Rvci9kb20tZGVidWdnZXIveGhyLWJyZWFrcG9pbnRzLmh0bWwKaW5kZXgg ZmQzN2VjM2VhODNlMGNjOTkwMTFiNGExYzMzOTE2NmJjMjY1YzExMS4uMjhjNTI3NjQwYzEyNzJh OTNiMWQ3OTVjZTkzNzIyNjgyYzQxNWMwYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL2RvbS1kZWJ1Z2dlci94aHItYnJlYWtwb2ludHMuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvZG9tLWRlYnVnZ2VyL3hoci1icmVha3BvaW50cy5odG1sCkBAIC00MSw3ICs0MSw3 IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICB9KTsKICAgICB9CiAKLSAgICBmdW5jdGlvbiBh ZGRCcmVha3BvaW50KHR5cGUsIHVybCwgZGlzYWJsZWQpIHsKKyAgICBmdW5jdGlvbiBhZGRCcmVh a3BvaW50KHR5cGUsIHVybCkgewogICAgICAgICByZXR1cm4gbmV3IFByb21pc2UoKHJlc29sdmUs IHJlamVjdCkgPT4gewogICAgICAgICAgICAgbGV0IG1haW5GcmFtZSA9IFdlYkluc3BlY3Rvci5m cmFtZVJlc291cmNlTWFuYWdlci5tYWluRnJhbWU7CiAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0 LmFzc2VydChtYWluRnJhbWUsICJNaXNzaW5nIG1haW4gZnJhbWUuIik7CkBAIC01MSwxNCArNTEs OCBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgICAgIGxldCBicmVha3BvaW50ID0gbmV3IFdl Ykluc3BlY3Rvci5YSFJCcmVha3BvaW50KHR5cGUsIHVybCk7CiAgICAgICAgICAgICBXZWJJbnNw ZWN0b3IuZG9tRGVidWdnZXJNYW5hZ2VyLmF3YWl0RXZlbnQoV2ViSW5zcGVjdG9yLkRPTURlYnVn Z2VyTWFuYWdlci5FdmVudC5YSFJCcmVha3BvaW50QWRkZWQpCiAgICAgICAgICAgICAudGhlbigo KSA9PiB7Ci0gICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RGYWxzZShicmVha3Bv aW50LmRpc2FibGVkLCAiQnJlYWtwb2ludCBzaG91bGQgbm90IGJlIGRpc2FibGVkIGluaXRpYWxs eS4iKTsKLQotICAgICAgICAgICAgICAgIGlmIChkaXNhYmxlZCkgewotICAgICAgICAgICAgICAg ICAgICBJbnNwZWN0b3JUZXN0LmxvZygiRGlzYWJsaW5nIGJyZWFrcG9pbnQuIik7Ci0gICAgICAg ICAgICAgICAgICAgIGJyZWFrcG9pbnQuZGlzYWJsZWQgPSB0cnVlOwotICAgICAgICAgICAgICAg IH0KLQogICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QucGFzcygiQWRkZWQgYnJlYWtwb2lu dCBmb3IgVVJMOiAiICsgdXJsKTsKKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVj dEZhbHNlKGJyZWFrcG9pbnQuZGlzYWJsZWQsICJCcmVha3BvaW50IHNob3VsZCBub3QgYmUgZGlz YWJsZWQgaW5pdGlhbGx5LiIpOwogICAgICAgICAgICAgICAgIHJlc29sdmUoYnJlYWtwb2ludCk7 CiAgICAgICAgICAgICB9KTsKIApAQCAtMTUzLDkgKzE0NywxMSBAQCBmdW5jdGlvbiB0ZXN0KCkK ICAgICAgICAgZGVzY3JpcHRpb246ICJDaGVjayB0aGF0IGRlYnVnZ2VyIGRvZXMgbm90IHBhdXNl IGZvciBkaXNhYmxlZCBicmVha3BvaW50LiIsCiAgICAgICAgIHRlYXJkb3duLAogICAgICAgICB0 ZXN0KHJlc29sdmUsIHJlamVjdCkgewotICAgICAgICAgICAgY29uc3QgZGlzYWJsZWQgPSB0cnVl OwotICAgICAgICAgICAgYWRkQnJlYWtwb2ludChXZWJJbnNwZWN0b3IuWEhSQnJlYWtwb2ludC5U eXBlLlRleHQsICJkYXRhIiwgZGlzYWJsZWQpCisgICAgICAgICAgICBhZGRCcmVha3BvaW50KFdl Ykluc3BlY3Rvci5YSFJCcmVha3BvaW50LlR5cGUuVGV4dCwgImRhdGEiKQogICAgICAgICAgICAg LnRoZW4oKGJyZWFrcG9pbnQpID0+IHsKKyAgICAgICAgICAgICAgICBicmVha3BvaW50LmRpc2Fi bGVkID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmxvZygiQnJlYWtwb2lu dCBkaXNhYmxlZC4iKTsKKwogICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QubG9nKCJTZW5k aW5nIFhNTEh0dHBSZXF1ZXN0LiIpOwogICAgICAgICAgICAgICAgIHJldHVybiBQcm9taXNlLnJh Y2UoW2F3YWl0RXZhbHVhdGVJblBhZ2UoImxvYWRSZXNvdXJjZVhIUigpIiksIHJlamVjdE9uUGF1 c2UoKV0pOwogICAgICAgICAgICAgfSkKQEAgLTE5MiwxMyArMTg4LDExIEBAIGZ1bmN0aW9uIHRl c3QoKQogICAgICAgICB0ZXN0KHJlc29sdmUsIHJlamVjdCkgewogICAgICAgICAgICAgYWRkQnJl YWtwb2ludChXZWJJbnNwZWN0b3IuWEhSQnJlYWtwb2ludC5UeXBlLlRleHQsICJkYXRhIikKICAg ICAgICAgICAgIC50aGVuKChicmVha3BvaW50KSA9PiB7Ci0gICAgICAgICAgICAgICAgbGV0IHBy b21pc2UgPSBXZWJJbnNwZWN0b3IuZG9tRGVidWdnZXJNYW5hZ2VyLmF3YWl0RXZlbnQoV2ViSW5z cGVjdG9yLkRPTURlYnVnZ2VyTWFuYWdlci5FdmVudC5YSFJCcmVha3BvaW50UmVtb3ZlZCk7Ci0K LSAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmxvZygiUmVtb3ZlIGJyZWFrcG9pbnQuIik7 CiAgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmRvbURlYnVnZ2VyTWFuYWdlci5yZW1vdmVY SFJCcmVha3BvaW50KGJyZWFrcG9pbnQpOwotICAgICAgICAgICAgICAgIHJldHVybiBwcm9taXNl OworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QubG9nKCJCcmVha3BvaW50IHJlbW92ZWQu Iik7CisKKyAgICAgICAgICAgICAgICByZXR1cm4gUHJvbWlzZS5yYWNlKFthd2FpdEV2YWx1YXRl SW5QYWdlKCJsb2FkUmVzb3VyY2VYSFIoKSIpLCByZWplY3RPblBhdXNlKCldKTsKICAgICAgICAg ICAgIH0pCi0gICAgICAgICAgICAudGhlbigoKSA9PiBQcm9taXNlLnJhY2UoW2F3YWl0RXZhbHVh dGVJblBhZ2UoImxvYWRSZXNvdXJjZVhIUigpIiksIHJlamVjdE9uUGF1c2UoKV0pKQogICAgICAg ICAgICAgLnRoZW4oKCkgPT4gewogICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QucGFzcygi U2hvdWxkIG5vdCBwYXVzZSBmb3IgcmVtb3ZlZCBicmVha3BvaW50LiIpOwogICAgICAgICAgICAg ICAgIHJlc29sdmUoKTsKQEAgLTIwNyw2ICsyMDEsMjggQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAg ICAgIH0KICAgICB9KTsKIAorICAgIHN1aXRlLmFkZFRlc3RDYXNlKHsKKyAgICAgICAgbmFtZTog IlJlbW92ZURpc2FibGVkQnJlYWtwb2ludCIsCisgICAgICAgIGRlc2NyaXB0aW9uOiAiQ2hlY2sg dGhhdCBhIGRpc2FibGVkIGJyZWFrcG9pbnQgY2FuIGJlIHJlbW92ZWQuIiwKKyAgICAgICAgdGVz dChyZXNvbHZlLCByZWplY3QpIHsKKyAgICAgICAgICAgIGFkZEJyZWFrcG9pbnQoV2ViSW5zcGVj dG9yLlhIUkJyZWFrcG9pbnQuVHlwZS5UZXh0LCAiZGF0YSIpCisgICAgICAgICAgICAudGhlbigo YnJlYWtwb2ludCkgPT4geworICAgICAgICAgICAgICAgIGJyZWFrcG9pbnQuZGlzYWJsZWQgPSB0 cnVlOworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QubG9nKCJCcmVha3BvaW50IGRpc2Fi bGVkLiIpOworCisgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmRvbURlYnVnZ2VyTWFuYWdl ci5yZW1vdmVYSFJCcmVha3BvaW50KGJyZWFrcG9pbnQpOworICAgICAgICAgICAgICAgIEluc3Bl Y3RvclRlc3QubG9nKCJCcmVha3BvaW50IHJlbW92ZWQuIik7CisKKyAgICAgICAgICAgICAgICBy ZXR1cm4gUHJvbWlzZS5yYWNlKFthd2FpdEV2YWx1YXRlSW5QYWdlKCJsb2FkUmVzb3VyY2VYSFIo KSIpLCByZWplY3RPblBhdXNlKCldKTsKKyAgICAgICAgICAgIH0pCisgICAgICAgICAgICAudGhl bigoKSA9PiB7CisgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5wYXNzKCJTaG91bGQgbm90 IHBhdXNlIGZvciByZW1vdmVkIGRpc2FibGVkIGJyZWFrcG9pbnQuIik7CisgICAgICAgICAgICAg ICAgcmVzb2x2ZSgpOworICAgICAgICAgICAgfSkKKyAgICAgICAgICAgIC5jYXRjaChyZWplY3Qp OworICAgICAgICB9CisgICAgfSk7CisKICAgICBzdWl0ZS5ydW5UZXN0Q2FzZXNBbmRGaW5pc2go KTsKIH0KIDwvc2NyaXB0Pgo=