165578 2016-12-07 18:38:47 -0800 Web Inspector: Unable to delete breakpoint from worker script 2016-12-08 12:25:10 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 1 mattbaker joepeck bburg joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1257526 0 mattbaker 2016-12-07 18:38:47 -0800 Summary: Unable to delete breakpoint from worker script. Steps to Reproduce: 1. Goto https://nerget.com/rayjs-mt/rayjs.html 2. Set a breakpoint at render-task.js:17 3. Hit Go! => Pauses at breakpoint 4. Delete breakpoint and resume => Pauses at line where breakpoint once lived 1257533 1 joepeck 2016-12-07 19:04:47 -0800 Other code uses this pattern: if (breakpoint.contentIdentifier) { // Affect all targets } else if (breakpoint.scriptIdentifier) { // Affect only breakpoint.target } I should be using this pattern in DebuggerManager.prototype._removeBreakpoint just like we do in DebuggerManager.prototype._setBreakpoint. Testing a fix now. 1257535 2 joepeck 2016-12-07 19:08:41 -0800 Yep, that addresses the issue. I'll should be able to write a test for this. 1257558 3 joepeck 2016-12-07 20:00:57 -0800 To clarify, the breakpoint is removed from only 1 Worker and not all Workers that shared a resource with the same URL. 1257559 4 296468 joepeck 2016-12-07 20:03:20 -0800 Created attachment 296468 [PATCH] Proposed Fix 1257568 5 296468 joepeck 2016-12-07 20:16:36 -0800 Comment on attachment 296468 [PATCH] Proposed Fix Forgot to update test results in patch. 1257569 6 296472 joepeck 2016-12-07 20:17:24 -0800 Created attachment 296472 [PATCH] Proposed Fix 1257650 7 296472 mattbaker 2016-12-07 23:40:41 -0800 Comment on attachment 296472 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=296472&action=review Nice test! r=me > LayoutTests/inspector/worker/debugger-shared-breakpoint.html:33 > + // pause on the next statement. Do an InspectorTest.log, which evalutes evaluates > LayoutTests/inspector/worker/debugger-shared-breakpoint.html:74 > + InspectorTest.evaluateInPage(`triggerCreateWorkers(); triggerWorkerResponse();`); Seems like a template literal isn't needed here. > LayoutTests/inspector/worker/debugger-shared-breakpoint.html:100 > + InspectorTest.evaluateInPage(`triggerWorkerBreakpointPauses()`); Ditto. > LayoutTests/inspector/worker/debugger-shared-breakpoint.html:126 > + InspectorTest.evaluateInPage(`triggerWorkerResponse()`); Ditto. 1257786 8 296472 joepeck 2016-12-08 11:34:26 -0800 Comment on attachment 296472 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=296472&action=review >> LayoutTests/inspector/worker/debugger-shared-breakpoint.html:74 >> + InspectorTest.evaluateInPage(`triggerCreateWorkers(); triggerWorkerResponse();`); > > Seems like a template literal isn't needed here. It is easy to use a template literal for code to not have to worry about strings that may appear in the code. 1257810 9 joepeck 2016-12-08 12:25:10 -0800 <https://trac.webkit.org/changeset/209557> 296468 2016-12-07 20:03:20 -0800 2016-12-07 20:17:24 -0800 [PATCH] Proposed Fix breakpoint-delete-1.patch text/plain 11249 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBhNDkwZGEzLi42OTZlZjEwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAgQEAKIDIwMTYtMTIt MDcgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAorICAgICAgICBXZWIg SW5zcGVjdG9yOiBVbmFibGUgdG8gZGVsZXRlIGJyZWFrcG9pbnQgZnJvbSB3b3JrZXIgc2NyaXB0 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjU1NzgK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3Bl Y3Rvci93b3JrZXIvZGVidWdnZXItc2hhcmVkLWJyZWFrcG9pbnQtZXhwZWN0ZWQudHh0OiBBZGRl ZC4KKyAgICAgICAgKiBpbnNwZWN0b3Ivd29ya2VyL2RlYnVnZ2VyLXNoYXJlZC1icmVha3BvaW50 Lmh0bWw6IEFkZGVkLgorICAgICAgICBFbnN1cmUgc2V0dGluZyAvIHJlbW92aW5nIGEgYnJlYWtw b2ludCBhZmZlY3RzIGFsbCBXb3JrZXJzIHRoYXQgc2hhcmUKKyAgICAgICAgYSByZXNvdXJjZSB3 aXRoIHRoZSBzYW1lIFVSTC4KKworICAgICAgICAqIGluc3BlY3Rvci93b3JrZXIvcmVzb3VyY2Vz L3dvcmtlci1kZWJ1Z2dlci1wYXVzZS5qczoKKyAgICAgICAgQWRkIGFuIGVjaG8gY29tbWFuZCB0 aGF0IHdpbGwgYmUgdXNlZnVsIHRvIGVuc3VyZSBXb3JrZXJzIGFyZSBub3QgcGF1c2VkLgorCisy MDE2LTEyLTA3ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAgICAg ICAgV2ViIEluc3BlY3RvcjogQWRkIGFiaWxpdHkgdG8gZGlzdGluZ3Vpc2ggaWYgYSBTY3JpcHQg d2FzIHBhcnNlZCBhcyBhIG1vZHVsZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTY0OTAwCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yOTMyMzgxNz4K ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci93b3JrZXIvZGVidWdnZXItc2hhcmVk LWJyZWFrcG9pbnQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3dvcmtlci9k ZWJ1Z2dlci1zaGFyZWQtYnJlYWtwb2ludC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMC4uMTJiMTgxZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L2luc3BlY3Rvci93b3JrZXIvZGVidWdnZXItc2hhcmVkLWJyZWFrcG9pbnQtZXhwZWN0ZWQudHh0 CkBAIC0wLDAgKzEsMjcgQEAKK0Vuc3VyZSB3ZSBjYW4gc2V0IGFuZCByZW1vdmUgYnJlYWtwb2lu dHMgdGhhdCBhZmZlY3QgYWxsIFdvcmtlcnMuCisKKworPT0gUnVubmluZyB0ZXN0IHN1aXRlOiBX b3JrZXIuRGVidWdnZXIuU2hhcmVkQnJlYWtwb2ludAorLS0gUnVubmluZyB0ZXN0IGNhc2U6IFdv cmtlci5EZWJ1Z2dlci5TaGFyZWRCcmVha3BvaW50LkNyZWF0ZVdvcmtlcnMKK1BBU1M6IEJvdGgg V29ya2VycyBDcmVhdGVkCitQQVNTOiBCb3RoIFdvcmtlcnMgUmVhZHkKKworLS0gUnVubmluZyB0 ZXN0IGNhc2U6IFdvcmtlci5EZWJ1Z2dlci5TaGFyZWRCcmVha3BvaW50LkJyZWFrcG9pbnRBZGRl ZAorUEFTUzogQWxsIFRhcmdldHMgUGF1c2VkCitQQVNTOiBBY3RpdmUgY2FsbCBmcmFtZSBzaG91 bGQgYmUgaW4gYSBXb3JrZXIuCitQQVNTOiBQYXVzZSByZWFzb24gc2hvdWxkIGJlIGEgYnJlYWtw b2ludC4KK1BBVVNFIEFUIHRyaWdnZXJCcmVha3BvaW50Ojk6NQorICAgICAgNSAgICAKKyAgICAg IDYgICAgZnVuY3Rpb24gdHJpZ2dlckJyZWFrcG9pbnQoKSB7CisgICAgICA3ICAgICAgICBsZXQg YWxwaGEgPSAxOworIC0+ICAgOCAgICAgICAgfGxldCBiZXRhID0gMjsgLy8gQlJFQUtQT0lOVAor ICAgICAgOSAgICAgICAgbGV0IGdhbW1hID0gMzsKKyAgICAgMTAgICAgfQorICAgICAxMSAgICAK KworCisKKy0tIFJ1bm5pbmcgdGVzdCBjYXNlOiBXb3JrZXIuRGVidWdnZXIuU2hhcmVkQnJlYWtw b2ludC5CcmVha3BvaW50UmVtb3ZlZAorUEFTUzogV29ya2VyIHNob3VsZCBub3QgaGF2ZSBwYXVz ZWQgLSAxCitQQVNTOiBXb3JrZXIgc2hvdWxkIG5vdCBoYXZlIHBhdXNlZCAtIDIKKwpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3dvcmtlci9kZWJ1Z2dlci1zaGFyZWQtYnJlYWtw b2ludC5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3dvcmtlci9kZWJ1Z2dlci1zaGFyZWQt YnJlYWtwb2ludC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmViYzY2 ZWMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivd29ya2VyL2RlYnVn Z2VyLXNoYXJlZC1icmVha3BvaW50Lmh0bWwKQEAgLTAsMCArMSwxNDcgQEAKKzwhRE9DVFlQRSBo dG1sPgorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9odHRwL3Rlc3RzL2luc3Bl Y3Rvci9yZXNvdXJjZXMvaW5zcGVjdG9yLXRlc3QuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9 Ii4uL2RlYnVnZ2VyL3Jlc291cmNlcy9sb2ctcGF1c2UtbG9jYXRpb24uanMiPjwvc2NyaXB0Pgor PHNjcmlwdD4KK2xldCB3b3JrZXIxLCB3b3JrZXIyOworCitmdW5jdGlvbiB0cmlnZ2VyQ3JlYXRl V29ya2VycygpIHsKKyAgICB3b3JrZXIxID0gbmV3IFdvcmtlcigicmVzb3VyY2VzL3dvcmtlci1k ZWJ1Z2dlci1wYXVzZS5qcyIpOworICAgIHdvcmtlcjIgPSBuZXcgV29ya2VyKCJyZXNvdXJjZXMv d29ya2VyLWRlYnVnZ2VyLXBhdXNlLmpzIik7CisgICAgd29ya2VyMS5vbm1lc3NhZ2UgPSB3b3Jr ZXIyLm9ubWVzc2FnZSA9IGZ1bmN0aW9uKGV2ZW50KSB7CisgICAgICAgIFRlc3RQYWdlLmRpc3Bh dGNoRXZlbnRUb0Zyb250ZW5kKCJXb3JrZXJSZXNwb25kZWQiKTsKKyAgICB9OworfQorCitmdW5j dGlvbiB0cmlnZ2VyV29ya2VyQnJlYWtwb2ludFBhdXNlcygpIHsKKyAgICB3b3JrZXIxLnBvc3RN ZXNzYWdlKCJ0cmlnZ2VyQnJlYWtwb2ludCIpOworICAgIHdvcmtlcjIucG9zdE1lc3NhZ2UoInRy aWdnZXJCcmVha3BvaW50Iik7Cit9CisKK2Z1bmN0aW9uIHRyaWdnZXJXb3JrZXJSZXNwb25zZSgp IHsKKyAgICB3b3JrZXIxLnBvc3RNZXNzYWdlKCJ0cmlnZ2VyUmVzcG9uc2UiKTsKKyAgICB3b3Jr ZXIyLnBvc3RNZXNzYWdlKCJ0cmlnZ2VyUmVzcG9uc2UiKTsKK30KKworZnVuY3Rpb24gdGVzdCgp Cit7CisgICAgSW5zcGVjdG9yVGVzdC5kZWJ1ZygpOworCisgICAgbGV0IGJyZWFrcG9pbnQgPSBu dWxsOworICAgIGxldCB3b3JrZXJUYXJnZXQxLCB3b3JrZXJUYXJnZXQyOworCisgICAgLy8gSW4g ZWFjaCB0ZXN0LCB0aGUgV29ya2VyIHBhdXNlcyBhbmQgdGhlIE1haW4gVGhyZWFkIGlzIHdhaXRp bmcgdG8KKyAgICAvLyBwYXVzZSBvbiB0aGUgbmV4dCBzdGF0ZW1lbnQuIERvIGFuIEluc3BlY3Rv clRlc3QubG9nLCB3aGljaCBldmFsdXRlcworICAgIC8vIEphdmFTY3JpcHQgaW4gdGhlIHBhZ2Ug YW5kIHNob3VsZCBwYXVzZS4gVGhlbiBsYXRlciBydW4gd29yay4KKyAgICAvLyBJbiBXZWJLaXQx LCBiZWNhdXNlIHRoZSBWTSBpcyBzaGFyZWQgYmV0d2VlbiB0aGUgaW5zcGVjdG9yIGFuZAorICAg IC8vIGluc3BlY3RlZCBwYWdlIHdlIG5lZWQgdG8gcHV0IGFuIGFydGlmaWNpYWwgYnJlYWsgYmV0 d2VlbiBvdXIKKyAgICAvLyBJbnNwZWN0b3IgSmF2YVNjcmlwdCwgdGhlIFBhZ2UgSmF2YVNjcmlw dCwgYW5kIGJhY2sgdG8gdGhlIEluc3BlY3Rvci4KKyAgICBmdW5jdGlvbiBwYXVzZVRoZU1haW5U aHJlYWQoKSB7CisgICAgICAgIHJldHVybiBuZXcgUHJvbWlzZSgocmVzb2x2ZSwgcmVqZWN0KSA9 PiB7CisgICAgICAgICAgICBzZXRUaW1lb3V0KCgpID0+IHsKKyAgICAgICAgICAgICAgICBJbnNw ZWN0b3JUZXN0LmxvZygiIik7CisgICAgICAgICAgICAgICAgc2V0VGltZW91dChyZXNvbHZlKTsK KyAgICAgICAgICAgIH0pOworICAgICAgICB9KTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiBhcmVB bGxUYXJnZXRzUGF1c2VkKCkgeworICAgICAgICBmb3IgKGxldCB0YXJnZXQgb2YgV2ViSW5zcGVj dG9yLnRhcmdldHMpIHsKKyAgICAgICAgICAgIGxldCB0YXJnZXREYXRhID0gV2ViSW5zcGVjdG9y LmRlYnVnZ2VyTWFuYWdlci5kYXRhRm9yVGFyZ2V0KHRhcmdldCk7CisgICAgICAgICAgICBpZiAo IXRhcmdldERhdGEucGF1c2VkKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAg ICAgfQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiB3aGVuQWxs VGFyZ2V0c1BhdXNlZCgpIHsKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnQoIWFyZUFsbFRh cmdldHNQYXVzZWQoKSk7CisgICAgICAgIHJldHVybiBuZXcgUHJvbWlzZSgocmVzb2x2ZSwgcmVq ZWN0KSA9PiB7CisgICAgICAgICAgICBsZXQgbGlzdGVuZXIgPSBXZWJJbnNwZWN0b3IuZGVidWdn ZXJNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTWFuYWdlci5F dmVudC5DYWxsRnJhbWVzRGlkQ2hhbmdlLCAoZXZlbnQpID0+IHsKKyAgICAgICAgICAgICAgICBp ZiAoYXJlQWxsVGFyZ2V0c1BhdXNlZCgpKSB7CisgICAgICAgICAgICAgICAgICAgIFdlYkluc3Bl Y3Rvci5kZWJ1Z2dlck1hbmFnZXIucmVtb3ZlRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGVi dWdnZXJNYW5hZ2VyLkV2ZW50LkNhbGxGcmFtZXNEaWRDaGFuZ2UsIGxpc3RlbmVyKTsKKyAgICAg ICAgICAgICAgICAgICAgcmVzb2x2ZSgpOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAg IH0pOworICAgICAgICB9KTsKKyAgICB9CisKKyAgICBsZXQgc3VpdGUgPSBJbnNwZWN0b3JUZXN0 LmNyZWF0ZUFzeW5jU3VpdGUoIldvcmtlci5EZWJ1Z2dlci5TaGFyZWRCcmVha3BvaW50Iik7CisK KyAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CisgICAgICAgIG5hbWU6ICJXb3JrZXIuRGVidWdnZXIu U2hhcmVkQnJlYWtwb2ludC5DcmVhdGVXb3JrZXJzIiwKKyAgICAgICAgZGVzY3JpcHRpb246ICJD cmVhdGUgbXVsdGlwbGUgd29ya2Vycy4iLAorICAgICAgICB0ZXN0KHJlc29sdmUsIHJlamVjdCkg eworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUluUGFnZShgdHJpZ2dlckNyZWF0 ZVdvcmtlcnMoKTsgdHJpZ2dlcldvcmtlclJlc3BvbnNlKCk7YCk7CisgICAgICAgICAgICBXZWJJ bnNwZWN0b3IudGFyZ2V0TWFuYWdlci5zaW5nbGVGaXJlRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0 b3IuVGFyZ2V0TWFuYWdlci5FdmVudC5UYXJnZXRBZGRlZCwgKGV2ZW50KSA9PiB7CisgICAgICAg ICAgICAgICAgd29ya2VyVGFyZ2V0MSA9IGV2ZW50LmRhdGEudGFyZ2V0OworICAgICAgICAgICAg ICAgIFdlYkluc3BlY3Rvci50YXJnZXRNYW5hZ2VyLnNpbmdsZUZpcmVFdmVudExpc3RlbmVyKFdl Ykluc3BlY3Rvci5UYXJnZXRNYW5hZ2VyLkV2ZW50LlRhcmdldEFkZGVkLCAoZXZlbnQpID0+IHsK KyAgICAgICAgICAgICAgICAgICAgd29ya2VyVGFyZ2V0MiA9IGV2ZW50LmRhdGEudGFyZ2V0Owor ICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LnBhc3MoIkJvdGggV29ya2VycyBDcmVh dGVkIik7CisgICAgICAgICAgICAgICAgfSk7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgICAg IEluc3BlY3RvclRlc3Quc2luZ2xlRmlyZUV2ZW50TGlzdGVuZXIoIldvcmtlclJlc3BvbmRlZCIs ICgpID0+IHsKKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LnNpbmdsZUZpcmVFdmVudExp c3RlbmVyKCJXb3JrZXJSZXNwb25kZWQiLCAoKSA9PiB7CisgICAgICAgICAgICAgICAgICAgIElu c3BlY3RvclRlc3QucGFzcygiQm90aCBXb3JrZXJzIFJlYWR5Iik7CisgICAgICAgICAgICAgICAg ICAgIHJlc29sdmUoKTsKKyAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIH0pOworICAg ICAgICB9CisgICAgfSk7CisKKyAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CisgICAgICAgIG5hbWU6 ICJXb3JrZXIuRGVidWdnZXIuU2hhcmVkQnJlYWtwb2ludC5CcmVha3BvaW50QWRkZWQiLAorICAg ICAgICBkZXNjcmlwdGlvbjogIkFsbCB3b3JrZXJzIHNob3VsZCBwYXVzZSBvbiB0aGUgYnJlYWtw b2ludC4iLAorICAgICAgICB0ZXN0KHJlc29sdmUsIHJlamVjdCkgeworICAgICAgICAgICAgSW5z cGVjdG9yVGVzdC5hc3NlcnQod29ya2VyVGFyZ2V0MS5tYWluUmVzb3VyY2UgaW5zdGFuY2VvZiBX ZWJJbnNwZWN0b3IuU2NyaXB0KTsKKyAgICAgICAgICAgIGxldCBsb2NhdGlvbiA9IHdvcmtlclRh cmdldDEubWFpblJlc291cmNlLmNyZWF0ZVNvdXJjZUNvZGVMb2NhdGlvbig4LCAwKTsKKyAgICAg ICAgICAgIGJyZWFrcG9pbnQgPSBuZXcgV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnQobG9jYXRpb24p OworICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTWFuYWdlci5hZGRCcmVha3BvaW50 KGJyZWFrcG9pbnQpOworCisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV2YWx1YXRlSW5QYWdl KGB0cmlnZ2VyV29ya2VyQnJlYWtwb2ludFBhdXNlcygpYCk7CisgICAgICAgICAgICBXZWJJbnNw ZWN0b3IuZGVidWdnZXJNYW5hZ2VyLnNpbmdsZUZpcmVFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rv ci5EZWJ1Z2dlck1hbmFnZXIuRXZlbnQuUGF1c2VkLCAoZXZlbnQpID0+IHsKKyAgICAgICAgICAg ICAgICBwYXVzZVRoZU1haW5UaHJlYWQoKTsKKyAgICAgICAgICAgICAgICB3aGVuQWxsVGFyZ2V0 c1BhdXNlZCgpLnRoZW4oKCkgPT4geworICAgICAgICAgICAgICAgICAgICBsZXQgdGFyZ2V0ID0g V2ViSW5zcGVjdG9yLmRlYnVnZ2VyTWFuYWdlci5hY3RpdmVDYWxsRnJhbWUudGFyZ2V0OworICAg ICAgICAgICAgICAgICAgICBsZXQgdGFyZ2V0RGF0YSA9IFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1h bmFnZXIuZGF0YUZvclRhcmdldCh0YXJnZXQpOworCisgICAgICAgICAgICAgICAgICAgIEluc3Bl Y3RvclRlc3QucGFzcygiQWxsIFRhcmdldHMgUGF1c2VkIik7CisgICAgICAgICAgICAgICAgICAg IEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwodGFyZ2V0LnR5cGUsIFdlYkluc3BlY3Rvci5UYXJn ZXQuVHlwZS5Xb3JrZXIsICJBY3RpdmUgY2FsbCBmcmFtZSBzaG91bGQgYmUgaW4gYSBXb3JrZXIu Iik7CisgICAgICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwodGFyZ2V0 RGF0YS5wYXVzZVJlYXNvbiwgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTWFuYWdlci5QYXVzZVJlYXNv bi5CcmVha3BvaW50LCAiUGF1c2UgcmVhc29uIHNob3VsZCBiZSBhIGJyZWFrcG9pbnQuIik7Cisg ICAgICAgICAgICAgICAgICAgIHdpbmRvdy5sb2FkTGluZXNGcm9tU291cmNlQ29kZSh0YXJnZXQu bWFpblJlc291cmNlKS50aGVuKCgpID0+IHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGxvZ1Bh dXNlTG9jYXRpb24oKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kZWJ1 Z2dlck1hbmFnZXIucmVzdW1lKCkudGhlbihyZXNvbHZlLCByZWplY3QpOworICAgICAgICAgICAg ICAgICAgICB9KTsKKyAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIH0pOworICAgICAg ICB9CisgICAgfSk7CisKKyAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CisgICAgICAgIG5hbWU6ICJX b3JrZXIuRGVidWdnZXIuU2hhcmVkQnJlYWtwb2ludC5CcmVha3BvaW50UmVtb3ZlZCIsCisgICAg ICAgIGRlc2NyaXB0aW9uOiAiTm8gd29ya2VyIHNob3VsZCBwYXVzZSBvbiB0aGUgYnJlYWtwb2lu dC4iLAorICAgICAgICB0ZXN0KHJlc29sdmUsIHJlamVjdCkgeworICAgICAgICAgICAgV2ViSW5z cGVjdG9yLmRlYnVnZ2VyTWFuYWdlci5yZW1vdmVCcmVha3BvaW50KGJyZWFrcG9pbnQpOworCisg ICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV2YWx1YXRlSW5QYWdlKGB0cmlnZ2VyV29ya2VyQnJl YWtwb2ludFBhdXNlcygpYCk7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV2YWx1YXRlSW5Q YWdlKGB0cmlnZ2VyV29ya2VyUmVzcG9uc2UoKWApOworCisgICAgICAgICAgICBJbnNwZWN0b3JU ZXN0LnNpbmdsZUZpcmVFdmVudExpc3RlbmVyKCJXb3JrZXJSZXNwb25kZWQiLCAoKSA9PiB7Cisg ICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5wYXNzKCJXb3JrZXIgc2hvdWxkIG5vdCBoYXZl IHBhdXNlZCAtIDEiKTsKKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LnNpbmdsZUZpcmVF dmVudExpc3RlbmVyKCJXb3JrZXJSZXNwb25kZWQiLCAoKSA9PiB7CisgICAgICAgICAgICAgICAg ICAgIEluc3BlY3RvclRlc3QucGFzcygiV29ya2VyIHNob3VsZCBub3QgaGF2ZSBwYXVzZWQgLSAy Iik7CisgICAgICAgICAgICAgICAgICAgIHJlc29sdmUoKTsKKyAgICAgICAgICAgICAgICB9KTsK KyAgICAgICAgICAgIH0pOworICAgICAgICB9CisgICAgfSk7CisKKyAgICBzdWl0ZS5ydW5UZXN0 Q2FzZXNBbmRGaW5pc2goKTsKK30KKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkgb25sb2FkPSJy dW5UZXN0KCkiPgorPHA+RW5zdXJlIHdlIGNhbiBzZXQgYW5kIHJlbW92ZSBicmVha3BvaW50cyB0 aGF0IGFmZmVjdCBhbGwgV29ya2Vycy48L3A+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivd29ya2VyL3Jlc291cmNlcy93b3JrZXItZGVidWdnZXIt cGF1c2UuanMgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivd29ya2VyL3Jlc291cmNlcy93b3JrZXIt ZGVidWdnZXItcGF1c2UuanMKaW5kZXggY2IzNzY2Yi4uNzNlY2MxOSAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL3dvcmtlci9yZXNvdXJjZXMvd29ya2VyLWRlYnVnZ2VyLXBhdXNl LmpzCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci93b3JrZXIvcmVzb3VyY2VzL3dvcmtlci1k ZWJ1Z2dlci1wYXVzZS5qcwpAQCAtMjcsNCArMjcsNiBAQCBvbm1lc3NhZ2UgPSBmdW5jdGlvbihl dmVudCkgewogICAgICAgICB0cmlnZ2VyRXhjZXB0aW9uKCk7CiAgICAgZWxzZSBpZiAoZXZlbnQu ZGF0YSA9PT0gInRyaWdnZXJBc3NlcnRpb24iKQogICAgICAgICB0cmlnZ2VyQXNzZXJ0aW9uKCk7 CisgICAgZWxzZSBpZiAoZXZlbnQuZGF0YSA9PT0gInRyaWdnZXJSZXNwb25zZSIpCisgICAgICAg IHBvc3RNZXNzYWdlKCJyZXNwb25zZSIpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKaW5kZXgg YmE1YjBmNi4uYjMxYzY2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTgg QEAKIDIwMTYtMTItMDcgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBVbmFibGUgdG8gZGVsZXRlIGJyZWFrcG9pbnQgZnJvbSB3 b3JrZXIgc2NyaXB0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNjU1NzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRGVidWdnZXJNYW5hZ2VyLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTWFuYWdlci5wcm90b3R5cGUuX3JlbW92ZUJyZWFr cG9pbnQpOgorICAgICAgICBNYXRjaCBzZXR0aW5nIGJyZWFrcG9pbnRzLiBJZiB0aGlzIGlzIGEg IlVSTCBicmVha3BvaW50IiwgYWZmZWN0CisgICAgICAgIGFsbCB0YXJnZXRzLiBJZiB0aGlzIGlz IGEgIlNjcmlwdCBicmVha3BvaW50IiwgYWZmZWN0IGp1c3QgdGhlCisgICAgICAgIHNpbmdsZSB0 YXJnZXQgY29udGFpbmluZyB0aGF0IFNjcmlwdC4KKworMjAxNi0xMi0wNyAgSm9zZXBoIFBlY29y YXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEFkZCBh YmlsaXR5IHRvIGRpc3Rpbmd1aXNoIGlmIGEgU2NyaXB0IHdhcyBwYXJzZWQgYXMgYSBtb2R1bGUK ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NDkwMAog ICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjkzMjM4MTc+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9EZWJ1Z2dlck1hbmFnZXIuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9EZWJ1Z2dl ck1hbmFnZXIuanMKaW5kZXggMmFmMzQyNi4uZjY4MmNhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRGVidWdnZXJNYW5hZ2VyLmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0Rl YnVnZ2VyTWFuYWdlci5qcwpAQCAtOTE5LDExICs5MTksMTIgQEAgV2ViSW5zcGVjdG9yLkRlYnVn Z2VyTWFuYWdlciA9IGNsYXNzIERlYnVnZ2VyTWFuYWdlciBleHRlbmRzIFdlYkluc3BlY3Rvci5P YmplY3QKICAgICAgICAgICAgICAgICBjYWxsYmFjaygpOwogICAgICAgICB9CiAKLSAgICAgICAg aWYgKGJyZWFrcG9pbnQudGFyZ2V0KQotICAgICAgICAgICAgYnJlYWtwb2ludC50YXJnZXQuRGVi dWdnZXJBZ2VudC5yZW1vdmVCcmVha3BvaW50KGJyZWFrcG9pbnQuaWRlbnRpZmllciwgZGlkUmVt b3ZlQnJlYWtwb2ludC5iaW5kKHRoaXMpKTsKLSAgICAgICAgZWxzZSB7CisgICAgICAgIGlmIChi cmVha3BvaW50LmNvbnRlbnRJZGVudGlmaWVyKSB7CiAgICAgICAgICAgICBmb3IgKGxldCB0YXJn ZXQgb2YgV2ViSW5zcGVjdG9yLnRhcmdldHMpCiAgICAgICAgICAgICAgICAgdGFyZ2V0LkRlYnVn Z2VyQWdlbnQucmVtb3ZlQnJlYWtwb2ludChicmVha3BvaW50LmlkZW50aWZpZXIsIGRpZFJlbW92 ZUJyZWFrcG9pbnQuYmluZCh0aGlzKSk7CisgICAgICAgIH0gZWxzZSBpZiAoYnJlYWtwb2ludC5z Y3JpcHRJZGVudGlmaWVyKSB7CisgICAgICAgICAgICBsZXQgdGFyZ2V0ID0gYnJlYWtwb2ludC50 YXJnZXQ7CisgICAgICAgICAgICB0YXJnZXQuRGVidWdnZXJBZ2VudC5yZW1vdmVCcmVha3BvaW50 KGJyZWFrcG9pbnQuaWRlbnRpZmllciwgZGlkUmVtb3ZlQnJlYWtwb2ludC5iaW5kKHRoaXMpKTsK ICAgICAgICAgfQogICAgIH0KIAo= 296472 2016-12-07 20:17:24 -0800 2016-12-08 11:34:26 -0800 [PATCH] Proposed Fix breakpoint-delete-2.patch text/plain 11295 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBhNDkwZGEzLi42OTZlZjEwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAgQEAKIDIwMTYtMTIt MDcgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAorICAgICAgICBXZWIg SW5zcGVjdG9yOiBVbmFibGUgdG8gZGVsZXRlIGJyZWFrcG9pbnQgZnJvbSB3b3JrZXIgc2NyaXB0 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjU1NzgK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3Bl Y3Rvci93b3JrZXIvZGVidWdnZXItc2hhcmVkLWJyZWFrcG9pbnQtZXhwZWN0ZWQudHh0OiBBZGRl ZC4KKyAgICAgICAgKiBpbnNwZWN0b3Ivd29ya2VyL2RlYnVnZ2VyLXNoYXJlZC1icmVha3BvaW50 Lmh0bWw6IEFkZGVkLgorICAgICAgICBFbnN1cmUgc2V0dGluZyAvIHJlbW92aW5nIGEgYnJlYWtw b2ludCBhZmZlY3RzIGFsbCBXb3JrZXJzIHRoYXQgc2hhcmUKKyAgICAgICAgYSByZXNvdXJjZSB3 aXRoIHRoZSBzYW1lIFVSTC4KKworICAgICAgICAqIGluc3BlY3Rvci93b3JrZXIvcmVzb3VyY2Vz L3dvcmtlci1kZWJ1Z2dlci1wYXVzZS5qczoKKyAgICAgICAgQWRkIGFuIGVjaG8gY29tbWFuZCB0 aGF0IHdpbGwgYmUgdXNlZnVsIHRvIGVuc3VyZSBXb3JrZXJzIGFyZSBub3QgcGF1c2VkLgorCisy MDE2LTEyLTA3ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAgICAg ICAgV2ViIEluc3BlY3RvcjogQWRkIGFiaWxpdHkgdG8gZGlzdGluZ3Vpc2ggaWYgYSBTY3JpcHQg d2FzIHBhcnNlZCBhcyBhIG1vZHVsZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTY0OTAwCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yOTMyMzgxNz4K ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci93b3JrZXIvZGVidWdnZXItc2hhcmVk LWJyZWFrcG9pbnQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3dvcmtlci9k ZWJ1Z2dlci1zaGFyZWQtYnJlYWtwb2ludC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMC4uYzMwOGEzNgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L2luc3BlY3Rvci93b3JrZXIvZGVidWdnZXItc2hhcmVkLWJyZWFrcG9pbnQtZXhwZWN0ZWQudHh0 CkBAIC0wLDAgKzEsMjcgQEAKK0Vuc3VyZSBzZXR0aW5nIGFuZCByZW1vdmluZyBhIGJyZWFrcG9p bnQgYWZmZWN0cyBhbGwgV29ya2VycyBzaGFyaW5nIGEgcmVzb3VyY2UgYnkgVVJMLgorCisKKz09 IFJ1bm5pbmcgdGVzdCBzdWl0ZTogV29ya2VyLkRlYnVnZ2VyLlNoYXJlZEJyZWFrcG9pbnQKKy0t IFJ1bm5pbmcgdGVzdCBjYXNlOiBXb3JrZXIuRGVidWdnZXIuU2hhcmVkQnJlYWtwb2ludC5DcmVh dGVXb3JrZXJzCitQQVNTOiBUd28gV29ya2VycyBjcmVhdGVkLgorUEFTUzogVHdvIFdvcmtlcnMg cmVhZHkuCisKKy0tIFJ1bm5pbmcgdGVzdCBjYXNlOiBXb3JrZXIuRGVidWdnZXIuU2hhcmVkQnJl YWtwb2ludC5CcmVha3BvaW50QWRkZWQKK1BBU1M6IEFsbCBUYXJnZXRzIHBhdXNlZC4KK1BBU1M6 IEFjdGl2ZSBDYWxsZUZyYW1lIHNob3VsZCBiZSBpbiBhIFdvcmtlci4KK1BBU1M6IFBhdXNlIHJl YXNvbiBzaG91bGQgYmUgYSBicmVha3BvaW50LgorUEFVU0UgQVQgdHJpZ2dlckJyZWFrcG9pbnQ6 OTo1CisgICAgICA1ICAgIAorICAgICAgNiAgICBmdW5jdGlvbiB0cmlnZ2VyQnJlYWtwb2ludCgp IHsKKyAgICAgIDcgICAgICAgIGxldCBhbHBoYSA9IDE7CisgLT4gICA4ICAgICAgICB8bGV0IGJl dGEgPSAyOyAvLyBCUkVBS1BPSU5UCisgICAgICA5ICAgICAgICBsZXQgZ2FtbWEgPSAzOworICAg ICAxMCAgICB9CisgICAgIDExICAgIAorCisKKworLS0gUnVubmluZyB0ZXN0IGNhc2U6IFdvcmtl ci5EZWJ1Z2dlci5TaGFyZWRCcmVha3BvaW50LkJyZWFrcG9pbnRSZW1vdmVkCitQQVNTOiBXb3Jr ZXIgMSBzaG91bGQgbm90IGhhdmUgcGF1c2VkLgorUEFTUzogV29ya2VyIDIgc2hvdWxkIG5vdCBo YXZlIHBhdXNlZC4KKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3dvcmtlci9k ZWJ1Z2dlci1zaGFyZWQtYnJlYWtwb2ludC5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3dv cmtlci9kZWJ1Z2dlci1zaGFyZWQtYnJlYWtwb2ludC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAuLmQ2ZTRjY2QKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9p bnNwZWN0b3Ivd29ya2VyL2RlYnVnZ2VyLXNoYXJlZC1icmVha3BvaW50Lmh0bWwKQEAgLTAsMCAr MSwxNDUgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSIu Li8uLi9odHRwL3Rlc3RzL2luc3BlY3Rvci9yZXNvdXJjZXMvaW5zcGVjdG9yLXRlc3QuanMiPjwv c2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uL2RlYnVnZ2VyL3Jlc291cmNlcy9sb2ctcGF1c2UtbG9j YXRpb24uanMiPjwvc2NyaXB0PgorPHNjcmlwdD4KK2xldCB3b3JrZXIxLCB3b3JrZXIyOworCitm dW5jdGlvbiB0cmlnZ2VyQ3JlYXRlV29ya2VycygpIHsKKyAgICB3b3JrZXIxID0gbmV3IFdvcmtl cigicmVzb3VyY2VzL3dvcmtlci1kZWJ1Z2dlci1wYXVzZS5qcyIpOworICAgIHdvcmtlcjIgPSBu ZXcgV29ya2VyKCJyZXNvdXJjZXMvd29ya2VyLWRlYnVnZ2VyLXBhdXNlLmpzIik7CisgICAgd29y a2VyMS5vbm1lc3NhZ2UgPSB3b3JrZXIyLm9ubWVzc2FnZSA9IGZ1bmN0aW9uKGV2ZW50KSB7Cisg ICAgICAgIFRlc3RQYWdlLmRpc3BhdGNoRXZlbnRUb0Zyb250ZW5kKCJXb3JrZXJSZXNwb25kZWQi KTsKKyAgICB9OworfQorCitmdW5jdGlvbiB0cmlnZ2VyV29ya2VyQnJlYWtwb2ludFBhdXNlcygp IHsKKyAgICB3b3JrZXIxLnBvc3RNZXNzYWdlKCJ0cmlnZ2VyQnJlYWtwb2ludCIpOworICAgIHdv cmtlcjIucG9zdE1lc3NhZ2UoInRyaWdnZXJCcmVha3BvaW50Iik7Cit9CisKK2Z1bmN0aW9uIHRy aWdnZXJXb3JrZXJSZXNwb25zZSgpIHsKKyAgICB3b3JrZXIxLnBvc3RNZXNzYWdlKCJ0cmlnZ2Vy UmVzcG9uc2UiKTsKKyAgICB3b3JrZXIyLnBvc3RNZXNzYWdlKCJ0cmlnZ2VyUmVzcG9uc2UiKTsK K30KKworZnVuY3Rpb24gdGVzdCgpCit7CisgICAgbGV0IGJyZWFrcG9pbnQgPSBudWxsOworICAg IGxldCB3b3JrZXJUYXJnZXQxLCB3b3JrZXJUYXJnZXQyOworCisgICAgLy8gSW4gZWFjaCB0ZXN0 LCB0aGUgV29ya2VyIHBhdXNlcyBhbmQgdGhlIE1haW4gVGhyZWFkIGlzIHdhaXRpbmcgdG8KKyAg ICAvLyBwYXVzZSBvbiB0aGUgbmV4dCBzdGF0ZW1lbnQuIERvIGFuIEluc3BlY3RvclRlc3QubG9n LCB3aGljaCBldmFsdXRlcworICAgIC8vIEphdmFTY3JpcHQgaW4gdGhlIHBhZ2UgYW5kIHNob3Vs ZCBwYXVzZS4gVGhlbiBsYXRlciBydW4gd29yay4KKyAgICAvLyBJbiBXZWJLaXQxLCBiZWNhdXNl IHRoZSBWTSBpcyBzaGFyZWQgYmV0d2VlbiB0aGUgaW5zcGVjdG9yIGFuZAorICAgIC8vIGluc3Bl Y3RlZCBwYWdlIHdlIG5lZWQgdG8gcHV0IGFuIGFydGlmaWNpYWwgYnJlYWsgYmV0d2VlbiBvdXIK KyAgICAvLyBJbnNwZWN0b3IgSmF2YVNjcmlwdCwgdGhlIFBhZ2UgSmF2YVNjcmlwdCwgYW5kIGJh Y2sgdG8gdGhlIEluc3BlY3Rvci4KKyAgICBmdW5jdGlvbiBwYXVzZVRoZU1haW5UaHJlYWQoKSB7 CisgICAgICAgIHJldHVybiBuZXcgUHJvbWlzZSgocmVzb2x2ZSwgcmVqZWN0KSA9PiB7CisgICAg ICAgICAgICBzZXRUaW1lb3V0KCgpID0+IHsKKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0 LmxvZygiIik7CisgICAgICAgICAgICAgICAgc2V0VGltZW91dChyZXNvbHZlKTsKKyAgICAgICAg ICAgIH0pOworICAgICAgICB9KTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiBhcmVBbGxUYXJnZXRz UGF1c2VkKCkgeworICAgICAgICBmb3IgKGxldCB0YXJnZXQgb2YgV2ViSW5zcGVjdG9yLnRhcmdl dHMpIHsKKyAgICAgICAgICAgIGxldCB0YXJnZXREYXRhID0gV2ViSW5zcGVjdG9yLmRlYnVnZ2Vy TWFuYWdlci5kYXRhRm9yVGFyZ2V0KHRhcmdldCk7CisgICAgICAgICAgICBpZiAoIXRhcmdldERh dGEucGF1c2VkKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfQorICAg ICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiB3aGVuQWxsVGFyZ2V0c1Bh dXNlZCgpIHsKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnQoIWFyZUFsbFRhcmdldHNQYXVz ZWQoKSk7CisgICAgICAgIHJldHVybiBuZXcgUHJvbWlzZSgocmVzb2x2ZSwgcmVqZWN0KSA9PiB7 CisgICAgICAgICAgICBsZXQgbGlzdGVuZXIgPSBXZWJJbnNwZWN0b3IuZGVidWdnZXJNYW5hZ2Vy LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTWFuYWdlci5FdmVudC5DYWxs RnJhbWVzRGlkQ2hhbmdlLCAoZXZlbnQpID0+IHsKKyAgICAgICAgICAgICAgICBpZiAoYXJlQWxs VGFyZ2V0c1BhdXNlZCgpKSB7CisgICAgICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kZWJ1 Z2dlck1hbmFnZXIucmVtb3ZlRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGVidWdnZXJNYW5h Z2VyLkV2ZW50LkNhbGxGcmFtZXNEaWRDaGFuZ2UsIGxpc3RlbmVyKTsKKyAgICAgICAgICAgICAg ICAgICAgcmVzb2x2ZSgpOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0pOworICAg ICAgICB9KTsKKyAgICB9CisKKyAgICBsZXQgc3VpdGUgPSBJbnNwZWN0b3JUZXN0LmNyZWF0ZUFz eW5jU3VpdGUoIldvcmtlci5EZWJ1Z2dlci5TaGFyZWRCcmVha3BvaW50Iik7CisKKyAgICBzdWl0 ZS5hZGRUZXN0Q2FzZSh7CisgICAgICAgIG5hbWU6ICJXb3JrZXIuRGVidWdnZXIuU2hhcmVkQnJl YWtwb2ludC5DcmVhdGVXb3JrZXJzIiwKKyAgICAgICAgZGVzY3JpcHRpb246ICJDcmVhdGUgbXVs dGlwbGUgd29ya2Vycy4iLAorICAgICAgICB0ZXN0KHJlc29sdmUsIHJlamVjdCkgeworICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUluUGFnZShgdHJpZ2dlckNyZWF0ZVdvcmtlcnMo KTsgdHJpZ2dlcldvcmtlclJlc3BvbnNlKCk7YCk7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3Iu dGFyZ2V0TWFuYWdlci5zaW5nbGVGaXJlRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGFyZ2V0 TWFuYWdlci5FdmVudC5UYXJnZXRBZGRlZCwgKGV2ZW50KSA9PiB7CisgICAgICAgICAgICAgICAg d29ya2VyVGFyZ2V0MSA9IGV2ZW50LmRhdGEudGFyZ2V0OworICAgICAgICAgICAgICAgIFdlYklu c3BlY3Rvci50YXJnZXRNYW5hZ2VyLnNpbmdsZUZpcmVFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rv ci5UYXJnZXRNYW5hZ2VyLkV2ZW50LlRhcmdldEFkZGVkLCAoZXZlbnQpID0+IHsKKyAgICAgICAg ICAgICAgICAgICAgd29ya2VyVGFyZ2V0MiA9IGV2ZW50LmRhdGEudGFyZ2V0OworICAgICAgICAg ICAgICAgICAgICBJbnNwZWN0b3JUZXN0LnBhc3MoIlR3byBXb3JrZXJzIGNyZWF0ZWQuIik7Cisg ICAgICAgICAgICAgICAgfSk7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIEluc3BlY3Rv clRlc3Quc2luZ2xlRmlyZUV2ZW50TGlzdGVuZXIoIldvcmtlclJlc3BvbmRlZCIsICgpID0+IHsK KyAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LnNpbmdsZUZpcmVFdmVudExpc3RlbmVyKCJX b3JrZXJSZXNwb25kZWQiLCAoKSA9PiB7CisgICAgICAgICAgICAgICAgICAgIEluc3BlY3RvclRl c3QucGFzcygiVHdvIFdvcmtlcnMgcmVhZHkuIik7CisgICAgICAgICAgICAgICAgICAgIHJlc29s dmUoKTsKKyAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9Cisg ICAgfSk7CisKKyAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CisgICAgICAgIG5hbWU6ICJXb3JrZXIu RGVidWdnZXIuU2hhcmVkQnJlYWtwb2ludC5CcmVha3BvaW50QWRkZWQiLAorICAgICAgICBkZXNj cmlwdGlvbjogIkFsbCB3b3JrZXJzIHNob3VsZCBwYXVzZSBvbiB0aGUgYnJlYWtwb2ludCBhZnRl ciBhZGRpbmcgaXQuIiwKKyAgICAgICAgdGVzdChyZXNvbHZlLCByZWplY3QpIHsKKyAgICAgICAg ICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0KHdvcmtlclRhcmdldDEubWFpblJlc291cmNlIGluc3Rh bmNlb2YgV2ViSW5zcGVjdG9yLlNjcmlwdCk7CisgICAgICAgICAgICBsZXQgbG9jYXRpb24gPSB3 b3JrZXJUYXJnZXQxLm1haW5SZXNvdXJjZS5jcmVhdGVTb3VyY2VDb2RlTG9jYXRpb24oOCwgMCk7 CisgICAgICAgICAgICBicmVha3BvaW50ID0gbmV3IFdlYkluc3BlY3Rvci5CcmVha3BvaW50KGxv Y2F0aW9uKTsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1hbmFnZXIuYWRkQnJl YWtwb2ludChicmVha3BvaW50KTsKKworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5ldmFsdWF0 ZUluUGFnZShgdHJpZ2dlcldvcmtlckJyZWFrcG9pbnRQYXVzZXMoKWApOworICAgICAgICAgICAg V2ViSW5zcGVjdG9yLmRlYnVnZ2VyTWFuYWdlci5zaW5nbGVGaXJlRXZlbnRMaXN0ZW5lcihXZWJJ bnNwZWN0b3IuRGVidWdnZXJNYW5hZ2VyLkV2ZW50LlBhdXNlZCwgKGV2ZW50KSA9PiB7CisgICAg ICAgICAgICAgICAgcGF1c2VUaGVNYWluVGhyZWFkKCk7CisgICAgICAgICAgICAgICAgd2hlbkFs bFRhcmdldHNQYXVzZWQoKS50aGVuKCgpID0+IHsKKyAgICAgICAgICAgICAgICAgICAgbGV0IHRh cmdldCA9IFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1hbmFnZXIuYWN0aXZlQ2FsbEZyYW1lLnRhcmdl dDsKKyAgICAgICAgICAgICAgICAgICAgbGV0IHRhcmdldERhdGEgPSBXZWJJbnNwZWN0b3IuZGVi dWdnZXJNYW5hZ2VyLmRhdGFGb3JUYXJnZXQodGFyZ2V0KTsKKworICAgICAgICAgICAgICAgICAg ICBJbnNwZWN0b3JUZXN0LnBhc3MoIkFsbCBUYXJnZXRzIHBhdXNlZC4iKTsKKyAgICAgICAgICAg ICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbCh0YXJnZXQudHlwZSwgV2ViSW5zcGVj dG9yLlRhcmdldC5UeXBlLldvcmtlciwgIkFjdGl2ZSBDYWxsZUZyYW1lIHNob3VsZCBiZSBpbiBh IFdvcmtlci4iKTsKKyAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVh bCh0YXJnZXREYXRhLnBhdXNlUmVhc29uLCBXZWJJbnNwZWN0b3IuRGVidWdnZXJNYW5hZ2VyLlBh dXNlUmVhc29uLkJyZWFrcG9pbnQsICJQYXVzZSByZWFzb24gc2hvdWxkIGJlIGEgYnJlYWtwb2lu dC4iKTsKKyAgICAgICAgICAgICAgICAgICAgd2luZG93LmxvYWRMaW5lc0Zyb21Tb3VyY2VDb2Rl KHRhcmdldC5tYWluUmVzb3VyY2UpLnRoZW4oKCkgPT4geworICAgICAgICAgICAgICAgICAgICAg ICAgbG9nUGF1c2VMb2NhdGlvbigpOworICAgICAgICAgICAgICAgICAgICAgICAgV2ViSW5zcGVj dG9yLmRlYnVnZ2VyTWFuYWdlci5yZXN1bWUoKS50aGVuKHJlc29sdmUsIHJlamVjdCk7CisgICAg ICAgICAgICAgICAgICAgIH0pOworICAgICAgICAgICAgICAgIH0pOworICAgICAgICAgICAgfSk7 CisgICAgICAgIH0KKyAgICB9KTsKKworICAgIHN1aXRlLmFkZFRlc3RDYXNlKHsKKyAgICAgICAg bmFtZTogIldvcmtlci5EZWJ1Z2dlci5TaGFyZWRCcmVha3BvaW50LkJyZWFrcG9pbnRSZW1vdmVk IiwKKyAgICAgICAgZGVzY3JpcHRpb246ICJObyB3b3JrZXIgc2hvdWxkIHBhdXNlIG9uIHRoZSBi cmVha3BvaW50IGFmdGVyIHJlbW92aW5nIGl0LiIsCisgICAgICAgIHRlc3QocmVzb2x2ZSwgcmVq ZWN0KSB7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJNYW5hZ2VyLnJlbW92ZUJy ZWFrcG9pbnQoYnJlYWtwb2ludCk7CisKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXZhbHVh dGVJblBhZ2UoYHRyaWdnZXJXb3JrZXJCcmVha3BvaW50UGF1c2VzKClgKTsKKyAgICAgICAgICAg IEluc3BlY3RvclRlc3QuZXZhbHVhdGVJblBhZ2UoYHRyaWdnZXJXb3JrZXJSZXNwb25zZSgpYCk7 CisKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3Quc2luZ2xlRmlyZUV2ZW50TGlzdGVuZXIoIldv cmtlclJlc3BvbmRlZCIsICgpID0+IHsKKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LnBh c3MoIldvcmtlciAxIHNob3VsZCBub3QgaGF2ZSBwYXVzZWQuIik7CisgICAgICAgICAgICAgICAg SW5zcGVjdG9yVGVzdC5zaW5nbGVGaXJlRXZlbnRMaXN0ZW5lcigiV29ya2VyUmVzcG9uZGVkIiwg KCkgPT4geworICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LnBhc3MoIldvcmtlciAy IHNob3VsZCBub3QgaGF2ZSBwYXVzZWQuIik7CisgICAgICAgICAgICAgICAgICAgIHJlc29sdmUo KTsKKyAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9CisgICAg fSk7CisKKyAgICBzdWl0ZS5ydW5UZXN0Q2FzZXNBbmRGaW5pc2goKTsKK30KKzwvc2NyaXB0Pgor PC9oZWFkPgorPGJvZHkgb25sb2FkPSJydW5UZXN0KCkiPgorPHA+RW5zdXJlIHNldHRpbmcgYW5k IHJlbW92aW5nIGEgYnJlYWtwb2ludCBhZmZlY3RzIGFsbCBXb3JrZXJzIHNoYXJpbmcgYSByZXNv dXJjZSBieSBVUkwuPC9wPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL3dvcmtlci9yZXNvdXJjZXMvd29ya2VyLWRlYnVnZ2VyLXBhdXNlLmpzIGIv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL3dvcmtlci9yZXNvdXJjZXMvd29ya2VyLWRlYnVnZ2VyLXBh dXNlLmpzCmluZGV4IGNiMzc2NmIuLjczZWNjMTkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2lu c3BlY3Rvci93b3JrZXIvcmVzb3VyY2VzL3dvcmtlci1kZWJ1Z2dlci1wYXVzZS5qcworKysgYi9M YXlvdXRUZXN0cy9pbnNwZWN0b3Ivd29ya2VyL3Jlc291cmNlcy93b3JrZXItZGVidWdnZXItcGF1 c2UuanMKQEAgLTI3LDQgKzI3LDYgQEAgb25tZXNzYWdlID0gZnVuY3Rpb24oZXZlbnQpIHsKICAg ICAgICAgdHJpZ2dlckV4Y2VwdGlvbigpOwogICAgIGVsc2UgaWYgKGV2ZW50LmRhdGEgPT09ICJ0 cmlnZ2VyQXNzZXJ0aW9uIikKICAgICAgICAgdHJpZ2dlckFzc2VydGlvbigpOworICAgIGVsc2Ug aWYgKGV2ZW50LmRhdGEgPT09ICJ0cmlnZ2VyUmVzcG9uc2UiKQorICAgICAgICBwb3N0TWVzc2Fn ZSgicmVzcG9uc2UiKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFu Z2VMb2cgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGJhNWIwZjYuLmIz MWM2NjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE4IEBACiAyMDE2LTEy LTA3ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2Vi IEluc3BlY3RvcjogVW5hYmxlIHRvIGRlbGV0ZSBicmVha3BvaW50IGZyb20gd29ya2VyIHNjcmlw dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY1NTc4 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RlYnVnZ2VyTWFuYWdlci5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5EZWJ1Z2dlck1hbmFnZXIucHJvdG90eXBlLl9yZW1vdmVCcmVha3BvaW50KToKKyAg ICAgICAgTWF0Y2ggc2V0dGluZyBicmVha3BvaW50cy4gSWYgdGhpcyBpcyBhICJVUkwgYnJlYWtw b2ludCIsIGFmZmVjdAorICAgICAgICBhbGwgdGFyZ2V0cy4gSWYgdGhpcyBpcyBhICJTY3JpcHQg YnJlYWtwb2ludCIsIGFmZmVjdCBqdXN0IHRoZQorICAgICAgICBzaW5nbGUgdGFyZ2V0IGNvbnRh aW5pbmcgdGhhdCBTY3JpcHQuCisKKzIwMTYtMTItMDcgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29y YXJvQGFwcGxlLmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBBZGQgYWJpbGl0eSB0byBk aXN0aW5ndWlzaCBpZiBhIFNjcmlwdCB3YXMgcGFyc2VkIGFzIGEgbW9kdWxlCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjQ5MDAKICAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzI5MzIzODE3PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRGVidWdnZXJNYW5hZ2VyLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRGVidWdnZXJNYW5hZ2VyLmpz CmluZGV4IDJhZjM0MjYuLmY2ODJjYWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RlYnVnZ2VyTWFuYWdlci5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9EZWJ1Z2dlck1hbmFn ZXIuanMKQEAgLTkxOSwxMSArOTE5LDEyIEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1hbmFnZXIg PSBjbGFzcyBEZWJ1Z2dlck1hbmFnZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAg ICAgICAgICAgICAgY2FsbGJhY2soKTsKICAgICAgICAgfQogCi0gICAgICAgIGlmIChicmVha3Bv aW50LnRhcmdldCkKLSAgICAgICAgICAgIGJyZWFrcG9pbnQudGFyZ2V0LkRlYnVnZ2VyQWdlbnQu cmVtb3ZlQnJlYWtwb2ludChicmVha3BvaW50LmlkZW50aWZpZXIsIGRpZFJlbW92ZUJyZWFrcG9p bnQuYmluZCh0aGlzKSk7Ci0gICAgICAgIGVsc2UgeworICAgICAgICBpZiAoYnJlYWtwb2ludC5j b250ZW50SWRlbnRpZmllcikgewogICAgICAgICAgICAgZm9yIChsZXQgdGFyZ2V0IG9mIFdlYklu c3BlY3Rvci50YXJnZXRzKQogICAgICAgICAgICAgICAgIHRhcmdldC5EZWJ1Z2dlckFnZW50LnJl bW92ZUJyZWFrcG9pbnQoYnJlYWtwb2ludC5pZGVudGlmaWVyLCBkaWRSZW1vdmVCcmVha3BvaW50 LmJpbmQodGhpcykpOworICAgICAgICB9IGVsc2UgaWYgKGJyZWFrcG9pbnQuc2NyaXB0SWRlbnRp ZmllcikgeworICAgICAgICAgICAgbGV0IHRhcmdldCA9IGJyZWFrcG9pbnQudGFyZ2V0OworICAg ICAgICAgICAgdGFyZ2V0LkRlYnVnZ2VyQWdlbnQucmVtb3ZlQnJlYWtwb2ludChicmVha3BvaW50 LmlkZW50aWZpZXIsIGRpZFJlbW92ZUJyZWFrcG9pbnQuYmluZCh0aGlzKSk7CiAgICAgICAgIH0K ICAgICB9CiAK