199953 2019-07-19 11:03:20 -0700 Web Inspector: REGRESSION: no context menu items work when context menu clicking on "Add Breakpoint" 2019-07-24 17:48:21 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=199946 InRadar P2 Normal --- 1 hi hi commit-queue hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1554252 0 hi 2019-07-19 11:03:20 -0700 # STEPS TO REPRODUCE: 1. inspect any page 2. go to the Debugger/Sources tab 3. show the navigation sidebar 4. context menu (right) click on the + 5. select any of the items => nothing happens 1554326 1 374496 hi 2019-07-19 14:37:08 -0700 Created attachment 374496 Patch 1555579 2 374496 joepeck 2019-07-24 17:02:24 -0700 Comment on attachment 374496 Patch Very nice! r=me 1555595 3 374496 commit-queue 2019-07-24 17:42:29 -0700 Comment on attachment 374496 Patch Clearing flags on attachment: 374496 Committed r247803: <https://trac.webkit.org/changeset/247803> 1555596 4 commit-queue 2019-07-24 17:42:31 -0700 All reviewed patches have been landed. Closing bug. 1555600 5 webkit-bug-importer 2019-07-24 17:48:21 -0700 <rdar://problem/53521425> 374496 2019-07-19 14:37:08 -0700 2019-07-24 17:42:29 -0700 Patch bug-199953-20190719143707.patch text/plain 21199 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGFmZTZhZTcwOGViYmQ1MWQyODQzMWQ3OTBmZDc2 MjJlYTgyYTJhZTUuLmEwZjE1ZDEwM2IwYWUzNWU1OTljNGI5Y2FlMmNiYjgwYzhhZDBjNDcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDE5LTA3LTE5ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBS RUdSRVNTSU9OOiBubyBjb250ZXh0IG1lbnUgaXRlbXMgd29yayB3aGVuIGNvbnRleHQgbWVudSBj bGlja2luZyBvbiAiQWRkIEJyZWFrcG9pbnQiCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xOTk5NTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29udGV4dE1lbnVVdGls aXRpZXMuanM6CisgICAgICAgIChXSS5hZGRNb3VzZURvd25Db250ZXh0TWVudUhhbmRsZXJzKTog QWRkZWQuCisgICAgICAgIENyZWF0ZSBhIGhlbHBlciBmdW5jdGlvbiBmb3IgbWFuYWdpbmcgZWxl bWVudHMgdGhhdCBzaG93IGEgY29udGV4dCBtZW51IG9uICJtb3VzZWRvd24iLgorCisgICAgICAg ICogVXNlckludGVyZmFjZS9CYXNlL1NlYXJjaFV0aWxpdGllcy5qczoKKyAgICAgICAgKFdJLlNl YXJjaFV0aWxpdGllcy5jcmVhdGVTZXR0aW5nc0J1dHRvbik6CisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9DYW52YXNDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLkNhbnZhc0NvbnRl bnRWaWV3LnByb3RvdHlwZS5pbml0aWFsTGF5b3V0KToKKyAgICAgICAgKFdJLkNhbnZhc0NvbnRl bnRWaWV3LnByb3RvdHlwZS5fcG9wdWxhdGVDYW52YXNFbGVtZW50QnV0dG9uQ29udGV4dE1lbnUp OiBBZGRlZC4KKyAgICAgICAgKFdJLkNhbnZhc0NvbnRlbnRWaWV3LnByb3RvdHlwZS5fcG9wdWxh dGVWaWV3U2hhZGVyQnV0dG9uQ29udGV4dE1lbnUpOiBBZGRlZC4KKyAgICAgICAgKFdJLkNhbnZh c0NvbnRlbnRWaWV3LnByb3RvdHlwZS5fcG9wdWxhdGVWaWV3UmVjb3JkaW5nQnV0dG9uQ29udGV4 dE1lbnUpOiBBZGRlZC4KKyAgICAgICAgKFdJLkNhbnZhc0NvbnRlbnRWaWV3LnByb3RvdHlwZS5f aGFuZGxlQ2FudmFzRWxlbWVudEJ1dHRvbk1vdXNlRG93bik6IERlbGV0ZWQuCisgICAgICAgIChX SS5DYW52YXNDb250ZW50Vmlldy5wcm90b3R5cGUuX2hhbmRsZVZpZXdTaGFkZXJCdXR0b25Nb3Vz ZURvd24pOiBEZWxldGVkLgorICAgICAgICAoV0kuQ2FudmFzQ29udGVudFZpZXcucHJvdG90eXBl Ll9oYW5kbGVWaWV3UmVjb3JkaW5nQnV0dG9uTW91c2VEb3duKTogRGVsZXRlZC4KKyAgICAgICAg KiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2VyU2lkZWJhclBhbmVsLmpzOgorICAgICAgICAo V0kuRGVidWdnZXJTaWRlYmFyUGFuZWwpOgorICAgICAgICAoV0kuRGVidWdnZXJTaWRlYmFyUGFu ZWwucHJvdG90eXBlLl9wb3B1bGF0ZUNyZWF0ZUJyZWFrcG9pbnRDb250ZXh0TWVudSk6IEFkZGVk LgorICAgICAgICAoV0kuRGVidWdnZXJTaWRlYmFyUGFuZWwucHJvdG90eXBlLl9oYW5kbGVDcmVh dGVCcmVha3BvaW50TW91c2VEb3duKTogRGVsZXRlZC4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL1NvdXJjZXNOYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzOgorICAgICAgICAoV0kuU291 cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwpOgorICAgICAgICAoV0kuU291cmNlc05hdmlnYXRp b25TaWRlYmFyUGFuZWwucHJvdG90eXBlLl9wb3B1bGF0ZVJlc291cmNlR3JvdXBpbmdNb2RlQ29u dGV4dE1lbnUpOiBBZGRlZC4KKyAgICAgICAgKFdJLlNvdXJjZXNOYXZpZ2F0aW9uU2lkZWJhclBh bmVsLnByb3RvdHlwZS5fcG9wdWxhdGVDcmVhdGVCcmVha3BvaW50Q29udGV4dE1lbnUpOiBBZGRl ZC4KKyAgICAgICAgKFdJLlNvdXJjZXNOYXZpZ2F0aW9uU2lkZWJhclBhbmVsLnByb3RvdHlwZS5f aGFuZGxlUmVzb3VyY2VHcm91cGluZ01vZGVNb3VzZURvd24pOiBEZWxldGVkLgorICAgICAgICAo V0kuU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwucHJvdG90eXBlLl9oYW5kbGVDcmVhdGVC cmVha3BvaW50TW91c2VEb3duKTogRGVsZXRlZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvVGFiQmFyLmpzOgorICAgICAgICAoV0kuVGFiQmFyKToKKyAgICAgICAgKFdJLlRhYkJh ci5wcm90b3R5cGUuX2hhbmRsZVRhYlBpY2tlclRhYkNvbnRleHRNZW51KTogRGVsZXRlZC4KKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0xlZ2FjeVRhYkJhci5qczoKKyAgICAgICAgKFdJ LkxlZ2FjeVRhYkJhcik6CisgICAgICAgIChXSS5MZWdhY3lUYWJCYXIucHJvdG90eXBlLl9oYW5k bGVUYWJQaWNrZXJUYWJDb250ZXh0TWVudSk6IERlbGV0ZWQuCisgICAgICAgIFJlbW92ZSB0aGUg ImNvbnRleHRtZW51IiBoYW5kbGVyIG9uIHRoZSB0YWIgcGlja2VyLCBhcyB0aGF0J3MgYWxyZWFk eSB1c2VkIGJ5IHRoZSBlbnRpcmUKKyAgICAgICAgdGFiIGJhciB0byBzaG93L2hpZGUgdGFicy4K KwogMjAxOS0wNy0xNyAgT2xpdmllciBCbGluICA8b2xpdmllci5ibGluQHNvZnRhdGhvbWUuY29t PgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGFwcGxpY2F0aW9uL3htbCBjb250ZW50IG5vdCBz aG93bgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFz ZS9TZWFyY2hVdGlsaXRpZXMuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9CYXNlL1NlYXJjaFV0aWxpdGllcy5qcwppbmRleCA1YTU4NjU2ODYxYTUzZTliNzk2YmYwYTk5 NjE5YzY4ODE1MTZhMGE2Li5iNjgwOTM0OGEzODk0NzYwMDBkYjg2YTg2MjI3NjgxYmQ1NzYxM2Iy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1Nl YXJjaFV0aWxpdGllcy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9CYXNlL1NlYXJjaFV0aWxpdGllcy5qcwpAQCAtNzIsMjIgKzcyLDEwIEBAIFdJLlNlYXJjaFV0 aWxpdGllcyA9IGNsYXNzIFNlYXJjaFV0aWxpdGllcyB7CiAgICAgewogICAgICAgICBjb25zb2xl LmFzc2VydCghaXNFbXB0eU9iamVjdChzZXR0aW5ncykpOwogCi0gICAgICAgIGxldCBpZ25vcmVN b3VzZURvd24gPSBmYWxzZTsKLQogICAgICAgICBsZXQgYnV0dG9uID0gZG9jdW1lbnQuY3JlYXRl RWxlbWVudCgiYnV0dG9uIik7Ci0gICAgICAgIGJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKCJtb3Vz ZWRvd24iLCAoZXZlbnQpID0+IHsKLSAgICAgICAgICAgIGV2ZW50LnN0b3AoKTsKLQotICAgICAg ICAgICAgaWYgKGlnbm9yZU1vdXNlRG93bikKLSAgICAgICAgICAgICAgICByZXR1cm47Ci0KLSAg ICAgICAgICAgIGlnbm9yZU1vdXNlRG93biA9IHRydWU7Ci0KLSAgICAgICAgICAgIGxldCBjb250 ZXh0TWVudSA9IFdJLkNvbnRleHRNZW51LmNyZWF0ZUZyb21FdmVudChldmVudCk7Ci0gICAgICAg ICAgICBjb250ZXh0TWVudS5hZGRCZWZvcmVTaG93Q2FsbGJhY2soKCkgPT4gewotICAgICAgICAg ICAgICAgIGlnbm9yZU1vdXNlRG93biA9IGZhbHNlOwotICAgICAgICAgICAgfSk7Ci0KKyAgICAg ICAgYnV0dG9uLmNsYXNzTGlzdC5hZGQoInNlYXJjaC1zZXR0aW5ncyIpOworICAgICAgICBidXR0 b24udGFiSW5kZXggPSAtMTsKKyAgICAgICAgV0kuYWRkTW91c2VEb3duQ29udGV4dE1lbnVIYW5k bGVycyhidXR0b24sIChjb250ZXh0TWVudSkgPT4gewogICAgICAgICAgICAgaWYgKHNldHRpbmdz LmNhc2VTZW5zaXRpdmUpIHsKICAgICAgICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRDaGVj a2JveEl0ZW0oV0kuVUlTdHJpbmcoIkNhc2UgU2Vuc2l0aXZlIiwgIkNhc2UgU2Vuc2l0aXZlIEAg Q29udGV4dCBNZW51IiwgIkNvbnRleHQgbWVudSBsYWJlbCBmb3Igd2hldGhlciBzZWFyY2hlcyBz aG91bGQgYmUgY2FzZSBzZW5zaXRpdmUuIiksICgpID0+IHsKICAgICAgICAgICAgICAgICAgICAg c2V0dGluZ3MuY2FzZVNlbnNpdGl2ZS52YWx1ZSA9ICFzZXR0aW5ncy5jYXNlU2Vuc2l0aXZlLnZh bHVlOwpAQCAtOTksMTEgKzg3LDcgQEAgV0kuU2VhcmNoVXRpbGl0aWVzID0gY2xhc3MgU2VhcmNo VXRpbGl0aWVzIHsKICAgICAgICAgICAgICAgICAgICAgc2V0dGluZ3MucmVndWxhckV4cHJlc3Np b24udmFsdWUgPSAhc2V0dGluZ3MucmVndWxhckV4cHJlc3Npb24udmFsdWU7CiAgICAgICAgICAg ICAgICAgfSwgc2V0dGluZ3MucmVndWxhckV4cHJlc3Npb24udmFsdWUpOwogICAgICAgICAgICAg fQotCi0gICAgICAgICAgICBjb250ZXh0TWVudS5zaG93KCk7CiAgICAgICAgIH0pOwotICAgICAg ICBidXR0b24uY2xhc3NMaXN0LmFkZCgic2VhcmNoLXNldHRpbmdzIik7Ci0gICAgICAgIGJ1dHRv bi50YWJJbmRleCA9IC0xOwogCiAgICAgICAgIGJ1dHRvbi5hcHBlbmRDaGlsZChXSS5JbWFnZVV0 aWxpdGllcy51c2VTVkdTeW1ib2woIkltYWdlcy9HZWFyLnN2ZyIsICJnbHlwaCIpKTsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFz Q29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9DYW52YXNDb250ZW50Vmlldy5qcwppbmRleCA4MDY4ODQwMTIzMWI4NWE0YWQ4MWY1YTIxZTQw Yzk3MTI0ZDM2NjI4Li45MmMyNWNjNWVkNWZiODhiOGM3ODMxOGI2NGJlNDRkMzAzMzRmYTk4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52 YXNDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9DYW52YXNDb250ZW50Vmlldy5qcwpAQCAtMTEzLDcgKzExMyw3IEBAIFdJLkNhbnZh c0NvbnRlbnRWaWV3ID0gY2xhc3MgQ2FudmFzQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50 VmlldwogCiAgICAgICAgICAgICBsZXQgY2FudmFzRWxlbWVudEJ1dHRvbk5hdmlnYXRpb25JdGVt ID0gbmV3IFdJLkJ1dHRvbk5hdmlnYXRpb25JdGVtKCJjYW52YXMtZWxlbWVudCIsIFdJLlVJU3Ry aW5nKCJDYW52YXMgRWxlbWVudCIpLCAiSW1hZ2VzL01hcmt1cC5zdmciLCAxNiwgMTYpOwogICAg ICAgICAgICAgY2FudmFzRWxlbWVudEJ1dHRvbk5hdmlnYXRpb25JdGVtLnZpc2liaWxpdHlQcmlv cml0eSA9IFdJLk5hdmlnYXRpb25JdGVtLlZpc2liaWxpdHlQcmlvcml0eS5Mb3c7Ci0gICAgICAg ICAgICBjYW52YXNFbGVtZW50QnV0dG9uTmF2aWdhdGlvbkl0ZW0uZWxlbWVudC5hZGRFdmVudExp c3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl9oYW5kbGVDYW52YXNFbGVtZW50QnV0dG9uTW91c2VE b3duLmJpbmQodGhpcykpOworICAgICAgICAgICAgV0kuYWRkTW91c2VEb3duQ29udGV4dE1lbnVI YW5kbGVycyhjYW52YXNFbGVtZW50QnV0dG9uTmF2aWdhdGlvbkl0ZW0uZWxlbWVudCwgdGhpcy5f cG9wdWxhdGVDYW52YXNFbGVtZW50QnV0dG9uQ29udGV4dE1lbnUuYmluZCh0aGlzKSk7CiAgICAg ICAgICAgICBuYXZpZ2F0aW9uQmFyLmFkZE5hdmlnYXRpb25JdGVtKGNhbnZhc0VsZW1lbnRCdXR0 b25OYXZpZ2F0aW9uSXRlbSk7CiAKICAgICAgICAgICAgIG5hdmlnYXRpb25CYXIuYWRkTmF2aWdh dGlvbkl0ZW0odGhpcy5fcmVmcmVzaEJ1dHRvbk5hdmlnYXRpb25JdGVtKTsKQEAgLTEzNCwxMiAr MTM0LDEyIEBAIFdJLkNhbnZhc0NvbnRlbnRWaWV3ID0gY2xhc3MgQ2FudmFzQ29udGVudFZpZXcg ZXh0ZW5kcyBXSS5Db250ZW50VmlldwogICAgICAgICAgICAgdGhpcy5fdmlld1NoYWRlckJ1dHRv biA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImltZyIpOwogICAgICAgICAgICAgdGhpcy5fdmll d1NoYWRlckJ1dHRvbi5jbGFzc0xpc3QuYWRkKCJ2aWV3LXNoYWRlciIpOwogICAgICAgICAgICAg dGhpcy5fdmlld1NoYWRlckJ1dHRvbi50aXRsZSA9IFdJLlVJU3RyaW5nKCJWaWV3IFNoYWRlciIp OwotICAgICAgICAgICAgdGhpcy5fdmlld1NoYWRlckJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKCJt b3VzZWRvd24iLCB0aGlzLl9oYW5kbGVWaWV3U2hhZGVyQnV0dG9uTW91c2VEb3duLmJpbmQodGhp cykpOworICAgICAgICAgICAgV0kuYWRkTW91c2VEb3duQ29udGV4dE1lbnVIYW5kbGVycyh0aGlz Ll92aWV3U2hhZGVyQnV0dG9uLCB0aGlzLl9wb3B1bGF0ZVZpZXdTaGFkZXJCdXR0b25Db250ZXh0 TWVudS5iaW5kKHRoaXMpKTsKIAogICAgICAgICAgICAgdGhpcy5fdmlld1JlY29yZGluZ0J1dHRv biA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImltZyIpOwogICAgICAgICAgICAgdGhpcy5fdmll d1JlY29yZGluZ0J1dHRvbi5jbGFzc0xpc3QuYWRkKCJ2aWV3LXJlY29yZGluZyIpOwogICAgICAg ICAgICAgdGhpcy5fdmlld1JlY29yZGluZ0J1dHRvbi50aXRsZSA9IFdJLlVJU3RyaW5nKCJWaWV3 IFJlY29yZGluZyIpOwotICAgICAgICAgICAgdGhpcy5fdmlld1JlY29yZGluZ0J1dHRvbi5hZGRF dmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl9oYW5kbGVWaWV3UmVjb3JkaW5nQnV0dG9u TW91c2VEb3duLmJpbmQodGhpcykpOworICAgICAgICAgICAgV0kuYWRkTW91c2VEb3duQ29udGV4 dE1lbnVIYW5kbGVycyh0aGlzLl92aWV3UmVjb3JkaW5nQnV0dG9uLCB0aGlzLl9wb3B1bGF0ZVZp ZXdSZWNvcmRpbmdCdXR0b25Db250ZXh0TWVudS5iaW5kKHRoaXMpKTsKIAogICAgICAgICAgICAg dGhpcy5fdXBkYXRlVmlld1JlbGF0ZWRJdGVtcygpOwogCkBAIC0yOTAsMTggKzI5MCw4IEBAIFdJ LkNhbnZhc0NvbnRlbnRWaWV3ID0gY2xhc3MgQ2FudmFzQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5D b250ZW50VmlldwogICAgICAgICB9KTsKICAgICB9CiAKLSAgICBfaGFuZGxlQ2FudmFzRWxlbWVu dEJ1dHRvbk1vdXNlRG93bihldmVudCkKKyAgICBfcG9wdWxhdGVDYW52YXNFbGVtZW50QnV0dG9u Q29udGV4dE1lbnUoY29udGV4dE1lbnUpCiAgICAgewotICAgICAgICBpZiAodGhpcy5faWdub3Jl Q2FudmFzRWxlbWVudEJ1dHRvbk1vdXNlRG93bikKLSAgICAgICAgICAgIHJldHVybjsKLQotICAg ICAgICB0aGlzLl9pZ25vcmVDYW52YXNFbGVtZW50QnV0dG9uTW91c2VEb3duID0gdHJ1ZTsKLQot ICAgICAgICBsZXQgY29udGV4dE1lbnUgPSBXSS5Db250ZXh0TWVudS5jcmVhdGVGcm9tRXZlbnQo ZXZlbnQpOwotICAgICAgICBjb250ZXh0TWVudS5hZGRCZWZvcmVTaG93Q2FsbGJhY2soKCkgPT4g ewotICAgICAgICAgICAgdGhpcy5faWdub3JlQ2FudmFzRWxlbWVudEJ1dHRvbk1vdXNlRG93biA9 IGZhbHNlOwotICAgICAgICB9KTsKLQogICAgICAgICBpZiAodGhpcy5fY2FudmFzTm9kZSkKICAg ICAgICAgICAgIFdJLmFwcGVuZENvbnRleHRNZW51SXRlbXNGb3JET01Ob2RlKGNvbnRleHRNZW51 LCB0aGlzLl9jYW52YXNOb2RlKTsKIApAQCAtMzE3LDggKzMwNyw2IEBAIFdJLkNhbnZhc0NvbnRl bnRWaWV3ID0gY2xhc3MgQ2FudmFzQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50Vmlldwog ICAgICAgICAgICAgICAgIFdJLmNvbnNvbGVMb2dWaWV3Q29udHJvbGxlci5hcHBlbmRJbW1lZGlh dGVFeGVjdXRpb25XaXRoUmVzdWx0KHRleHQsIHJlbW90ZU9iamVjdCwgYWRkU3BlY2lhbFVzZXJM b2dDbGFzcyk7CiAgICAgICAgICAgICB9KTsKICAgICAgICAgfSk7Ci0KLSAgICAgICAgY29udGV4 dE1lbnUuc2hvdygpOwogICAgIH0KIAogICAgIF9zaG93R3JpZEJ1dHRvbkNsaWNrZWQoKQpAQCAt NDA1LDY1ICszOTMsNDEgQEAgV0kuQ2FudmFzQ29udGVudFZpZXcgPSBjbGFzcyBDYW52YXNDb250 ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAgICAgICAgICAgICB0aGlzLl92aWV3UmVs YXRlZEl0ZW1zQ29udGFpbmVyLmFwcGVuZENoaWxkKHRoaXMuX3ZpZXdSZWNvcmRpbmdCdXR0b24p OwogICAgIH0KIAotICAgIF9oYW5kbGVWaWV3U2hhZGVyQnV0dG9uTW91c2VEb3duKGV2ZW50KQor ICAgIF9wb3B1bGF0ZVZpZXdTaGFkZXJCdXR0b25Db250ZXh0TWVudShjb250ZXh0TWVudSwgZXZl bnQpCiAgICAgewotICAgICAgICBpZiAodGhpcy5faWdub3JlVmlld1NoYWRlckJ1dHRvbk1vdXNl RG93bikKLSAgICAgICAgICAgIHJldHVybjsKLQogICAgICAgICBsZXQgc2hhZGVyUHJvZ3JhbXMg PSB0aGlzLnJlcHJlc2VudGVkT2JqZWN0LnNoYWRlclByb2dyYW1Db2xsZWN0aW9uOwogICAgICAg ICBjb25zb2xlLmFzc2VydChzaGFkZXJQcm9ncmFtcy5zaXplKTsKICAgICAgICAgaWYgKCFzaGFk ZXJQcm9ncmFtcy5zaXplKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIGlmIChzaGFk ZXJQcm9ncmFtcy5zaXplID09PSAxKSB7CisgICAgICAgIGlmIChldmVudC5idXR0b24gPT09IDAg JiYgc2hhZGVyUHJvZ3JhbXMuc2l6ZSA9PT0gMSkgewogICAgICAgICAgICAgV0kuc2hvd1JlcHJl c2VudGVkT2JqZWN0KEFycmF5LmZyb20oc2hhZGVyUHJvZ3JhbXMpWzBdKTsKICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIHRoaXMuX2lnbm9yZVZpZXdTaGFkZXJCdXR0 b25Nb3VzZURvd24gPSB0cnVlOwotCi0gICAgICAgIGxldCBjb250ZXh0TWVudSA9IFdJLkNvbnRl eHRNZW51LmNyZWF0ZUZyb21FdmVudChldmVudCk7Ci0gICAgICAgIGNvbnRleHRNZW51LmFkZEJl Zm9yZVNob3dDYWxsYmFjaygoKSA9PiB7Ci0gICAgICAgICAgICB0aGlzLl9pZ25vcmVWaWV3U2hh ZGVyQnV0dG9uTW91c2VEb3duID0gZmFsc2U7Ci0gICAgICAgIH0pOwotCiAgICAgICAgIGZvciAo bGV0IHNoYWRlclByb2dyYW0gb2Ygc2hhZGVyUHJvZ3JhbXMpIHsKICAgICAgICAgICAgIGNvbnRl eHRNZW51LmFwcGVuZEl0ZW0oc2hhZGVyUHJvZ3JhbS5kaXNwbGF5TmFtZSwgKCkgPT4gewogICAg ICAgICAgICAgICAgIFdJLnNob3dSZXByZXNlbnRlZE9iamVjdChzaGFkZXJQcm9ncmFtKTsKICAg ICAgICAgICAgIH0pOwogICAgICAgICB9Ci0KLSAgICAgICAgY29udGV4dE1lbnUuc2hvdygpOwog ICAgIH0KIAotICAgIF9oYW5kbGVWaWV3UmVjb3JkaW5nQnV0dG9uTW91c2VEb3duKGV2ZW50KQor ICAgIF9wb3B1bGF0ZVZpZXdSZWNvcmRpbmdCdXR0b25Db250ZXh0TWVudShjb250ZXh0TWVudSwg ZXZlbnQpCiAgICAgewotICAgICAgICBpZiAodGhpcy5faWdub3JlVmlld1JlY29yZGluZ0J1dHRv bk1vdXNlRG93bikKLSAgICAgICAgICAgIHJldHVybjsKLQogICAgICAgICBsZXQgcmVjb3JkaW5n cyA9IHRoaXMucmVwcmVzZW50ZWRPYmplY3QucmVjb3JkaW5nQ29sbGVjdGlvbjsKICAgICAgICAg Y29uc29sZS5hc3NlcnQocmVjb3JkaW5ncy5zaXplKTsKICAgICAgICAgaWYgKCFyZWNvcmRpbmdz LnNpemUpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgaWYgKHJlY29yZGluZ3Muc2l6 ZSA9PT0gMSkgeworICAgICAgICBpZiAoZXZlbnQuYnV0dG9uID09PSAwICYmIHJlY29yZGluZ3Mu c2l6ZSA9PT0gMSkgewogICAgICAgICAgICAgV0kuc2hvd1JlcHJlc2VudGVkT2JqZWN0KEFycmF5 LmZyb20ocmVjb3JkaW5ncylbMF0pOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAK LSAgICAgICAgdGhpcy5faWdub3JlVmlld1JlY29yZGluZ0J1dHRvbk1vdXNlRG93biA9IHRydWU7 Ci0KLSAgICAgICAgbGV0IGNvbnRleHRNZW51ID0gV0kuQ29udGV4dE1lbnUuY3JlYXRlRnJvbUV2 ZW50KGV2ZW50KTsKLSAgICAgICAgY29udGV4dE1lbnUuYWRkQmVmb3JlU2hvd0NhbGxiYWNrKCgp ID0+IHsKLSAgICAgICAgICAgIHRoaXMuX2lnbm9yZVZpZXdSZWNvcmRpbmdCdXR0b25Nb3VzZURv d24gPSBmYWxzZTsKLSAgICAgICAgfSk7Ci0KICAgICAgICAgZm9yIChsZXQgcmVjb3JkaW5nIG9m IHJlY29yZGluZ3MpIHsKICAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0ocmVjb3Jk aW5nLmRpc3BsYXlOYW1lLCAoKSA9PiB7CiAgICAgICAgICAgICAgICAgV0kuc2hvd1JlcHJlc2Vu dGVkT2JqZWN0KHJlY29yZGluZyk7CiAgICAgICAgICAgICB9KTsKICAgICAgICAgfQotCi0gICAg ICAgIGNvbnRleHRNZW51LnNob3coKTsKICAgICB9CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGV4dE1lbnVVdGlsaXRpZXMuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZXh0TWVudVV0 aWxpdGllcy5qcwppbmRleCA1YzI3ZTJiZWY1MTdhM2Y5ODVlZDIyMjRkNTlkNDhhMWIxNGFiMWY1 Li5mODM3MGY5N2I1NjU5MjljNmMxNGJhMjY5OTc2ZTAyNDVhNTY1Yjg0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZXh0TWVudVV0aWxp dGllcy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9D b250ZXh0TWVudVV0aWxpdGllcy5qcwpAQCAtMjMsNiArMjMsMzYgQEAKICAqIFRIRSBQT1NTSUJJ TElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwogCitXSS5hZGRNb3VzZURvd25Db250ZXh0TWVudUhh bmRsZXJzID0gZnVuY3Rpb24oZWxlbWVudCwgcG9wdWxhdGVDb250ZXh0TWVudUNhbGxiYWNrKQor eworICAgIGxldCBpZ25vcmVNb3VzZURvd24gPSBmYWxzZTsKKyAgICBlbGVtZW50LmFkZEV2ZW50 TGlzdGVuZXIoIm1vdXNlZG93biIsIChldmVudCkgPT4geworICAgICAgICBpZiAoZXZlbnQuYnV0 dG9uICE9PSAwKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGV2ZW50LnN0b3AoKTsK KworICAgICAgICBpZiAoaWdub3JlTW91c2VEb3duKQorICAgICAgICAgICAgcmV0dXJuOworCisg ICAgICAgIGlnbm9yZU1vdXNlRG93biA9IHRydWU7CisKKyAgICAgICAgbGV0IGNvbnRleHRNZW51 ID0gV0kuQ29udGV4dE1lbnUuY3JlYXRlRnJvbUV2ZW50KGV2ZW50KTsKKyAgICAgICAgY29udGV4 dE1lbnUuYWRkQmVmb3JlU2hvd0NhbGxiYWNrKCgpID0+IHsKKyAgICAgICAgICAgIGlnbm9yZU1v dXNlRG93biA9IGZhbHNlOworICAgICAgICB9KTsKKworICAgICAgICBwb3B1bGF0ZUNvbnRleHRN ZW51Q2FsbGJhY2soY29udGV4dE1lbnUsIGV2ZW50KTsKKworICAgICAgICBjb250ZXh0TWVudS5z aG93KCk7CisgICAgfSk7CisKKyAgICBlbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNvbnRleHRt ZW51IiwgKGV2ZW50KSA9PiB7CisgICAgICAgIGxldCBjb250ZXh0TWVudSA9IFdJLkNvbnRleHRN ZW51LmNyZWF0ZUZyb21FdmVudChldmVudCk7CisgICAgICAgIHBvcHVsYXRlQ29udGV4dE1lbnVD YWxsYmFjayhjb250ZXh0TWVudSwgZXZlbnQpOworICAgIH0pOworfTsKKwogV0kuYXBwZW5kQ29u dGV4dE1lbnVJdGVtc0ZvclNvdXJjZUNvZGUgPSBmdW5jdGlvbihjb250ZXh0TWVudSwgc291cmNl Q29kZU9yTG9jYXRpb24pCiB7CiAgICAgY29uc29sZS5hc3NlcnQoY29udGV4dE1lbnUgaW5zdGFu Y2VvZiBXSS5Db250ZXh0TWVudSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9EZWJ1Z2dlclNpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2VyU2lkZWJhclBhbmVsLmpzCmlu ZGV4IDUyNjdlMGExMmE5MTc1YWZmM2UzYWEzMzI3M2IyZDdlZGQ1OTI5ZjYuLjNiMGJhNzQxYWU4 NWMxZDE2MjBjMTBlZGE3ODQwMWIyMzU1ZWEyMzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2VyU2lkZWJhclBhbmVsLmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2VyU2lkZWJh clBhbmVsLmpzCkBAIC0xNTcsNyArMTU3LDcgQEAgV0kuRGVidWdnZXJTaWRlYmFyUGFuZWwgPSBj bGFzcyBEZWJ1Z2dlclNpZGViYXJQYW5lbCBleHRlbmRzIFdJLk5hdmlnYXRpb25TaWRlYmEKICAg ICAgICAgYnJlYWtwb2ludE5hdmlnYXRpb25CYXJXcmFwcGVyLmFwcGVuZENoaWxkKGJyZWFrcG9p bnROYXZpZ2F0aW9uQmFyLmVsZW1lbnQpOwogCiAgICAgICAgIHRoaXMuX2NyZWF0ZUJyZWFrcG9p bnRCdXR0b24gPSBuZXcgV0kuQnV0dG9uTmF2aWdhdGlvbkl0ZW0oImNyZWF0ZS1icmVha3BvaW50 IiwgV0kuVUlTdHJpbmcoIkNyZWF0ZSBCcmVha3BvaW50IiksICJJbWFnZXMvUGx1czEzLnN2ZyIs IDEzLCAxMyk7Ci0gICAgICAgIHRoaXMuX2NyZWF0ZUJyZWFrcG9pbnRCdXR0b24uZWxlbWVudC5h ZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl9oYW5kbGVDcmVhdGVCcmVha3BvaW50 TW91c2VEb3duLmJpbmQodGhpcykpOworICAgICAgICBXSS5hZGRNb3VzZURvd25Db250ZXh0TWVu dUhhbmRsZXJzKHRoaXMuX2NyZWF0ZUJyZWFrcG9pbnRCdXR0b24uZWxlbWVudCwgdGhpcy5fcG9w dWxhdGVDcmVhdGVCcmVha3BvaW50Q29udGV4dE1lbnUuYmluZCh0aGlzKSk7CiAgICAgICAgIGJy ZWFrcG9pbnROYXZpZ2F0aW9uQmFyLmFkZE5hdmlnYXRpb25JdGVtKHRoaXMuX2NyZWF0ZUJyZWFr cG9pbnRCdXR0b24pOwogCiAgICAgICAgIGxldCBicmVha3BvaW50c0dyb3VwID0gbmV3IFdJLkRl dGFpbHNTZWN0aW9uR3JvdXAoW2JyZWFrcG9pbnRzUm93XSk7CkBAIC0xNDY0LDE4ICsxNDY0LDgg QEAgV0kuRGVidWdnZXJTaWRlYmFyUGFuZWwgPSBjbGFzcyBEZWJ1Z2dlclNpZGViYXJQYW5lbCBl eHRlbmRzIFdJLk5hdmlnYXRpb25TaWRlYmEKICAgICAgICAgICAgIHNldHRpbmcudmFsdWUgPSAh IXRyZWVFbGVtZW50LnBhcmVudDsKICAgICB9CiAKLSAgICBfaGFuZGxlQ3JlYXRlQnJlYWtwb2lu dE1vdXNlRG93bihldmVudCkKKyAgICBfcG9wdWxhdGVDcmVhdGVCcmVha3BvaW50Q29udGV4dE1l bnUoY29udGV4dE1lbnUpCiAgICAgewotICAgICAgICBpZiAodGhpcy5faWdub3JlQ3JlYXRlQnJl YWtwb2ludE1vdXNlRG93bikKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICB0aGlzLl9p Z25vcmVDcmVhdGVCcmVha3BvaW50TW91c2VEb3duID0gdHJ1ZTsKLQotICAgICAgICBsZXQgY29u dGV4dE1lbnUgPSBXSS5Db250ZXh0TWVudS5jcmVhdGVGcm9tRXZlbnQoZXZlbnQpOwotICAgICAg ICBjb250ZXh0TWVudS5hZGRCZWZvcmVTaG93Q2FsbGJhY2soKCkgPT4gewotICAgICAgICAgICAg dGhpcy5faWdub3JlQ3JlYXRlQnJlYWtwb2ludE1vdXNlRG93biA9IGZhbHNlOwotICAgICAgICB9 KTsKLQogICAgICAgICAvLyBDT01QQVRJQklMSVRZIChpT1MgMTApOiBEZWJ1Z2dlckFnZW50LnNl dFBhdXNlT25Bc3NlcnRpb25zIGRpZCBub3QgZXhpc3QgeWV0LgogICAgICAgICBpZiAoSW5zcGVj dG9yQmFja2VuZC5kb21haW5zLkRlYnVnZ2VyLnNldFBhdXNlT25Bc3NlcnRpb25zKSB7CiAgICAg ICAgICAgICBsZXQgYXNzZXJ0aW9uRmFpbHVyZXNCcmVha3BvaW50U2hvd24gPSBXSS5zZXR0aW5n cy5zaG93QXNzZXJ0aW9uRmFpbHVyZXNCcmVha3BvaW50LnZhbHVlOwpAQCAtMTUxNiw4ICsxNTA2 LDYgQEAgV0kuRGVidWdnZXJTaWRlYmFyUGFuZWwgPSBjbGFzcyBEZWJ1Z2dlclNpZGViYXJQYW5l bCBleHRlbmRzIFdJLk5hdmlnYXRpb25TaWRlYmEKICAgICAgICAgICAgICAgICBwb3BvdmVyLnNo b3codGhpcy5fY3JlYXRlQnJlYWtwb2ludEJ1dHRvbi5lbGVtZW50LCBbV0kuUmVjdEVkZ2UuTUFY X1ksIFdJLlJlY3RFZGdlLk1JTl9ZLCBXSS5SZWN0RWRnZS5NQVhfWF0pOwogICAgICAgICAgICAg fSk7CiAgICAgICAgIH0KLQotICAgICAgICBjb250ZXh0TWVudS5zaG93KCk7CiAgICAgfQogfTsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv TGVnYWN5VGFiQmFyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvTGVnYWN5VGFiQmFyLmpzCmluZGV4IDhjYmJiYjc2NDBhODVjOWE0M2Q5NmI1YTRjNGYyNzZi ZjA3MWE3ZDguLjEwZTA3YjBmYjkwMWZlNjZjYjIzMWVmOWRhOTNlM2ZmNDE0OGNkZTIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xlZ2FjeVRh YkJhci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9M ZWdhY3lUYWJCYXIuanMKQEAgLTU1LDcgKzU1LDYgQEAgV0kuTGVnYWN5VGFiQmFyID0gY2xhc3Mg TGVnYWN5VGFiQmFyIGV4dGVuZHMgV0kuVmlldwogCiAgICAgICAgIHRoaXMuX3RhYlBpY2tlclRh YkJhckl0ZW0gPSBuZXcgV0kuUGlubmVkVGFiQmFySXRlbSgiSW1hZ2VzL1RhYlBpY2tlci5zdmci LCBXSS5VSVN0cmluZygiU2hvdyBoaWRkZW4gdGFicyIpKTsKICAgICAgICAgdGhpcy5fdGFiUGlj a2VyVGFiQmFySXRlbS5lbGVtZW50LmNsYXNzTGlzdC5hZGQoInRhYi1waWNrZXIiKTsKLSAgICAg ICAgdGhpcy5fdGFiUGlja2VyVGFiQmFySXRlbS5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNv bnRleHRtZW51IiwgdGhpcy5faGFuZGxlVGFiUGlja2VyVGFiQ29udGV4dE1lbnUuYmluZCh0aGlz KSk7CiAgICAgICAgIHRoaXMuYWRkVGFiQmFySXRlbSh0aGlzLl90YWJQaWNrZXJUYWJCYXJJdGVt LCB7c3VwcHJlc3NBbmltYXRpb25zOiB0cnVlfSk7CiAgICAgfQogCkBAIC04NTAsMTkgKzg0OSw2 IEBAIFdJLkxlZ2FjeVRhYkJhciA9IGNsYXNzIExlZ2FjeVRhYkJhciBleHRlbmRzIFdJLlZpZXcK ICAgICAgICAgV0kuc2hvd05ld1RhYlRhYigpOwogICAgIH0KIAotICAgIF9oYW5kbGVUYWJQaWNr ZXJUYWJDb250ZXh0TWVudShldmVudCkKLSAgICB7Ci0gICAgICAgIGlmICghdGhpcy5faGlkZGVu VGFiQmFySXRlbXMubGVuZ3RoKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIGxldCBj b250ZXh0TWVudSA9IFdJLkNvbnRleHRNZW51LmNyZWF0ZUZyb21FdmVudChldmVudCk7Ci0gICAg ICAgIGZvciAobGV0IGl0ZW0gb2YgdGhpcy5faGlkZGVuVGFiQmFySXRlbXMpIHsKLSAgICAgICAg ICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oaXRlbS50aXRsZSwgKCkgPT4gewotICAgICAgICAg ICAgICAgIHRoaXMuc2VsZWN0ZWRUYWJCYXJJdGVtID0gaXRlbTsKLSAgICAgICAgICAgIH0pOwot ICAgICAgICB9Ci0gICAgfQotCiAgICAgX2hhbmRsZU5ld1RhYk1vdXNlRW50ZXIoZXZlbnQpCiAg ICAgewogICAgICAgICBpZiAoIXRoaXMuX3RhYkFuaW1hdGVkQ2xvc2VkU2luY2VNb3VzZUVudGVy IHx8ICF0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmNvbnRhaW5zKCJzdGF0aWMtbGF5b3V0IikgfHwg dGhpcy5lbGVtZW50LmNsYXNzTGlzdC5jb250YWlucygiYW5pbWF0aW5nIikpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VzTmF2aWdh dGlvblNpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1NvdXJjZXNOYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzCmluZGV4IGRhNTlkMTdmMDQ4 Y2NiMTdlY2I2YTQ4Yzg1ODYyMDFiZWZhMTgzZDEuLmU5NTBiM2YwNTE1NGYxMTc3ZDcyMWY2YTVj ODA1YmIwNmRlOTlhYTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1NvdXJjZXNOYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZXNOYXZpZ2F0aW9uU2lk ZWJhclBhbmVsLmpzCkBAIC0xODgsNyArMTg4LDcgQEAgV0kuU291cmNlc05hdmlnYXRpb25TaWRl YmFyUGFuZWwgPSBjbGFzcyBTb3VyY2VzTmF2aWdhdGlvblNpZGViYXJQYW5lbCBleHRlbmRzIFcK ICAgICAgICAgYnJlYWtwb2ludE5hdmlnYXRpb25CYXJXcmFwcGVyLmFwcGVuZENoaWxkKGJyZWFr cG9pbnROYXZpZ2F0aW9uQmFyLmVsZW1lbnQpOwogCiAgICAgICAgIHRoaXMuX2NyZWF0ZUJyZWFr cG9pbnRCdXR0b24gPSBuZXcgV0kuQnV0dG9uTmF2aWdhdGlvbkl0ZW0oImNyZWF0ZS1icmVha3Bv aW50IiwgV0kuVUlTdHJpbmcoIkNyZWF0ZSBCcmVha3BvaW50IiksICJJbWFnZXMvUGx1czEzLnN2 ZyIsIDEzLCAxMyk7Ci0gICAgICAgIHRoaXMuX2NyZWF0ZUJyZWFrcG9pbnRCdXR0b24uZWxlbWVu dC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl9oYW5kbGVDcmVhdGVCcmVha3Bv aW50TW91c2VEb3duLmJpbmQodGhpcykpOworICAgICAgICBXSS5hZGRNb3VzZURvd25Db250ZXh0 TWVudUhhbmRsZXJzKHRoaXMuX2NyZWF0ZUJyZWFrcG9pbnRCdXR0b24uZWxlbWVudCwgdGhpcy5f cG9wdWxhdGVDcmVhdGVCcmVha3BvaW50Q29udGV4dE1lbnUuYmluZCh0aGlzKSk7CiAgICAgICAg IGJyZWFrcG9pbnROYXZpZ2F0aW9uQmFyLmFkZE5hdmlnYXRpb25JdGVtKHRoaXMuX2NyZWF0ZUJy ZWFrcG9pbnRCdXR0b24pOwogCiAgICAgICAgIGxldCBicmVha3BvaW50c0dyb3VwID0gbmV3IFdJ LkRldGFpbHNTZWN0aW9uR3JvdXAoW2JyZWFrcG9pbnRzUm93XSk7CkBAIC0yMTksNyArMjE5LDcg QEAgV0kuU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwgPSBjbGFzcyBTb3VyY2VzTmF2aWdh dGlvblNpZGViYXJQYW5lbCBleHRlbmRzIFcKIAogICAgICAgICBsZXQgcmVzb3VyY2VHcm91cGlu Z01vZGVOYXZpZ2F0aW9uSXRlbSA9IG5ldyBXSS5CdXR0b25OYXZpZ2F0aW9uSXRlbSgiZ3JvdXBp bmctbW9kZSIsIFdJLlVJU3RyaW5nKCJHcm91cGluZyBNb2RlIiksICJJbWFnZXMvR2Vhci5zdmci LCAxNSwgMTUpOwogICAgICAgICByZXNvdXJjZUdyb3VwaW5nTW9kZU5hdmlnYXRpb25JdGVtLnZp c2liaWxpdHlQcmlvcml0eSA9IFdJLk5hdmlnYXRpb25JdGVtLlZpc2liaWxpdHlQcmlvcml0eS5M b3c7Ci0gICAgICAgIHJlc291cmNlR3JvdXBpbmdNb2RlTmF2aWdhdGlvbkl0ZW0uZWxlbWVudC5h ZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl9oYW5kbGVSZXNvdXJjZUdyb3VwaW5n TW9kZU1vdXNlRG93bi5iaW5kKHRoaXMpKTsKKyAgICAgICAgV0kuYWRkTW91c2VEb3duQ29udGV4 dE1lbnVIYW5kbGVycyhyZXNvdXJjZUdyb3VwaW5nTW9kZU5hdmlnYXRpb25JdGVtLmVsZW1lbnQs IHRoaXMuX3BvcHVsYXRlUmVzb3VyY2VHcm91cGluZ01vZGVDb250ZXh0TWVudS5iaW5kKHRoaXMp KTsKICAgICAgICAgdGhpcy5fcmVzb3VyY2VzTmF2aWdhdGlvbkJhci5hZGROYXZpZ2F0aW9uSXRl bShyZXNvdXJjZUdyb3VwaW5nTW9kZU5hdmlnYXRpb25JdGVtKTsKIAogICAgICAgICB0aGlzLl9y ZXNvdXJjZXNUcmVlT3V0bGluZSA9IHRoaXMuY29udGVudFRyZWVPdXRsaW5lOwpAQCAtMTM5OSwx OCArMTM5OSw4IEBAIFdJLlNvdXJjZXNOYXZpZ2F0aW9uU2lkZWJhclBhbmVsID0gY2xhc3MgU291 cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwgZXh0ZW5kcyBXCiAgICAgICAgIHRoaXMudXBkYXRl RmlsdGVyKCk7CiAgICAgfQogCi0gICAgX2hhbmRsZVJlc291cmNlR3JvdXBpbmdNb2RlTW91c2VE b3duKGV2ZW50KQorICAgIF9wb3B1bGF0ZVJlc291cmNlR3JvdXBpbmdNb2RlQ29udGV4dE1lbnUo Y29udGV4dE1lbnUpCiAgICAgewotICAgICAgICBpZiAodGhpcy5faWdub3JlUmVzb3VyY2VHcm91 cGluZ01vZGVNb3VzZURvd24pCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgdGhpcy5f aWdub3JlUmVzb3VyY2VHcm91cGluZ01vZGVNb3VzZURvd24gPSB0cnVlOwotCi0gICAgICAgIGxl dCBjb250ZXh0TWVudSA9IFdJLkNvbnRleHRNZW51LmNyZWF0ZUZyb21FdmVudChldmVudCk7Ci0g ICAgICAgIGNvbnRleHRNZW51LmFkZEJlZm9yZVNob3dDYWxsYmFjaygoKSA9PiB7Ci0gICAgICAg ICAgICB0aGlzLl9pZ25vcmVSZXNvdXJjZUdyb3VwaW5nTW9kZU1vdXNlRG93biA9IGZhbHNlOwot ICAgICAgICB9KTsKLQogICAgICAgICBmdW5jdGlvbiBhZGRPcHRpb24obW9kZSwgbGFiZWwpIHsK ICAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZENoZWNrYm94SXRlbShsYWJlbCwgKCkgPT4g ewogICAgICAgICAgICAgICAgIFdJLnNldHRpbmdzLnJlc291cmNlR3JvdXBpbmdNb2RlLnZhbHVl ID0gbW9kZTsKQEAgLTE0MTgsOCArMTQwOCw2IEBAIFdJLlNvdXJjZXNOYXZpZ2F0aW9uU2lkZWJh clBhbmVsID0gY2xhc3MgU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwgZXh0ZW5kcyBXCiAg ICAgICAgIH0KICAgICAgICAgYWRkT3B0aW9uKFdJLlJlc291cmNlLkdyb3VwaW5nTW9kZS5QYXRo LCBXSS5VSVN0cmluZygiR3JvdXAgYnkgUGF0aCIpKTsKICAgICAgICAgYWRkT3B0aW9uKFdJLlJl c291cmNlLkdyb3VwaW5nTW9kZS5UeXBlLCBXSS5VSVN0cmluZygiR3JvdXAgYnkgVHlwZSIpKTsK LQotICAgICAgICBjb250ZXh0TWVudS5zaG93KCk7CiAgICAgfQogCiAgICAgX2hhbmRsZVRyZWVT ZWxlY3Rpb25EaWRDaGFuZ2UoZXZlbnQpCkBAIC0xNTE4LDE4ICsxNTA2LDggQEAgV0kuU291cmNl c05hdmlnYXRpb25TaWRlYmFyUGFuZWwgPSBjbGFzcyBTb3VyY2VzTmF2aWdhdGlvblNpZGViYXJQ YW5lbCBleHRlbmRzIFcKICAgICAgICAgdGhpcy5lbGVtZW50LnN0eWxlLnNldFByb3BlcnR5KCIt LWJyZWFrcG9pbnRzLWNvdW50IiwgY291bnQpOwogICAgIH0KIAotICAgIF9oYW5kbGVDcmVhdGVC cmVha3BvaW50TW91c2VEb3duKGV2ZW50KQorICAgIF9wb3B1bGF0ZUNyZWF0ZUJyZWFrcG9pbnRD b250ZXh0TWVudShjb250ZXh0TWVudSkKICAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9pZ25vcmVD cmVhdGVCcmVha3BvaW50TW91c2VEb3duKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAg IHRoaXMuX2lnbm9yZUNyZWF0ZUJyZWFrcG9pbnRNb3VzZURvd24gPSB0cnVlOwotCi0gICAgICAg IGxldCBjb250ZXh0TWVudSA9IFdJLkNvbnRleHRNZW51LmNyZWF0ZUZyb21FdmVudChldmVudCk7 Ci0gICAgICAgIGNvbnRleHRNZW51LmFkZEJlZm9yZVNob3dDYWxsYmFjaygoKSA9PiB7Ci0gICAg ICAgICAgICB0aGlzLl9pZ25vcmVDcmVhdGVCcmVha3BvaW50TW91c2VEb3duID0gZmFsc2U7Ci0g ICAgICAgIH0pOwotCiAgICAgICAgIC8vIENPTVBBVElCSUxJVFkgKGlPUyAxMCk6IERlYnVnZ2Vy QWdlbnQuc2V0UGF1c2VPbkFzc2VydGlvbnMgZGlkIG5vdCBleGlzdCB5ZXQuCiAgICAgICAgIGlm IChJbnNwZWN0b3JCYWNrZW5kLmRvbWFpbnMuRGVidWdnZXIuc2V0UGF1c2VPbkFzc2VydGlvbnMp IHsKICAgICAgICAgICAgIGxldCBhc3NlcnRpb25GYWlsdXJlc0JyZWFrcG9pbnRTaG93biA9IFdJ LnNldHRpbmdzLnNob3dBc3NlcnRpb25GYWlsdXJlc0JyZWFrcG9pbnQudmFsdWU7CkBAIC0xNTcw LDggKzE1NDgsNiBAQCBXSS5Tb3VyY2VzTmF2aWdhdGlvblNpZGViYXJQYW5lbCA9IGNsYXNzIFNv dXJjZXNOYXZpZ2F0aW9uU2lkZWJhclBhbmVsIGV4dGVuZHMgVwogICAgICAgICAgICAgICAgIHBv cG92ZXIuc2hvdyh0aGlzLl9jcmVhdGVCcmVha3BvaW50QnV0dG9uLmVsZW1lbnQsIFtXSS5SZWN0 RWRnZS5NQVhfWSwgV0kuUmVjdEVkZ2UuTUlOX1ksIFdJLlJlY3RFZGdlLk1BWF9YXSk7CiAgICAg ICAgICAgICB9KTsKICAgICAgICAgfQotCi0gICAgICAgIGNvbnRleHRNZW51LnNob3coKTsKICAg ICB9CiAKICAgICBfaGFuZGxlUmVzb3VyY2VHcm91cGluZ01vZGVDaGFuZ2VkKGV2ZW50KQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFiQmFy LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFiQmFyLmpz CmluZGV4IGM5ZWYwNmQwOGZhNWE5ZDkwMGZmMTcwZTIzNjIxYjBkNzJiMTA3ZTUuLjhmZjdjNWU5 MmYzYjY2ZTVjM2ZhOTYwMTMzNjdhOWUzZDc1NGUyOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RhYkJhci5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UYWJCYXIuanMKQEAgLTQ4LDcgKzQ4LDYg QEAgV0kuVGFiQmFyID0gY2xhc3MgVGFiQmFyIGV4dGVuZHMgV0kuVmlldwogCiAgICAgICAgIHRo aXMuX3RhYlBpY2tlclRhYkJhckl0ZW0gPSBuZXcgV0kuUGlubmVkVGFiQmFySXRlbSgiSW1hZ2Vz L1RhYlBpY2tlci5zdmciLCBXSS5VSVN0cmluZygiU2hvdyBoaWRkZW4gdGFicyIpKTsKICAgICAg ICAgdGhpcy5fdGFiUGlja2VyVGFiQmFySXRlbS5lbGVtZW50LmNsYXNzTGlzdC5hZGQoInRhYi1w aWNrZXIiLCAiaGlkZGVuIik7Ci0gICAgICAgIHRoaXMuX3RhYlBpY2tlclRhYkJhckl0ZW0uZWxl bWVudC5hZGRFdmVudExpc3RlbmVyKCJjb250ZXh0bWVudSIsIHRoaXMuX2hhbmRsZVRhYlBpY2tl clRhYkNvbnRleHRNZW51LmJpbmQodGhpcykpOwogICAgICAgICB0aGlzLmFkZFRhYkJhckl0ZW0o dGhpcy5fdGFiUGlja2VyVGFiQmFySXRlbSwge3N1cHByZXNzQW5pbWF0aW9uczogdHJ1ZX0pOwog ICAgIH0KIApAQCAtODEwLDE5ICs4MDksNiBAQCBXSS5UYWJCYXIgPSBjbGFzcyBUYWJCYXIgZXh0 ZW5kcyBXSS5WaWV3CiAgICAgICAgICAgICB9LCBjaGVja2VkLCBkaXNhYmxlZCk7CiAgICAgICAg IH0KICAgICB9Ci0KLSAgICBfaGFuZGxlVGFiUGlja2VyVGFiQ29udGV4dE1lbnUoZXZlbnQpCi0g ICAgewotICAgICAgICBpZiAoIXRoaXMuX2hpZGRlblRhYkJhckl0ZW1zLmxlbmd0aCkKLSAgICAg ICAgICAgIHJldHVybjsKLQotICAgICAgICBsZXQgY29udGV4dE1lbnUgPSBXSS5Db250ZXh0TWVu dS5jcmVhdGVGcm9tRXZlbnQoZXZlbnQpOwotICAgICAgICBmb3IgKGxldCBpdGVtIG9mIHRoaXMu X2hpZGRlblRhYkJhckl0ZW1zKSB7Ci0gICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVt KGl0ZW0udGl0bGUsICgpID0+IHsKLSAgICAgICAgICAgICAgICB0aGlzLnNlbGVjdGVkVGFiQmFy SXRlbSA9IGl0ZW07Ci0gICAgICAgICAgICB9KTsKLSAgICAgICAgfQotICAgIH0KIH07CiAKIFdJ LlRhYkJhci5DYWNoZWRXaWR0aFN5bWJvbCA9IFN5bWJvbCgiY2FjaGVkLXdpZHRoIik7Cg==