196450 2019-04-01 11:48:56 -0700 Web Inspector: Sources: clicking on a breakpoint changes the path components to not match the script's path 2019-10-01 13:41:41 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi commit-queue hi inspector-bugzilla-changes joepeck mattbaker webkit-bug-importer oldest_to_newest 1522984 0 hi 2019-04-01 11:48:56 -0700 # STEPS TO REPRODUCE: 1. inspect <https://webkit.org> 2. enable "Group by Path" 3. find and select the "global.js" script 4. set a breakpoint in that file 5. click on the breakpoint => "https://webkit.org > wp-content > themes > webkit > scripts > global.js" becomes just "global.js" => clicking on "global.js" has it's siblings as "All Exceptions" and "Uncaught Exceptions" 1522987 1 webkit-bug-importer 2019-04-01 11:49:49 -0700 <rdar://problem/49488099> 1522988 2 webkit-bug-importer 2019-04-01 11:50:53 -0700 <rdar://problem/49488100> 1575121 3 379801 hi 2019-09-28 21:22:09 -0700 Created attachment 379801 Patch 1575629 4 379801 mattbaker 2019-10-01 12:01:29 -0700 Comment on attachment 379801 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=379801&action=review r=me > Source/WebInspectorUI/ChangeLog:11 > + well so that the hiererchical path component shows the right breadcrumb trail. sp: hiererchical -> hierarchical 1575673 5 379937 hi 2019-10-01 13:04:15 -0700 Created attachment 379937 Patch 1575709 6 379937 commit-queue 2019-10-01 13:41:40 -0700 Comment on attachment 379937 Patch Clearing flags on attachment: 379937 Committed r250580: <https://trac.webkit.org/changeset/250580> 1575710 7 commit-queue 2019-10-01 13:41:41 -0700 All reviewed patches have been landed. Closing bug. 379801 2019-09-28 21:22:09 -0700 2019-10-01 13:04:15 -0700 Patch bug-196450-20190929002208.patch text/plain 4604 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGNlMmY4MTZkZGU4NzY1YjRkOTc1MmY2MTI3NDY3 NzVlY2ZmNjg1MTQuLjE4NzVmZmVlNzVhMzYzMGI2NTRlNDBkMWViZTk0MjQzODA4ZGU4MmUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE5LTA5LTI4ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBT b3VyY2VzOiBjbGlja2luZyBvbiBhIGJyZWFrcG9pbnQgY2hhbmdlcyB0aGUgcGF0aCBjb21wb25l bnRzIHRvIG5vdCBtYXRjaCB0aGUgc2NyaXB0J3MgcGF0aAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk2NDUwCisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS80OTQ4ODEwMD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBXaGVuIHNlbGVjdGluZyBhbnkgdHJlZSBlbGVtZW50IHRoYXQgaXNuJ3QgaW4gdGhlIHJl c291cmNlcyB0cmVlIG91dGxpbmUsIGF0dGVtcHQgdG8gZmluZAorICAgICAgICB0aGUgY29ycmVz cG9uZGluZyB0cmVlIGVsZW1lbnQgaW4gdGhlIHJlc291cmNlcyB0cmVlIG91dGxpbmUgYW5kIHNp bGVudGx5IHNlbGVjdCB0aGF0IGFzCisgICAgICAgIHdlbGwgc28gdGhhdCB0aGUgaGllcmVyY2hp Y2FsIHBhdGggY29tcG9uZW50IHNob3dzIHRoZSByaWdodCBicmVhZGNydW1iIHRyYWlsLgorCisg ICAgICAgIElmIHRoZSB0cmVlIGVsZW1lbnQgaXMgZm9yIGEgYFdJLlNjcmlwdGAgd2hpY2ggaGFz IGEgY29ycmVzcG9uZGluZyBgV0kuUmVzb3VyY2VgLCB1c2UgdGhlCisgICAgICAgIGBXSS5SZXNv dXJjZWAgaW5zdGVhZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlc05h dmlnYXRpb25TaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXSS5Tb3VyY2VzTmF2aWdhdGlvblNp ZGViYXJQYW5lbC5wcm90b3R5cGUuX2hhbmRsZVRyZWVTZWxlY3Rpb25EaWRDaGFuZ2UpOgorCiAy MDE5LTA5LTI2ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAg ICAgV2ViIEluc3BlY3RvcjogSW5jbHVkZSBMb2NhbFJlc291cmNlT3ZlcnJpZGVzIGluIHRoZSBP cGVuIFJlc291cmNlIGRpYWxvZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VzTmF2aWdhdGlvblNp ZGViYXJQYW5lbC5qcwppbmRleCBmZDIyYmVkYWI2ZGE4YTY0NmIxMjhjY2RkMzQ2OWE3YWY0Y2Y5 MThjLi43MDI1MDhkYzUzYjM2NzEzNWZlMDNlOTJlYjUwYmQzMzI3YzM4MDNjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VzTmF2aWdh dGlvblNpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9Tb3VyY2VzTmF2aWdhdGlvblNpZGViYXJQYW5lbC5qcwpAQCAtMTY4MSwxMiAr MTY4MSwzMiBAQCBXSS5Tb3VyY2VzTmF2aWdhdGlvblNpZGViYXJQYW5lbCA9IGNsYXNzIFNvdXJj ZXNOYXZpZ2F0aW9uU2lkZWJhclBhbmVsIGV4dGVuZHMgVwogICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICB9CiAKKyAgICAgICAgLy8gU2lsZW50bHkgc2VsZWN0IHRoZSBjb3JyZXNwb25kaW5n IHRyZWUgZWxlbWVudCBpbiB0aGUgcmVzb3VyY2VzIHRyZWUgb3V0bGluZSB0byB1cGRhdGUKKyAg ICAgICAgLy8gdGhlIGhpZXJhcmNoaWNhbCBwYXRoIGNvbXBvbmVudHMgdG8gc2hvdyB0aGUgcmln aHQgYW5jZXN0b3IocykuCisgICAgICAgIGxldCBzZWxlY3RUcmVlRWxlbWVudEluUmVzb3VyY2Vz VHJlZU91dGxpbmUgPSAoc291cmNlQ29kZSkgPT4geworICAgICAgICAgICAgbGV0IHJlc291cmNl VHJlZUVsZW1lbnQgPSB0aGlzLl9yZXNvdXJjZXNUcmVlT3V0bGluZS5maW5kVHJlZUVsZW1lbnQo c291cmNlQ29kZSk7CisgICAgICAgICAgICBpZiAoIXJlc291cmNlVHJlZUVsZW1lbnQpCisgICAg ICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgICAgICBjb25zdCBvbWl0Rm9jdXMgPSB0cnVl OworICAgICAgICAgICAgY29uc3Qgc2VsZWN0ZWRCeVVzZXIgPSBmYWxzZTsKKyAgICAgICAgICAg IGNvbnN0IHN1cHByZXNzTm90aWZpY2F0aW9uID0gdHJ1ZTsKKyAgICAgICAgICAgIHJlc291cmNl VHJlZUVsZW1lbnQuc2VsZWN0KG9taXRGb2N1cywgc2VsZWN0ZWRCeVVzZXIsIHN1cHByZXNzTm90 aWZpY2F0aW9uKTsKKyAgICAgICAgfTsKKwogICAgICAgICBpZiAodHJlZUVsZW1lbnQgaW5zdGFu Y2VvZiBXSS5Gb2xkZXJUcmVlRWxlbWVudAogICAgICAgICAgICAgfHwgdHJlZUVsZW1lbnQgaW5z dGFuY2VvZiBXSS5PcmlnaW5UcmVlRWxlbWVudAogICAgICAgICAgICAgfHwgdHJlZUVsZW1lbnQg aW5zdGFuY2VvZiBXSS5SZXNvdXJjZVRyZWVFbGVtZW50CiAgICAgICAgICAgICB8fCB0cmVlRWxl bWVudCBpbnN0YW5jZW9mIFdJLlNjcmlwdFRyZWVFbGVtZW50CiAgICAgICAgICAgICB8fCB0cmVl RWxlbWVudCBpbnN0YW5jZW9mIFdJLkNTU1N0eWxlU2hlZXRUcmVlRWxlbWVudCkgewogICAgICAg ICAgICAgbGV0IHJlcHJlc2VudGVkT2JqZWN0ID0gdHJlZUVsZW1lbnQucmVwcmVzZW50ZWRPYmpl Y3Q7CisKKyAgICAgICAgICAgIGlmIChyZXByZXNlbnRlZE9iamVjdCBpbnN0YW5jZW9mIFdJLlNj cmlwdCAmJiByZXByZXNlbnRlZE9iamVjdC5yZXNvdXJjZSkKKyAgICAgICAgICAgICAgICByZXBy ZXNlbnRlZE9iamVjdCA9IHJlcHJlc2VudGVkT2JqZWN0LnJlc291cmNlOworCisgICAgICAgICAg ICBpZiAodHJlZUVsZW1lbnQudHJlZU91dGxpbmUgIT09IHRoaXMuX3Jlc291cmNlc1RyZWVPdXRs aW5lKQorICAgICAgICAgICAgICAgIHNlbGVjdFRyZWVFbGVtZW50SW5SZXNvdXJjZXNUcmVlT3V0 bGluZShyZXByZXNlbnRlZE9iamVjdCk7CisKICAgICAgICAgICAgIGlmIChyZXByZXNlbnRlZE9i amVjdCBpbnN0YW5jZW9mIFdJLkNvbGxlY3Rpb24gfHwgcmVwcmVzZW50ZWRPYmplY3QgaW5zdGFu Y2VvZiBXSS5Tb3VyY2VDb2RlIHx8IHJlcHJlc2VudGVkT2JqZWN0IGluc3RhbmNlb2YgV0kuRnJh bWUpCiAgICAgICAgICAgICAgICAgV0kuc2hvd1JlcHJlc2VudGVkT2JqZWN0KHJlcHJlc2VudGVk T2JqZWN0KTsKICAgICAgICAgICAgIHJldHVybjsKQEAgLTE3MTEsMTggKzE3MzEsMTMgQEAgV0ku U291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwgPSBjbGFzcyBTb3VyY2VzTmF2aWdhdGlvblNp ZGViYXJQYW5lbCBleHRlbmRzIFcKICAgICAgICAgICAgIGlmIChXSS5kZWJ1Z2dlck1hbmFnZXIu aXNCcmVha3BvaW50U3BlY2lhbChicmVha3BvaW50KSkKICAgICAgICAgICAgICAgICByZXR1cm47 CiAKLSAgICAgICAgICAgIGlmICh0cmVlRWxlbWVudC50cmVlT3V0bGluZSA9PT0gdGhpcy5fcGF1 c2VSZWFzb25UcmVlT3V0bGluZSkgewotICAgICAgICAgICAgICAgIFdJLnNob3dTb3VyY2VDb2Rl TG9jYXRpb24oYnJlYWtwb2ludC5zb3VyY2VDb2RlTG9jYXRpb24pOwotICAgICAgICAgICAgICAg IHJldHVybjsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGxldCBzb3VyY2VDb2RlID0gYnJl YWtwb2ludC5zb3VyY2VDb2RlTG9jYXRpb24uZGlzcGxheVNvdXJjZUNvZGU7CisgICAgICAgICAg ICBpZiAoc291cmNlQ29kZSBpbnN0YW5jZW9mIFdJLlNjcmlwdCAmJiBzb3VyY2VDb2RlLnJlc291 cmNlKQorICAgICAgICAgICAgICAgIHNvdXJjZUNvZGUgPSBzb3VyY2VDb2RlLnJlc291cmNlOwor ICAgICAgICAgICAgc2VsZWN0VHJlZUVsZW1lbnRJblJlc291cmNlc1RyZWVPdXRsaW5lKHNvdXJj ZUNvZGUpOwogCi0gICAgICAgICAgICBpZiAodHJlZUVsZW1lbnQucGFyZW50LnJlcHJlc2VudGVk T2JqZWN0KSB7Ci0gICAgICAgICAgICAgICAgY29uc29sZS5hc3NlcnQodHJlZUVsZW1lbnQucGFy ZW50LnJlcHJlc2VudGVkT2JqZWN0IGluc3RhbmNlb2YgV0kuU291cmNlQ29kZSk7Ci0gICAgICAg ICAgICAgICAgaWYgKHRyZWVFbGVtZW50LnBhcmVudC5yZXByZXNlbnRlZE9iamVjdCBpbnN0YW5j ZW9mIFdJLlNvdXJjZUNvZGUpIHsKLSAgICAgICAgICAgICAgICAgICAgV0kuc2hvd1NvdXJjZUNv ZGVMb2NhdGlvbihicmVha3BvaW50LnNvdXJjZUNvZGVMb2NhdGlvbik7Ci0gICAgICAgICAgICAg ICAgICAgIHJldHVybjsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9CisgICAgICAg ICAgICBXSS5zaG93U291cmNlQ29kZUxvY2F0aW9uKGJyZWFrcG9pbnQuc291cmNlQ29kZUxvY2F0 aW9uKTsKKyAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCiAgICAgICAgIGNvbnNvbGUu ZXJyb3IoIlVua25vd24gdHJlZSBlbGVtZW50IiwgdHJlZUVsZW1lbnQpOwo= 379937 2019-10-01 13:04:15 -0700 2019-10-01 13:41:40 -0700 Patch bug-196450.patch text/plain 4600 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGNlMmY4MTZkZGU4NzY1YjRkOTc1MmY2MTI3NDY3 NzVlY2ZmNjg1MTQuLjE4NzVmZmVlNzVhMzYzMGI2NTRlNDBkMWViZTk0MjQzODA4ZGU4MmUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE5LTEwLTAxICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBT b3VyY2VzOiBjbGlja2luZyBvbiBhIGJyZWFrcG9pbnQgY2hhbmdlcyB0aGUgcGF0aCBjb21wb25l bnRzIHRvIG5vdCBtYXRjaCB0aGUgc2NyaXB0J3MgcGF0aAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk2NDUwCisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS80OTQ4ODEwMD4KKworICAgICAgICBSZXZpZXdlZCBieSBNYXR0IEJha2VyLgorCisgICAgICAg IFdoZW4gc2VsZWN0aW5nIGFueSB0cmVlIGVsZW1lbnQgdGhhdCBpc24ndCBpbiB0aGUgcmVzb3Vy Y2VzIHRyZWUgb3V0bGluZSwgYXR0ZW1wdCB0byBmaW5kCisgICAgICAgIHRoZSBjb3JyZXNwb25k aW5nIHRyZWUgZWxlbWVudCBpbiB0aGUgcmVzb3VyY2VzIHRyZWUgb3V0bGluZSBhbmQgc2lsZW50 bHkgc2VsZWN0IHRoYXQgYXMKKyAgICAgICAgd2VsbCBzbyB0aGF0IHRoZSBoaWVyYXJjaGljYWwg cGF0aCBjb21wb25lbnQgc2hvd3MgdGhlIHJpZ2h0IGJyZWFkY3J1bWIgdHJhaWwuCisKKyAgICAg ICAgSWYgdGhlIHRyZWUgZWxlbWVudCBpcyBmb3IgYSBgV0kuU2NyaXB0YCB3aGljaCBoYXMgYSBj b3JyZXNwb25kaW5nIGBXSS5SZXNvdXJjZWAsIHVzZSB0aGUKKyAgICAgICAgYFdJLlJlc291cmNl YCBpbnN0ZWFkLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VzTmF2aWdh dGlvblNpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdJLlNvdXJjZXNOYXZpZ2F0aW9uU2lkZWJh clBhbmVsLnByb3RvdHlwZS5faGFuZGxlVHJlZVNlbGVjdGlvbkRpZENoYW5nZSk6CisKIDIwMTkt MDktMjYgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBX ZWIgSW5zcGVjdG9yOiBJbmNsdWRlIExvY2FsUmVzb3VyY2VPdmVycmlkZXMgaW4gdGhlIE9wZW4g UmVzb3VyY2UgZGlhbG9nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9Tb3VyY2VzTmF2aWdhdGlvblNpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZXNOYXZpZ2F0aW9uU2lkZWJh clBhbmVsLmpzCmluZGV4IGZkMjJiZWRhYjZkYThhNjQ2YjEyOGNjZGQzNDY5YTdhZjRjZjkxOGMu LjcwMjUwOGRjNTNiMzY3MTM1ZmUwM2U5MmViNTBiZDMzMjdjMzgwM2MgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZXNOYXZpZ2F0aW9u U2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1NvdXJjZXNOYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzCkBAIC0xNjgxLDEyICsxNjgx LDMyIEBAIFdJLlNvdXJjZXNOYXZpZ2F0aW9uU2lkZWJhclBhbmVsID0gY2xhc3MgU291cmNlc05h dmlnYXRpb25TaWRlYmFyUGFuZWwgZXh0ZW5kcyBXCiAgICAgICAgICAgICByZXR1cm47CiAgICAg ICAgIH0KIAorICAgICAgICAvLyBTaWxlbnRseSBzZWxlY3QgdGhlIGNvcnJlc3BvbmRpbmcgdHJl ZSBlbGVtZW50IGluIHRoZSByZXNvdXJjZXMgdHJlZSBvdXRsaW5lIHRvIHVwZGF0ZQorICAgICAg ICAvLyB0aGUgaGllcmFyY2hpY2FsIHBhdGggY29tcG9uZW50cyB0byBzaG93IHRoZSByaWdodCBh bmNlc3RvcihzKS4KKyAgICAgICAgbGV0IHNlbGVjdFRyZWVFbGVtZW50SW5SZXNvdXJjZXNUcmVl T3V0bGluZSA9IChzb3VyY2VDb2RlKSA9PiB7CisgICAgICAgICAgICBsZXQgcmVzb3VyY2VUcmVl RWxlbWVudCA9IHRoaXMuX3Jlc291cmNlc1RyZWVPdXRsaW5lLmZpbmRUcmVlRWxlbWVudChzb3Vy Y2VDb2RlKTsKKyAgICAgICAgICAgIGlmICghcmVzb3VyY2VUcmVlRWxlbWVudCkKKyAgICAgICAg ICAgICAgICByZXR1cm47CisKKyAgICAgICAgICAgIGNvbnN0IG9taXRGb2N1cyA9IHRydWU7Cisg ICAgICAgICAgICBjb25zdCBzZWxlY3RlZEJ5VXNlciA9IGZhbHNlOworICAgICAgICAgICAgY29u c3Qgc3VwcHJlc3NOb3RpZmljYXRpb24gPSB0cnVlOworICAgICAgICAgICAgcmVzb3VyY2VUcmVl RWxlbWVudC5zZWxlY3Qob21pdEZvY3VzLCBzZWxlY3RlZEJ5VXNlciwgc3VwcHJlc3NOb3RpZmlj YXRpb24pOworICAgICAgICB9OworCiAgICAgICAgIGlmICh0cmVlRWxlbWVudCBpbnN0YW5jZW9m IFdJLkZvbGRlclRyZWVFbGVtZW50CiAgICAgICAgICAgICB8fCB0cmVlRWxlbWVudCBpbnN0YW5j ZW9mIFdJLk9yaWdpblRyZWVFbGVtZW50CiAgICAgICAgICAgICB8fCB0cmVlRWxlbWVudCBpbnN0 YW5jZW9mIFdJLlJlc291cmNlVHJlZUVsZW1lbnQKICAgICAgICAgICAgIHx8IHRyZWVFbGVtZW50 IGluc3RhbmNlb2YgV0kuU2NyaXB0VHJlZUVsZW1lbnQKICAgICAgICAgICAgIHx8IHRyZWVFbGVt ZW50IGluc3RhbmNlb2YgV0kuQ1NTU3R5bGVTaGVldFRyZWVFbGVtZW50KSB7CiAgICAgICAgICAg ICBsZXQgcmVwcmVzZW50ZWRPYmplY3QgPSB0cmVlRWxlbWVudC5yZXByZXNlbnRlZE9iamVjdDsK KworICAgICAgICAgICAgaWYgKHJlcHJlc2VudGVkT2JqZWN0IGluc3RhbmNlb2YgV0kuU2NyaXB0 ICYmIHJlcHJlc2VudGVkT2JqZWN0LnJlc291cmNlKQorICAgICAgICAgICAgICAgIHJlcHJlc2Vu dGVkT2JqZWN0ID0gcmVwcmVzZW50ZWRPYmplY3QucmVzb3VyY2U7CisKKyAgICAgICAgICAgIGlm ICh0cmVlRWxlbWVudC50cmVlT3V0bGluZSAhPT0gdGhpcy5fcmVzb3VyY2VzVHJlZU91dGxpbmUp CisgICAgICAgICAgICAgICAgc2VsZWN0VHJlZUVsZW1lbnRJblJlc291cmNlc1RyZWVPdXRsaW5l KHJlcHJlc2VudGVkT2JqZWN0KTsKKwogICAgICAgICAgICAgaWYgKHJlcHJlc2VudGVkT2JqZWN0 IGluc3RhbmNlb2YgV0kuQ29sbGVjdGlvbiB8fCByZXByZXNlbnRlZE9iamVjdCBpbnN0YW5jZW9m IFdJLlNvdXJjZUNvZGUgfHwgcmVwcmVzZW50ZWRPYmplY3QgaW5zdGFuY2VvZiBXSS5GcmFtZSkK ICAgICAgICAgICAgICAgICBXSS5zaG93UmVwcmVzZW50ZWRPYmplY3QocmVwcmVzZW50ZWRPYmpl Y3QpOwogICAgICAgICAgICAgcmV0dXJuOwpAQCAtMTcxMSwxOCArMTczMSwxMyBAQCBXSS5Tb3Vy Y2VzTmF2aWdhdGlvblNpZGViYXJQYW5lbCA9IGNsYXNzIFNvdXJjZXNOYXZpZ2F0aW9uU2lkZWJh clBhbmVsIGV4dGVuZHMgVwogICAgICAgICAgICAgaWYgKFdJLmRlYnVnZ2VyTWFuYWdlci5pc0Jy ZWFrcG9pbnRTcGVjaWFsKGJyZWFrcG9pbnQpKQogICAgICAgICAgICAgICAgIHJldHVybjsKIAot ICAgICAgICAgICAgaWYgKHRyZWVFbGVtZW50LnRyZWVPdXRsaW5lID09PSB0aGlzLl9wYXVzZVJl YXNvblRyZWVPdXRsaW5lKSB7Ci0gICAgICAgICAgICAgICAgV0kuc2hvd1NvdXJjZUNvZGVMb2Nh dGlvbihicmVha3BvaW50LnNvdXJjZUNvZGVMb2NhdGlvbik7Ci0gICAgICAgICAgICAgICAgcmV0 dXJuOwotICAgICAgICAgICAgfQorICAgICAgICAgICAgbGV0IHNvdXJjZUNvZGUgPSBicmVha3Bv aW50LnNvdXJjZUNvZGVMb2NhdGlvbi5kaXNwbGF5U291cmNlQ29kZTsKKyAgICAgICAgICAgIGlm IChzb3VyY2VDb2RlIGluc3RhbmNlb2YgV0kuU2NyaXB0ICYmIHNvdXJjZUNvZGUucmVzb3VyY2Up CisgICAgICAgICAgICAgICAgc291cmNlQ29kZSA9IHNvdXJjZUNvZGUucmVzb3VyY2U7CisgICAg ICAgICAgICBzZWxlY3RUcmVlRWxlbWVudEluUmVzb3VyY2VzVHJlZU91dGxpbmUoc291cmNlQ29k ZSk7CiAKLSAgICAgICAgICAgIGlmICh0cmVlRWxlbWVudC5wYXJlbnQucmVwcmVzZW50ZWRPYmpl Y3QpIHsKLSAgICAgICAgICAgICAgICBjb25zb2xlLmFzc2VydCh0cmVlRWxlbWVudC5wYXJlbnQu cmVwcmVzZW50ZWRPYmplY3QgaW5zdGFuY2VvZiBXSS5Tb3VyY2VDb2RlKTsKLSAgICAgICAgICAg ICAgICBpZiAodHJlZUVsZW1lbnQucGFyZW50LnJlcHJlc2VudGVkT2JqZWN0IGluc3RhbmNlb2Yg V0kuU291cmNlQ29kZSkgewotICAgICAgICAgICAgICAgICAgICBXSS5zaG93U291cmNlQ29kZUxv Y2F0aW9uKGJyZWFrcG9pbnQuc291cmNlQ29kZUxvY2F0aW9uKTsKLSAgICAgICAgICAgICAgICAg ICAgcmV0dXJuOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIH0KKyAgICAgICAgICAg IFdJLnNob3dTb3VyY2VDb2RlTG9jYXRpb24oYnJlYWtwb2ludC5zb3VyY2VDb2RlTG9jYXRpb24p OworICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKICAgICAgICAgY29uc29sZS5lcnJv cigiVW5rbm93biB0cmVlIGVsZW1lbnQiLCB0cmVlRWxlbWVudCk7Cg==