224652 2021-04-15 23:45:49 -0700 Web Inspector: Tree Outlines: `ondetach` can be called without `onattach` ever being called 2021-04-20 10:17:32 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=224651 InRadar P2 Normal --- 1 hi rcaliman hi inspector-bugzilla-changes rcaliman webkit-bug-importer oldest_to_newest 1750955 0 hi 2021-04-15 23:45:49 -0700 `onattach` is only called if the `WI.TreeElement` has a `_listItemNode` and its parent `_shouldRefreshChildren`, meaning that if `removeChild`/`removeChildren` is called before those conditions are met then `ondetach` will get called, which could result in bad consistency/state 1750956 1 webkit-bug-importer 2021-04-15 23:46:20 -0700 <rdar://problem/76746385> 1751852 2 426441 rcaliman 2021-04-19 10:23:13 -0700 Created attachment 426441 Patch Hardened the checks guarding TreeElement.ondetach() and did some light manual testing to check for side-effects. If you know of regressions or bugs happening as a result of this, please let me know so I can check them. 1751859 3 426441 hi 2021-04-19 10:47:54 -0700 Comment on attachment 426441 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=426441&action=review > Source/WebInspectorUI/UserInterface/Views/TreeElement.js:293 > + if (this.ondetach && this._listItemNode && !this.parent._shouldRefreshChildren) I don't think the check for `!this.parent._shouldRefreshChildren` is really necessary since it defaults to a falsy value (`undefined`) and also usually gets set back to a falsy value (`false`) in the subclass `onpopulate` (or also in `WI.TreeElement.prototype.expand`). I think checking for `_listItemNode` is probably enough :) As such, you should be able to remove the `if (this.listItemElement)` in `WI.FrameTreeElement.prototype.ondetach`. Also please remove all the `FIXME` comments I added in <https://webkit.org/b/224651> :P 1751893 4 426453 rcaliman 2021-04-19 12:08:45 -0700 Created attachment 426453 Patch 1751902 5 426453 hi 2021-04-19 12:15:16 -0700 Comment on attachment 426453 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=426453&action=review > Source/WebInspectorUI/UserInterface/Views/TreeElement.js:293 > + if (this.ondetach && this._listItemNode) So looking at this again, I think there may need to be one more change. `onattach` is called if `!this._listItemNode` OR `this.parent._shouldRefreshChildren`. The changes you've made handle the former, but in the case of the latter it's possible for `onattach` to be called more than once per-`ondetach`. I think the simple solution in this case is to ``` -if (this._listItemNode && this._listItemNode.parentNode) - this._listItemNode.parentNode.removeChild(this._listItemNode); +this._detach() ``` inside `WI.TreeElement.prototype._attach` so that if there's already a `this._listItemNode` when `this.parent._shouldRefreshChildren` is set, we make sure to call `ondetach` with the old state first. > Source/WebInspectorUI/UserInterface/Views/WebSocketResourceTreeElement.js:41 > super.ondetach(); NIT: While you're here, can you move this to the end of the function so that we don't accidentally tear down superclass state if this subclass needs it? 1752279 6 426553 rcaliman 2021-04-20 09:02:04 -0700 Created attachment 426553 Patch address code review feedback 1752280 7 426453 rcaliman 2021-04-20 09:05:06 -0700 Comment on attachment 426453 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=426453&action=review >> Source/WebInspectorUI/UserInterface/Views/TreeElement.js:293 >> + if (this.ondetach && this._listItemNode) > > So looking at this again, I think there may need to be one more change. `onattach` is called if `!this._listItemNode` OR `this.parent._shouldRefreshChildren`. The changes you've made handle the former, but in the case of the latter it's possible for `onattach` to be called more than once per-`ondetach`. > > I think the simple solution in this case is to > ``` > -if (this._listItemNode && this._listItemNode.parentNode) > - this._listItemNode.parentNode.removeChild(this._listItemNode); > +this._detach() > ``` > inside `WI.TreeElement.prototype._attach` so that if there's already a `this._listItemNode` when `this.parent._shouldRefreshChildren` is set, we make sure to call `ondetach` with the old state first. Yes, this makes sense. I made the change but opted to keep a check just so it's immediately clear why we're calling _detach() in _attach() ``` if (this.parent._shouldRefreshChildren) this._detach(); ``` 1752305 8 426553 hi 2021-04-20 09:49:07 -0700 Comment on attachment 426553 Patch r=me 1752317 9 ews-feeder 2021-04-20 10:17:31 -0700 Committed r276310 (236792@main): <https://commits.webkit.org/236792@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 426553. 426441 2021-04-19 10:23:13 -0700 2021-04-19 12:08:41 -0700 Patch bug-224652-20210419192312.patch text/plain 1677 rcaliman ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDAzZTEyODc2ODZlNjM2NThiNjNjMGFiMGQ1YjE5 YzBiM2JhMzYyMTYuLjg4NjdjYjhiNDBlZjY3ODdmNWQ4NWE5MGVhMDYyOWY2NjRjYzg2MWEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA0LTE5ICBSYXp2 YW4gQ2FsaW1hbiAgPHJjYWxpbWFuQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBUcmVlIE91dGxpbmVzOiBgb25kZXRhY2hgIGNhbiBiZSBjYWxsZWQgd2l0aG91dCBgb25hdHRh Y2hgIGV2ZXIgYmVpbmcgY2FsbGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMjQ2NTIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc2NzQ2Mzg1Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuc3VyZSBg VHJlZUVsZW1lbnQub25kZXRhY2goKWAgY2Fubm90IGJlIGNhbGxlZCBpZiB0aGUgY29uZGl0aW9u cworICAgICAgICBmb3IgcHJldmlvdXNseSBjYWxsaW5nIGBUcmVlRWxlbWVudC5vbmF0dGFjaCgp YCBoYXZlIG5vdCBiZWVuIG1ldC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVHJl ZUVsZW1lbnQuanM6CisgICAgICAgIChXSS5UcmVlRWxlbWVudC5wcm90b3R5cGUuX2RldGFjaCk6 CisKIDIwMjEtMDQtMDYgIEJKIEJ1cmcgIDxiYnVyZ0BhcHBsZS5jb20+CiAKICAgICAgICAgV2Vi IEluc3BlY3RvcjogcmVtb3ZlIGR1cGxpY2F0ZSBCb3ggTW9kZWwgc2VjdGlvbiBmcm9tIExheW91 dCBwYW5lbCBpbiBFbGVtZW50cyBUYWIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVHJlZUVsZW1lbnQuanMKaW5kZXggZjk1NmM5NTBhZjQ0 ZWMyOGM2NTQwZmE4NWE4ZDY4ZDUzYWI3YTA3Zi4uYWFiNWY1YjY5MDU0Y2ViZGI0MzA3OThkMzYx YjI3MDE1OWVkMjI3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvVHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvVHJlZUVsZW1lbnQuanMKQEAgLTI5MCw3ICsyOTAsNyBAQCBXSS5U cmVlRWxlbWVudCA9IGNsYXNzIFRyZWVFbGVtZW50IGV4dGVuZHMgV0kuT2JqZWN0CiAKICAgICBf ZGV0YWNoKCkKICAgICB7Ci0gICAgICAgIGlmICh0aGlzLm9uZGV0YWNoKQorICAgICAgICBpZiAo dGhpcy5vbmRldGFjaCAmJiB0aGlzLl9saXN0SXRlbU5vZGUgJiYgIXRoaXMucGFyZW50Ll9zaG91 bGRSZWZyZXNoQ2hpbGRyZW4pCiAgICAgICAgICAgICB0aGlzLm9uZGV0YWNoKHRoaXMpOwogICAg ICAgICBpZiAodGhpcy5fbGlzdEl0ZW1Ob2RlICYmIHRoaXMuX2xpc3RJdGVtTm9kZS5wYXJlbnRO b2RlKQogICAgICAgICAgICAgdGhpcy5fbGlzdEl0ZW1Ob2RlLnBhcmVudE5vZGUucmVtb3ZlQ2hp bGQodGhpcy5fbGlzdEl0ZW1Ob2RlKTsK 426453 2021-04-19 12:08:45 -0700 2021-04-20 09:02:00 -0700 Patch bug-224652-20210419210842.patch text/plain 10353 rcaliman ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGZlMzIzOTkyOThjNjIxMmEwMjJkNzNmZjdkZmM5 NWI2Y2FiMjJhZmUuLmI5N2E2OTdiMWJiYWIxZjU4ODY3NTc3ZTMxMGNiY2IzZDEwY2I2OTEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA0LTE5ICBSYXp2 YW4gQ2FsaW1hbiAgPHJjYWxpbWFuQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBUcmVlIE91dGxpbmVzOiBgb25kZXRhY2hgIGNhbiBiZSBjYWxsZWQgd2l0aG91dCBgb25hdHRh Y2hgIGV2ZXIgYmVpbmcgY2FsbGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMjQ2NTIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc2NzQ2Mzg1Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuc3VyZSBg VHJlZUVsZW1lbnQub25kZXRhY2goKWAgY2Fubm90IGJlIGNhbGxlZCBpZiB0aGUgY29uZGl0aW9u cworICAgICAgICBmb3IgcHJldmlvdXNseSBjYWxsaW5nIGBUcmVlRWxlbWVudC5vbmF0dGFjaCgp YCBoYXZlIG5vdCBiZWVuIG1ldC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVHJl ZUVsZW1lbnQuanM6CisgICAgICAgIChXSS5UcmVlRWxlbWVudC5wcm90b3R5cGUuX2RldGFjaCk6 CisKIDIwMjEtMDQtMTkgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAg ICAgIFdlYiBJbnNwZWN0b3I6IFJFR1JFU1NJT04oPyk6IE5ldHdvcms6IFJlcXVlc3QgKE9iamVj dCBUcmVlKSBpcyBzb21ldGltZXMgZW1wdHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0F1ZGl0VHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9BdWRpdFRyZWVFbGVtZW50LmpzCmluZGV4 IDc1ZWIwN2E1NDE1YzA5ZDJiOTBhZjE1ZDc3OTUxM2I2NGZmMDFkNmEuLjUyZTM5YzNmZGI4Nzc0 MWM5ZDA5OWU2MzAxYjQyN2I1MGRjZWM3MjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0F1ZGl0VHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQXVkaXRUcmVlRWxlbWVudC5qcwpA QCAtOTcsOCArOTcsNiBAQCBXSS5BdWRpdFRyZWVFbGVtZW50ID0gY2xhc3MgQXVkaXRUcmVlRWxl bWVudCBleHRlbmRzIFdJLkdlbmVyYWxUcmVlRWxlbWVudAogCiAgICAgb25kZXRhY2goKQogICAg IHsKLSAgICAgICAgLy8gRklYTUU6IDxodHRwczovL3dlYmtpdC5vcmcvYi8yMjQ2NTI+IChXZWIg SW5zcGVjdG9yOiBUcmVlIE91dGxpbmVzOiBgb25kZXRhY2hgIGNhbiBiZSBjYWxsZWQgd2l0aG91 dCBgb25hdHRhY2hgIGV2ZXIgYmVpbmcgY2FsbGVkKQotCiAgICAgICAgIGlmICh0aGlzLnJlcHJl c2VudGVkT2JqZWN0IGluc3RhbmNlb2YgV0kuQXVkaXRUZXN0QmFzZSkgewogICAgICAgICAgICAg dGhpcy5yZXByZXNlbnRlZE9iamVjdC5yZW1vdmVFdmVudExpc3RlbmVyKFdJLkF1ZGl0VGVzdEJh c2UuRXZlbnQuRGlzYWJsZWRDaGFuZ2VkLCB0aGlzLl9oYW5kbGVUZXN0RGlzYWJsZWRDaGFuZ2Vk LCB0aGlzKTsKICAgICAgICAgICAgIHRoaXMucmVwcmVzZW50ZWRPYmplY3QucmVtb3ZlRXZlbnRM aXN0ZW5lcihXSS5BdWRpdFRlc3RCYXNlLkV2ZW50LlJlc3VsdENoYW5nZWQsIHRoaXMuX2hhbmRs ZVRlc3RSZXN1bHRDaGFuZ2VkLCB0aGlzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Jvb3RzdHJhcFNjcmlwdFRyZWVFbGVtZW50LmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQm9vdHN0cmFwU2NyaXB0 VHJlZUVsZW1lbnQuanMKaW5kZXggNDI3MWExMTc3MjBlZmZlNTA0ZTM3YmYxMTgwYjdjZThiZDUx ZDY1Ni4uMjc2NjNmZTk5OWY3MTEyM2UzZjA1MGNhOTkyYWEwZWVmZTFjZjg4NiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQm9vdHN0cmFwU2Ny aXB0VHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQm9vdHN0cmFwU2NyaXB0VHJlZUVsZW1lbnQuanMKQEAgLTUyLDggKzUyLDYgQEAg V0kuQm9vdHN0cmFwU2NyaXB0VHJlZUVsZW1lbnQgPSBjbGFzcyBCb290c3RyYXBTY3JpcHRUcmVl RWxlbWVudCBleHRlbmRzIFdJLlNjcmkKIAogICAgIG9uZGV0YWNoKCkKICAgICB7Ci0gICAgICAg IC8vIEZJWE1FOiA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMjI0NjUyPiAoV2ViIEluc3BlY3Rvcjog VHJlZSBPdXRsaW5lczogYG9uZGV0YWNoYCBjYW4gYmUgY2FsbGVkIHdpdGhvdXQgYG9uYXR0YWNo YCBldmVyIGJlaW5nIGNhbGxlZCkKLQogICAgICAgICBXSS5OZXR3b3JrTWFuYWdlci5yZW1vdmVF dmVudExpc3RlbmVyKFdJLk5ldHdvcmtNYW5hZ2VyLkV2ZW50LkJvb3RzdHJhcFNjcmlwdEVuYWJs ZWRDaGFuZ2VkLCB0aGlzLl9oYW5kbGVOZXR3b3JrTWFuYWdlckJvb3RzdHJhcFNjcmlwdEVuYWJs ZWRDaGFuZ2VkLCB0aGlzKTsKIAogICAgICAgICBzdXBlci5vbmRldGFjaCgpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQnJlYWtwb2ludFRy ZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv QnJlYWtwb2ludFRyZWVFbGVtZW50LmpzCmluZGV4IDdkZDhmY2VjZGNiNTdiMDQ0NDJiNDNlN2Q0 Njg2NTMxNjk2NzU3ODQuLjg4MGM4ZGI5YjM2MmJmZWIwNGE5ZjhlM2ExNDdhZTUwNjJlYjE0YWUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Jy ZWFrcG9pbnRUcmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9CcmVha3BvaW50VHJlZUVsZW1lbnQuanMKQEAgLTExMSw4ICsxMTEsNiBA QCBXSS5CcmVha3BvaW50VHJlZUVsZW1lbnQgPSBjbGFzcyBCcmVha3BvaW50VHJlZUVsZW1lbnQg ZXh0ZW5kcyBXSS5HZW5lcmFsVHJlZUVsZQogCiAgICAgb25kZXRhY2goKQogICAgIHsKLSAgICAg ICAgLy8gRklYTUU6IDxodHRwczovL3dlYmtpdC5vcmcvYi8yMjQ2NTI+IChXZWIgSW5zcGVjdG9y OiBUcmVlIE91dGxpbmVzOiBgb25kZXRhY2hgIGNhbiBiZSBjYWxsZWQgd2l0aG91dCBgb25hdHRh Y2hgIGV2ZXIgYmVpbmcgY2FsbGVkKQotCiAgICAgICAgIHN1cGVyLm9uZGV0YWNoKCk7CiAKICAg ICAgICAgdGhpcy5fYnJlYWtwb2ludC5yZW1vdmVFdmVudExpc3RlbmVyKFdJLkJyZWFrcG9pbnQu RXZlbnQuRGlzYWJsZWRTdGF0ZURpZENoYW5nZSwgdGhpcy51cGRhdGVTdGF0dXMsIHRoaXMpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9N VHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9ET01UcmVlRWxlbWVudC5qcwppbmRleCA3ZmE2ZjI3NDg5MzgyMzFmNWI4OTM5MDMwMzZiMDM5 OWM2N2E0MTQxLi43MWIzYTMzYWI3MTI0YzE1N2YwNzkzMzU4YjBhM2I3ZGY0NWNmZDQzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVl RWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9ET01UcmVlRWxlbWVudC5qcwpAQCAtNDU1LDggKzQ1NSw2IEBAIFdJLkRPTVRyZWVFbGVtZW50 ID0gY2xhc3MgRE9NVHJlZUVsZW1lbnQgZXh0ZW5kcyBXSS5UcmVlRWxlbWVudAogCiAgICAgb25k ZXRhY2goKQogICAgIHsKLSAgICAgICAgLy8gRklYTUU6IDxodHRwczovL3dlYmtpdC5vcmcvYi8y MjQ2NTI+IChXZWIgSW5zcGVjdG9yOiBUcmVlIE91dGxpbmVzOiBgb25kZXRhY2hgIGNhbiBiZSBj YWxsZWQgd2l0aG91dCBgb25hdHRhY2hgIGV2ZXIgYmVpbmcgY2FsbGVkKQotCiAgICAgICAgIGlm ICh0aGlzLnJlcHJlc2VudGVkT2JqZWN0LmxheW91dENvbnRleHRUeXBlID09PSBXSS5ET01Ob2Rl LkxheW91dENvbnRleHRUeXBlLkdyaWQpIHsKICAgICAgICAgICAgIFdJLm92ZXJsYXlNYW5hZ2Vy LnJlbW92ZUV2ZW50TGlzdGVuZXIoV0kuT3ZlcmxheU1hbmFnZXIuRXZlbnQuR3JpZE92ZXJsYXlT aG93biwgdGhpcy5fdXBkYXRlR3JpZEJhZGdlU3RhdHVzLCB0aGlzKTsKICAgICAgICAgICAgIFdJ Lm92ZXJsYXlNYW5hZ2VyLnJlbW92ZUV2ZW50TGlzdGVuZXIoV0kuT3ZlcmxheU1hbmFnZXIuRXZl bnQuR3JpZE92ZXJsYXlIaWRkZW4sIHRoaXMuX3VwZGF0ZUdyaWRCYWRnZVN0YXR1cywgdGhpcyk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9G cmFtZVRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvRnJhbWVUcmVlRWxlbWVudC5qcwppbmRleCA1ZTRmM2U2NTIwOWZmYTExZjAxMTVjZWQy ZDMzMTI4ODNmOTA2Y2JjLi43NGY5NjEyOGZmY2ZmMmE1NzgyM2Y3NGUyOTBlY2NmNWU5MGY5MGRh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9G cmFtZVRyZWVFbGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0ZyYW1lVHJlZUVsZW1lbnQuanMKQEAgLTEyMSwxMiArMTIxLDggQEAgV0kuRnJh bWVUcmVlRWxlbWVudCA9IGNsYXNzIEZyYW1lVHJlZUVsZW1lbnQgZXh0ZW5kcyBXSS5SZXNvdXJj ZVRyZWVFbGVtZW50CiAKICAgICBvbmRldGFjaCgpCiAgICAgewotICAgICAgICAvLyBGSVhNRTog PGh0dHBzOi8vd2Via2l0Lm9yZy9iLzIyNDY1Mj4gKFdlYiBJbnNwZWN0b3I6IFRyZWUgT3V0bGlu ZXM6IGBvbmRldGFjaGAgY2FuIGJlIGNhbGxlZCB3aXRob3V0IGBvbmF0dGFjaGAgZXZlciBiZWlu ZyBjYWxsZWQpCi0KLSAgICAgICAgaWYgKHRoaXMubGlzdEl0ZW1FbGVtZW50KSB7Ci0gICAgICAg ICAgICBXSS5jc3NNYW5hZ2VyLnJlbW92ZUV2ZW50TGlzdGVuZXIoV0kuQ1NTTWFuYWdlci5FdmVu dC5TdHlsZVNoZWV0QWRkZWQsIHRoaXMuX3N0eWxlU2hlZXRBZGRlZCwgdGhpcyk7Ci0gICAgICAg ICAgICBXSS5jc3NNYW5hZ2VyLnJlbW92ZUV2ZW50TGlzdGVuZXIoV0kuQ1NTTWFuYWdlci5FdmVu dC5TdHlsZVNoZWV0UmVtb3ZlZCwgdGhpcy5fc3R5bGVTaGVldFJlbW92ZWQsIHRoaXMpOwotICAg ICAgICB9CisgICAgICAgIFdJLmNzc01hbmFnZXIucmVtb3ZlRXZlbnRMaXN0ZW5lcihXSS5DU1NN YW5hZ2VyLkV2ZW50LlN0eWxlU2hlZXRBZGRlZCwgdGhpcy5fc3R5bGVTaGVldEFkZGVkLCB0aGlz KTsKKyAgICAgICAgV0kuY3NzTWFuYWdlci5yZW1vdmVFdmVudExpc3RlbmVyKFdJLkNTU01hbmFn ZXIuRXZlbnQuU3R5bGVTaGVldFJlbW92ZWQsIHRoaXMuX3N0eWxlU2hlZXRSZW1vdmVkLCB0aGlz KTsKIAogICAgICAgICBzdXBlci5vbmRldGFjaCgpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0phdmFTY3JpcHRCcmVha3BvaW50 VHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9KYXZhU2NyaXB0QnJlYWtwb2ludFRyZWVFbGVtZW50LmpzCmluZGV4IGM5YjgxMTljMDI3M2Rj OTc1MGJkOTNhNGJiZTM4ZGI2MmJlZWVlNjguLmU0NWRhYjNlZmEyYzJhMWM1MWNjNjYxODNhNTJi YWIxZDUzNWM5NWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0phdmFTY3JpcHRCcmVha3BvaW50VHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSmF2YVNjcmlwdEJyZWFrcG9pbnRU cmVlRWxlbWVudC5qcwpAQCAtNTksOCArNTksNiBAQCBXSS5KYXZhU2NyaXB0QnJlYWtwb2ludFRy ZWVFbGVtZW50ID0gY2xhc3MgSmF2YVNjcmlwdEJyZWFrcG9pbnRUcmVlRWxlbWVudCBleHRlbgog CiAgICAgb25kZXRhY2goKQogICAgIHsKLSAgICAgICAgLy8gRklYTUU6IDxodHRwczovL3dlYmtp dC5vcmcvYi8yMjQ2NTI+IChXZWIgSW5zcGVjdG9yOiBUcmVlIE91dGxpbmVzOiBgb25kZXRhY2hg IGNhbiBiZSBjYWxsZWQgd2l0aG91dCBgb25hdHRhY2hgIGV2ZXIgYmVpbmcgY2FsbGVkKQotCiAg ICAgICAgIGlmICghdGhpcy5icmVha3BvaW50LnNwZWNpYWwpCiAgICAgICAgICAgICB0aGlzLmJy ZWFrcG9pbnQucmVtb3ZlRXZlbnRMaXN0ZW5lcihXSS5KYXZhU2NyaXB0QnJlYWtwb2ludC5FdmVu dC5Mb2NhdGlvbkRpZENoYW5nZSwgdGhpcy5fYnJlYWtwb2ludExvY2F0aW9uRGlkQ2hhbmdlLCB0 aGlzKTsKICAgICAgICAgdGhpcy5icmVha3BvaW50LnJlbW92ZUV2ZW50TGlzdGVuZXIoV0kuSmF2 YVNjcmlwdEJyZWFrcG9pbnQuRXZlbnQuUmVzb2x2ZWRTdGF0ZURpZENoYW5nZSwgdGhpcy51cGRh dGVTdGF0dXMsIHRoaXMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvTG9jYWxSZXNvdXJjZU92ZXJyaWRlVHJlZUVsZW1lbnQuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2NhbFJlc291cmNlT3ZlcnJp ZGVUcmVlRWxlbWVudC5qcwppbmRleCA3YTdiNTFhN2YyYjQyYmQ5Y2I2ZDJiOWRhYmM0ZDFjYzZi M2M4MzE5Li5kODRkNGNmNWFiZDY3OGQxZWI5NjljNDFiOTdiZTUzYWM4MDgyNGFmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2NhbFJlc291 cmNlT3ZlcnJpZGVUcmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Mb2NhbFJlc291cmNlT3ZlcnJpZGVUcmVlRWxlbWVudC5qcwpAQCAt NTYsOCArNTYsNiBAQCBXSS5Mb2NhbFJlc291cmNlT3ZlcnJpZGVUcmVlRWxlbWVudCA9IGNsYXNz IExvY2FsUmVzb3VyY2VPdmVycmlkZVRyZWVFbGVtZW50IGV4dAogCiAgICAgb25kZXRhY2goKQog ICAgIHsKLSAgICAgICAgLy8gRklYTUU6IDxodHRwczovL3dlYmtpdC5vcmcvYi8yMjQ2NTI+IChX ZWIgSW5zcGVjdG9yOiBUcmVlIE91dGxpbmVzOiBgb25kZXRhY2hgIGNhbiBiZSBjYWxsZWQgd2l0 aG91dCBgb25hdHRhY2hgIGV2ZXIgYmVpbmcgY2FsbGVkKQotCiAgICAgICAgIHRoaXMuX2xvY2Fs UmVzb3VyY2VPdmVycmlkZS5yZW1vdmVFdmVudExpc3RlbmVyKFdJLkxvY2FsUmVzb3VyY2VPdmVy cmlkZS5FdmVudC5EaXNhYmxlZENoYW5nZWQsIHRoaXMuX2hhbmRsZUxvY2FsUmVzb3VyY2VPdmVy cmlkZURpc2FibGVkQ2hhbmdlZCwgdGhpcyk7CiAKICAgICAgICAgV0kuRnJhbWUucmVtb3ZlRXZl bnRMaXN0ZW5lcihXSS5GcmFtZS5FdmVudC5NYWluUmVzb3VyY2VEaWRDaGFuZ2UsIHRoaXMuX2hh bmRsZUZyYW1lTWFpblJlc291cmNlRGlkQ2hhbmdlLCB0aGlzKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NoYWRlclByb2dyYW1UcmVlRWxl bWVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NoYWRl clByb2dyYW1UcmVlRWxlbWVudC5qcwppbmRleCA3NGJmZGE4NDEzOWM3NGY4NjUxZmUwOTQ4OGMw NDUyNDJjMTZhYjUzLi5jMmQzZjc1MzRkZDdhNmY0NGEzZTAxYjE5YzUxOTAxMzc1Nzg2YjViIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TaGFk ZXJQcm9ncmFtVHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvU2hhZGVyUHJvZ3JhbVRyZWVFbGVtZW50LmpzCkBAIC02MCw4ICs2MCw2 IEBAIFdJLlNoYWRlclByb2dyYW1UcmVlRWxlbWVudCA9IGNsYXNzIFNoYWRlclByb2dyYW1UcmVl RWxlbWVudCBleHRlbmRzIFdJLkdlbmVyYWxUCiAKICAgICBvbmRldGFjaCgpCiAgICAgewotICAg ICAgICAvLyBGSVhNRTogPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzIyNDY1Mj4gKFdlYiBJbnNwZWN0 b3I6IFRyZWUgT3V0bGluZXM6IGBvbmRldGFjaGAgY2FuIGJlIGNhbGxlZCB3aXRob3V0IGBvbmF0 dGFjaGAgZXZlciBiZWluZyBjYWxsZWQpCi0KICAgICAgICAgLy8gRklYTUU6IGFkZCBzdXBwb3J0 IGZvciBkaXNhYmxpbmcvaGlnaGxpZ2h0aW5nIFdlYkdQVSBzaGFkZXIgcGlwZWxpbmVzLgogICAg ICAgICBsZXQgY29udGV4dFR5cGUgPSB0aGlzLnJlcHJlc2VudGVkT2JqZWN0LmNhbnZhcy5jb250 ZXh0VHlwZTsKICAgICAgICAgaWYgKGNvbnRleHRUeXBlID09PSBXSS5DYW52YXMuQ29udGV4dFR5 cGUuV2ViR0wgfHwgY29udGV4dFR5cGUgPT09IFdJLkNhbnZhcy5Db250ZXh0VHlwZS5XZWJHTDIp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9U cmVlRWxlbWVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1RyZWVFbGVtZW50LmpzCmluZGV4IDc3MWI3YWZiZDMxYzdiZTdkZmFkZGRkYzNlZGU0ZGMwOWIx NmNjN2YuLjU1MzU5ZTAwZmNlNjZlZTExZjg1ZjA2NGM0MGI3OWYzMDRjNzg0NWUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVFbGVtZW50 LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVF bGVtZW50LmpzCkBAIC0yOTAsOCArMjkwLDcgQEAgV0kuVHJlZUVsZW1lbnQgPSBjbGFzcyBUcmVl RWxlbWVudCBleHRlbmRzIFdJLk9iamVjdAogCiAgICAgX2RldGFjaCgpCiAgICAgewotICAgICAg ICAvLyBGSVhNRTogPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzIyNDY1Mj4gKFdlYiBJbnNwZWN0b3I6 IFRyZWUgT3V0bGluZXM6IGBvbmRldGFjaGAgY2FuIGJlIGNhbGxlZCB3aXRob3V0IGBvbmF0dGFj aGAgZXZlciBiZWluZyBjYWxsZWQpCi0gICAgICAgIGlmICh0aGlzLm9uZGV0YWNoKQorICAgICAg ICBpZiAodGhpcy5vbmRldGFjaCAmJiB0aGlzLl9saXN0SXRlbU5vZGUpCiAgICAgICAgICAgICB0 aGlzLm9uZGV0YWNoKHRoaXMpOwogICAgICAgICBpZiAodGhpcy5fbGlzdEl0ZW1Ob2RlICYmIHRo aXMuX2xpc3RJdGVtTm9kZS5wYXJlbnROb2RlKQogICAgICAgICAgICAgdGhpcy5fbGlzdEl0ZW1O b2RlLnBhcmVudE5vZGUucmVtb3ZlQ2hpbGQodGhpcy5fbGlzdEl0ZW1Ob2RlKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1dlYlNvY2tldFJl c291cmNlVHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9XZWJTb2NrZXRSZXNvdXJjZVRyZWVFbGVtZW50LmpzCmluZGV4IDU1Y2VkZmFjNmMw MzNkYTg0NzdhMmMyNjQ5MjUyOGRjMjZjNDQ1MTguLjFjMGNlODgzMWM4N2Q3NWMzNzc4YjU4YTQz MmJhNTNkNTk3NDZhYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1dlYlNvY2tldFJlc291cmNlVHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvV2ViU29ja2V0UmVzb3VyY2VUcmVl RWxlbWVudC5qcwpAQCAtMzgsOCArMzgsNiBAQCBXSS5XZWJTb2NrZXRSZXNvdXJjZVRyZWVFbGVt ZW50ID0gY2xhc3MgV2ViU29ja2V0UmVzb3VyY2VUcmVlRWxlbWVudCBleHRlbmRzIFdJLgogCiAg ICAgb25kZXRhY2goKQogICAgIHsKLSAgICAgICAgLy8gRklYTUU6IDxodHRwczovL3dlYmtpdC5v cmcvYi8yMjQ2NTI+IChXZWIgSW5zcGVjdG9yOiBUcmVlIE91dGxpbmVzOiBgb25kZXRhY2hgIGNh biBiZSBjYWxsZWQgd2l0aG91dCBgb25hdHRhY2hgIGV2ZXIgYmVpbmcgY2FsbGVkKQotCiAgICAg ICAgIHN1cGVyLm9uZGV0YWNoKCk7CiAKICAgICAgICAgdGhpcy5yZXNvdXJjZS5yZW1vdmVFdmVu dExpc3RlbmVyKFdJLldlYlNvY2tldFJlc291cmNlLkV2ZW50LlJlYWR5U3RhdGVDaGFuZ2VkLCB0 aGlzLl91cGRhdGVDb25uZWN0aW9uU3RhdHVzLCB0aGlzKTsK 426553 2021-04-20 09:02:04 -0700 2021-04-20 10:17:32 -0700 Patch bug-224652-20210420180203.patch text/plain 11097 rcaliman ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGZlMzIzOTkyOThjNjIxMmEwMjJkNzNmZjdkZmM5 NWI2Y2FiMjJhZmUuLmI5N2E2OTdiMWJiYWIxZjU4ODY3NTc3ZTMxMGNiY2IzZDEwY2I2OTEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA0LTE5ICBSYXp2 YW4gQ2FsaW1hbiAgPHJjYWxpbWFuQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBUcmVlIE91dGxpbmVzOiBgb25kZXRhY2hgIGNhbiBiZSBjYWxsZWQgd2l0aG91dCBgb25hdHRh Y2hgIGV2ZXIgYmVpbmcgY2FsbGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMjQ2NTIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc2NzQ2Mzg1Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuc3VyZSBg VHJlZUVsZW1lbnQub25kZXRhY2goKWAgY2Fubm90IGJlIGNhbGxlZCBpZiB0aGUgY29uZGl0aW9u cworICAgICAgICBmb3IgcHJldmlvdXNseSBjYWxsaW5nIGBUcmVlRWxlbWVudC5vbmF0dGFjaCgp YCBoYXZlIG5vdCBiZWVuIG1ldC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVHJl ZUVsZW1lbnQuanM6CisgICAgICAgIChXSS5UcmVlRWxlbWVudC5wcm90b3R5cGUuX2RldGFjaCk6 CisKIDIwMjEtMDQtMTkgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAg ICAgIFdlYiBJbnNwZWN0b3I6IFJFR1JFU1NJT04oPyk6IE5ldHdvcms6IFJlcXVlc3QgKE9iamVj dCBUcmVlKSBpcyBzb21ldGltZXMgZW1wdHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0F1ZGl0VHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9BdWRpdFRyZWVFbGVtZW50LmpzCmluZGV4 IDc1ZWIwN2E1NDE1YzA5ZDJiOTBhZjE1ZDc3OTUxM2I2NGZmMDFkNmEuLjUyZTM5YzNmZGI4Nzc0 MWM5ZDA5OWU2MzAxYjQyN2I1MGRjZWM3MjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0F1ZGl0VHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQXVkaXRUcmVlRWxlbWVudC5qcwpA QCAtOTcsOCArOTcsNiBAQCBXSS5BdWRpdFRyZWVFbGVtZW50ID0gY2xhc3MgQXVkaXRUcmVlRWxl bWVudCBleHRlbmRzIFdJLkdlbmVyYWxUcmVlRWxlbWVudAogCiAgICAgb25kZXRhY2goKQogICAg IHsKLSAgICAgICAgLy8gRklYTUU6IDxodHRwczovL3dlYmtpdC5vcmcvYi8yMjQ2NTI+IChXZWIg SW5zcGVjdG9yOiBUcmVlIE91dGxpbmVzOiBgb25kZXRhY2hgIGNhbiBiZSBjYWxsZWQgd2l0aG91 dCBgb25hdHRhY2hgIGV2ZXIgYmVpbmcgY2FsbGVkKQotCiAgICAgICAgIGlmICh0aGlzLnJlcHJl c2VudGVkT2JqZWN0IGluc3RhbmNlb2YgV0kuQXVkaXRUZXN0QmFzZSkgewogICAgICAgICAgICAg dGhpcy5yZXByZXNlbnRlZE9iamVjdC5yZW1vdmVFdmVudExpc3RlbmVyKFdJLkF1ZGl0VGVzdEJh c2UuRXZlbnQuRGlzYWJsZWRDaGFuZ2VkLCB0aGlzLl9oYW5kbGVUZXN0RGlzYWJsZWRDaGFuZ2Vk LCB0aGlzKTsKICAgICAgICAgICAgIHRoaXMucmVwcmVzZW50ZWRPYmplY3QucmVtb3ZlRXZlbnRM aXN0ZW5lcihXSS5BdWRpdFRlc3RCYXNlLkV2ZW50LlJlc3VsdENoYW5nZWQsIHRoaXMuX2hhbmRs ZVRlc3RSZXN1bHRDaGFuZ2VkLCB0aGlzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Jvb3RzdHJhcFNjcmlwdFRyZWVFbGVtZW50LmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQm9vdHN0cmFwU2NyaXB0 VHJlZUVsZW1lbnQuanMKaW5kZXggNDI3MWExMTc3MjBlZmZlNTA0ZTM3YmYxMTgwYjdjZThiZDUx ZDY1Ni4uMjc2NjNmZTk5OWY3MTEyM2UzZjA1MGNhOTkyYWEwZWVmZTFjZjg4NiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQm9vdHN0cmFwU2Ny aXB0VHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQm9vdHN0cmFwU2NyaXB0VHJlZUVsZW1lbnQuanMKQEAgLTUyLDggKzUyLDYgQEAg V0kuQm9vdHN0cmFwU2NyaXB0VHJlZUVsZW1lbnQgPSBjbGFzcyBCb290c3RyYXBTY3JpcHRUcmVl RWxlbWVudCBleHRlbmRzIFdJLlNjcmkKIAogICAgIG9uZGV0YWNoKCkKICAgICB7Ci0gICAgICAg IC8vIEZJWE1FOiA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMjI0NjUyPiAoV2ViIEluc3BlY3Rvcjog VHJlZSBPdXRsaW5lczogYG9uZGV0YWNoYCBjYW4gYmUgY2FsbGVkIHdpdGhvdXQgYG9uYXR0YWNo YCBldmVyIGJlaW5nIGNhbGxlZCkKLQogICAgICAgICBXSS5OZXR3b3JrTWFuYWdlci5yZW1vdmVF dmVudExpc3RlbmVyKFdJLk5ldHdvcmtNYW5hZ2VyLkV2ZW50LkJvb3RzdHJhcFNjcmlwdEVuYWJs ZWRDaGFuZ2VkLCB0aGlzLl9oYW5kbGVOZXR3b3JrTWFuYWdlckJvb3RzdHJhcFNjcmlwdEVuYWJs ZWRDaGFuZ2VkLCB0aGlzKTsKIAogICAgICAgICBzdXBlci5vbmRldGFjaCgpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQnJlYWtwb2ludFRy ZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv QnJlYWtwb2ludFRyZWVFbGVtZW50LmpzCmluZGV4IDdkZDhmY2VjZGNiNTdiMDQ0NDJiNDNlN2Q0 Njg2NTMxNjk2NzU3ODQuLjg4MGM4ZGI5YjM2MmJmZWIwNGE5ZjhlM2ExNDdhZTUwNjJlYjE0YWUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Jy ZWFrcG9pbnRUcmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9CcmVha3BvaW50VHJlZUVsZW1lbnQuanMKQEAgLTExMSw4ICsxMTEsNiBA QCBXSS5CcmVha3BvaW50VHJlZUVsZW1lbnQgPSBjbGFzcyBCcmVha3BvaW50VHJlZUVsZW1lbnQg ZXh0ZW5kcyBXSS5HZW5lcmFsVHJlZUVsZQogCiAgICAgb25kZXRhY2goKQogICAgIHsKLSAgICAg ICAgLy8gRklYTUU6IDxodHRwczovL3dlYmtpdC5vcmcvYi8yMjQ2NTI+IChXZWIgSW5zcGVjdG9y OiBUcmVlIE91dGxpbmVzOiBgb25kZXRhY2hgIGNhbiBiZSBjYWxsZWQgd2l0aG91dCBgb25hdHRh Y2hgIGV2ZXIgYmVpbmcgY2FsbGVkKQotCiAgICAgICAgIHN1cGVyLm9uZGV0YWNoKCk7CiAKICAg ICAgICAgdGhpcy5fYnJlYWtwb2ludC5yZW1vdmVFdmVudExpc3RlbmVyKFdJLkJyZWFrcG9pbnQu RXZlbnQuRGlzYWJsZWRTdGF0ZURpZENoYW5nZSwgdGhpcy51cGRhdGVTdGF0dXMsIHRoaXMpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9N VHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9ET01UcmVlRWxlbWVudC5qcwppbmRleCA3ZmE2ZjI3NDg5MzgyMzFmNWI4OTM5MDMwMzZiMDM5 OWM2N2E0MTQxLi43MWIzYTMzYWI3MTI0YzE1N2YwNzkzMzU4YjBhM2I3ZGY0NWNmZDQzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVl RWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9ET01UcmVlRWxlbWVudC5qcwpAQCAtNDU1LDggKzQ1NSw2IEBAIFdJLkRPTVRyZWVFbGVtZW50 ID0gY2xhc3MgRE9NVHJlZUVsZW1lbnQgZXh0ZW5kcyBXSS5UcmVlRWxlbWVudAogCiAgICAgb25k ZXRhY2goKQogICAgIHsKLSAgICAgICAgLy8gRklYTUU6IDxodHRwczovL3dlYmtpdC5vcmcvYi8y MjQ2NTI+IChXZWIgSW5zcGVjdG9yOiBUcmVlIE91dGxpbmVzOiBgb25kZXRhY2hgIGNhbiBiZSBj YWxsZWQgd2l0aG91dCBgb25hdHRhY2hgIGV2ZXIgYmVpbmcgY2FsbGVkKQotCiAgICAgICAgIGlm ICh0aGlzLnJlcHJlc2VudGVkT2JqZWN0LmxheW91dENvbnRleHRUeXBlID09PSBXSS5ET01Ob2Rl LkxheW91dENvbnRleHRUeXBlLkdyaWQpIHsKICAgICAgICAgICAgIFdJLm92ZXJsYXlNYW5hZ2Vy LnJlbW92ZUV2ZW50TGlzdGVuZXIoV0kuT3ZlcmxheU1hbmFnZXIuRXZlbnQuR3JpZE92ZXJsYXlT aG93biwgdGhpcy5fdXBkYXRlR3JpZEJhZGdlU3RhdHVzLCB0aGlzKTsKICAgICAgICAgICAgIFdJ Lm92ZXJsYXlNYW5hZ2VyLnJlbW92ZUV2ZW50TGlzdGVuZXIoV0kuT3ZlcmxheU1hbmFnZXIuRXZl bnQuR3JpZE92ZXJsYXlIaWRkZW4sIHRoaXMuX3VwZGF0ZUdyaWRCYWRnZVN0YXR1cywgdGhpcyk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9G cmFtZVRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvRnJhbWVUcmVlRWxlbWVudC5qcwppbmRleCA1ZTRmM2U2NTIwOWZmYTExZjAxMTVjZWQy ZDMzMTI4ODNmOTA2Y2JjLi43NGY5NjEyOGZmY2ZmMmE1NzgyM2Y3NGUyOTBlY2NmNWU5MGY5MGRh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9G cmFtZVRyZWVFbGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0ZyYW1lVHJlZUVsZW1lbnQuanMKQEAgLTEyMSwxMiArMTIxLDggQEAgV0kuRnJh bWVUcmVlRWxlbWVudCA9IGNsYXNzIEZyYW1lVHJlZUVsZW1lbnQgZXh0ZW5kcyBXSS5SZXNvdXJj ZVRyZWVFbGVtZW50CiAKICAgICBvbmRldGFjaCgpCiAgICAgewotICAgICAgICAvLyBGSVhNRTog PGh0dHBzOi8vd2Via2l0Lm9yZy9iLzIyNDY1Mj4gKFdlYiBJbnNwZWN0b3I6IFRyZWUgT3V0bGlu ZXM6IGBvbmRldGFjaGAgY2FuIGJlIGNhbGxlZCB3aXRob3V0IGBvbmF0dGFjaGAgZXZlciBiZWlu ZyBjYWxsZWQpCi0KLSAgICAgICAgaWYgKHRoaXMubGlzdEl0ZW1FbGVtZW50KSB7Ci0gICAgICAg ICAgICBXSS5jc3NNYW5hZ2VyLnJlbW92ZUV2ZW50TGlzdGVuZXIoV0kuQ1NTTWFuYWdlci5FdmVu dC5TdHlsZVNoZWV0QWRkZWQsIHRoaXMuX3N0eWxlU2hlZXRBZGRlZCwgdGhpcyk7Ci0gICAgICAg ICAgICBXSS5jc3NNYW5hZ2VyLnJlbW92ZUV2ZW50TGlzdGVuZXIoV0kuQ1NTTWFuYWdlci5FdmVu dC5TdHlsZVNoZWV0UmVtb3ZlZCwgdGhpcy5fc3R5bGVTaGVldFJlbW92ZWQsIHRoaXMpOwotICAg ICAgICB9CisgICAgICAgIFdJLmNzc01hbmFnZXIucmVtb3ZlRXZlbnRMaXN0ZW5lcihXSS5DU1NN YW5hZ2VyLkV2ZW50LlN0eWxlU2hlZXRBZGRlZCwgdGhpcy5fc3R5bGVTaGVldEFkZGVkLCB0aGlz KTsKKyAgICAgICAgV0kuY3NzTWFuYWdlci5yZW1vdmVFdmVudExpc3RlbmVyKFdJLkNTU01hbmFn ZXIuRXZlbnQuU3R5bGVTaGVldFJlbW92ZWQsIHRoaXMuX3N0eWxlU2hlZXRSZW1vdmVkLCB0aGlz KTsKIAogICAgICAgICBzdXBlci5vbmRldGFjaCgpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0phdmFTY3JpcHRCcmVha3BvaW50 VHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9KYXZhU2NyaXB0QnJlYWtwb2ludFRyZWVFbGVtZW50LmpzCmluZGV4IGM5YjgxMTljMDI3M2Rj OTc1MGJkOTNhNGJiZTM4ZGI2MmJlZWVlNjguLmU0NWRhYjNlZmEyYzJhMWM1MWNjNjYxODNhNTJi YWIxZDUzNWM5NWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0phdmFTY3JpcHRCcmVha3BvaW50VHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSmF2YVNjcmlwdEJyZWFrcG9pbnRU cmVlRWxlbWVudC5qcwpAQCAtNTksOCArNTksNiBAQCBXSS5KYXZhU2NyaXB0QnJlYWtwb2ludFRy ZWVFbGVtZW50ID0gY2xhc3MgSmF2YVNjcmlwdEJyZWFrcG9pbnRUcmVlRWxlbWVudCBleHRlbgog CiAgICAgb25kZXRhY2goKQogICAgIHsKLSAgICAgICAgLy8gRklYTUU6IDxodHRwczovL3dlYmtp dC5vcmcvYi8yMjQ2NTI+IChXZWIgSW5zcGVjdG9yOiBUcmVlIE91dGxpbmVzOiBgb25kZXRhY2hg IGNhbiBiZSBjYWxsZWQgd2l0aG91dCBgb25hdHRhY2hgIGV2ZXIgYmVpbmcgY2FsbGVkKQotCiAg ICAgICAgIGlmICghdGhpcy5icmVha3BvaW50LnNwZWNpYWwpCiAgICAgICAgICAgICB0aGlzLmJy ZWFrcG9pbnQucmVtb3ZlRXZlbnRMaXN0ZW5lcihXSS5KYXZhU2NyaXB0QnJlYWtwb2ludC5FdmVu dC5Mb2NhdGlvbkRpZENoYW5nZSwgdGhpcy5fYnJlYWtwb2ludExvY2F0aW9uRGlkQ2hhbmdlLCB0 aGlzKTsKICAgICAgICAgdGhpcy5icmVha3BvaW50LnJlbW92ZUV2ZW50TGlzdGVuZXIoV0kuSmF2 YVNjcmlwdEJyZWFrcG9pbnQuRXZlbnQuUmVzb2x2ZWRTdGF0ZURpZENoYW5nZSwgdGhpcy51cGRh dGVTdGF0dXMsIHRoaXMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvTG9jYWxSZXNvdXJjZU92ZXJyaWRlVHJlZUVsZW1lbnQuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2NhbFJlc291cmNlT3ZlcnJp ZGVUcmVlRWxlbWVudC5qcwppbmRleCA3YTdiNTFhN2YyYjQyYmQ5Y2I2ZDJiOWRhYmM0ZDFjYzZi M2M4MzE5Li5kODRkNGNmNWFiZDY3OGQxZWI5NjljNDFiOTdiZTUzYWM4MDgyNGFmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2NhbFJlc291 cmNlT3ZlcnJpZGVUcmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Mb2NhbFJlc291cmNlT3ZlcnJpZGVUcmVlRWxlbWVudC5qcwpAQCAt NTYsOCArNTYsNiBAQCBXSS5Mb2NhbFJlc291cmNlT3ZlcnJpZGVUcmVlRWxlbWVudCA9IGNsYXNz IExvY2FsUmVzb3VyY2VPdmVycmlkZVRyZWVFbGVtZW50IGV4dAogCiAgICAgb25kZXRhY2goKQog ICAgIHsKLSAgICAgICAgLy8gRklYTUU6IDxodHRwczovL3dlYmtpdC5vcmcvYi8yMjQ2NTI+IChX ZWIgSW5zcGVjdG9yOiBUcmVlIE91dGxpbmVzOiBgb25kZXRhY2hgIGNhbiBiZSBjYWxsZWQgd2l0 aG91dCBgb25hdHRhY2hgIGV2ZXIgYmVpbmcgY2FsbGVkKQotCiAgICAgICAgIHRoaXMuX2xvY2Fs UmVzb3VyY2VPdmVycmlkZS5yZW1vdmVFdmVudExpc3RlbmVyKFdJLkxvY2FsUmVzb3VyY2VPdmVy cmlkZS5FdmVudC5EaXNhYmxlZENoYW5nZWQsIHRoaXMuX2hhbmRsZUxvY2FsUmVzb3VyY2VPdmVy cmlkZURpc2FibGVkQ2hhbmdlZCwgdGhpcyk7CiAKICAgICAgICAgV0kuRnJhbWUucmVtb3ZlRXZl bnRMaXN0ZW5lcihXSS5GcmFtZS5FdmVudC5NYWluUmVzb3VyY2VEaWRDaGFuZ2UsIHRoaXMuX2hh bmRsZUZyYW1lTWFpblJlc291cmNlRGlkQ2hhbmdlLCB0aGlzKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NoYWRlclByb2dyYW1UcmVlRWxl bWVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NoYWRl clByb2dyYW1UcmVlRWxlbWVudC5qcwppbmRleCA3NGJmZGE4NDEzOWM3NGY4NjUxZmUwOTQ4OGMw NDUyNDJjMTZhYjUzLi5jMmQzZjc1MzRkZDdhNmY0NGEzZTAxYjE5YzUxOTAxMzc1Nzg2YjViIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TaGFk ZXJQcm9ncmFtVHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvU2hhZGVyUHJvZ3JhbVRyZWVFbGVtZW50LmpzCkBAIC02MCw4ICs2MCw2 IEBAIFdJLlNoYWRlclByb2dyYW1UcmVlRWxlbWVudCA9IGNsYXNzIFNoYWRlclByb2dyYW1UcmVl RWxlbWVudCBleHRlbmRzIFdJLkdlbmVyYWxUCiAKICAgICBvbmRldGFjaCgpCiAgICAgewotICAg ICAgICAvLyBGSVhNRTogPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzIyNDY1Mj4gKFdlYiBJbnNwZWN0 b3I6IFRyZWUgT3V0bGluZXM6IGBvbmRldGFjaGAgY2FuIGJlIGNhbGxlZCB3aXRob3V0IGBvbmF0 dGFjaGAgZXZlciBiZWluZyBjYWxsZWQpCi0KICAgICAgICAgLy8gRklYTUU6IGFkZCBzdXBwb3J0 IGZvciBkaXNhYmxpbmcvaGlnaGxpZ2h0aW5nIFdlYkdQVSBzaGFkZXIgcGlwZWxpbmVzLgogICAg ICAgICBsZXQgY29udGV4dFR5cGUgPSB0aGlzLnJlcHJlc2VudGVkT2JqZWN0LmNhbnZhcy5jb250 ZXh0VHlwZTsKICAgICAgICAgaWYgKGNvbnRleHRUeXBlID09PSBXSS5DYW52YXMuQ29udGV4dFR5 cGUuV2ViR0wgfHwgY29udGV4dFR5cGUgPT09IFdJLkNhbnZhcy5Db250ZXh0VHlwZS5XZWJHTDIp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9U cmVlRWxlbWVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1RyZWVFbGVtZW50LmpzCmluZGV4IDc3MWI3YWZiZDMxYzdiZTdkZmFkZGRkYzNlZGU0ZGMwOWIx NmNjN2YuLmFjNTZiZjIwYTdlNmY3NTRkMjAzMTQ5NjU3YzUxOWMyNDdkMmU2NGUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVFbGVtZW50 LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVF bGVtZW50LmpzCkBAIC0yNDgsOCArMjQ4LDggQEAgV0kuVHJlZUVsZW1lbnQgPSBjbGFzcyBUcmVl RWxlbWVudCBleHRlbmRzIFdJLk9iamVjdAogICAgIF9hdHRhY2goKQogICAgIHsKICAgICAgICAg aWYgKCF0aGlzLl9saXN0SXRlbU5vZGUgfHwgdGhpcy5wYXJlbnQuX3Nob3VsZFJlZnJlc2hDaGls ZHJlbikgewotICAgICAgICAgICAgaWYgKHRoaXMuX2xpc3RJdGVtTm9kZSAmJiB0aGlzLl9saXN0 SXRlbU5vZGUucGFyZW50Tm9kZSkKLSAgICAgICAgICAgICAgICB0aGlzLl9saXN0SXRlbU5vZGUu cGFyZW50Tm9kZS5yZW1vdmVDaGlsZCh0aGlzLl9saXN0SXRlbU5vZGUpOworICAgICAgICAgICAg aWYgKHRoaXMucGFyZW50Ll9zaG91bGRSZWZyZXNoQ2hpbGRyZW4pCisgICAgICAgICAgICAgICAg dGhpcy5fZGV0YWNoKCk7CiAKICAgICAgICAgICAgIHRoaXMuX2xpc3RJdGVtTm9kZSA9IHRoaXMu dHJlZU91dGxpbmUuX2NoaWxkcmVuTGlzdE5vZGUub3duZXJEb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJsaSIpOwogICAgICAgICAgICAgdGhpcy5fbGlzdEl0ZW1Ob2RlLnRyZWVFbGVtZW50ID0gdGhp czsKQEAgLTI5MCw4ICsyOTAsNyBAQCBXSS5UcmVlRWxlbWVudCA9IGNsYXNzIFRyZWVFbGVtZW50 IGV4dGVuZHMgV0kuT2JqZWN0CiAKICAgICBfZGV0YWNoKCkKICAgICB7Ci0gICAgICAgIC8vIEZJ WE1FOiA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMjI0NjUyPiAoV2ViIEluc3BlY3RvcjogVHJlZSBP dXRsaW5lczogYG9uZGV0YWNoYCBjYW4gYmUgY2FsbGVkIHdpdGhvdXQgYG9uYXR0YWNoYCBldmVy IGJlaW5nIGNhbGxlZCkKLSAgICAgICAgaWYgKHRoaXMub25kZXRhY2gpCisgICAgICAgIGlmICh0 aGlzLm9uZGV0YWNoICYmIHRoaXMuX2xpc3RJdGVtTm9kZSkKICAgICAgICAgICAgIHRoaXMub25k ZXRhY2godGhpcyk7CiAgICAgICAgIGlmICh0aGlzLl9saXN0SXRlbU5vZGUgJiYgdGhpcy5fbGlz dEl0ZW1Ob2RlLnBhcmVudE5vZGUpCiAgICAgICAgICAgICB0aGlzLl9saXN0SXRlbU5vZGUucGFy ZW50Tm9kZS5yZW1vdmVDaGlsZCh0aGlzLl9saXN0SXRlbU5vZGUpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvV2ViU29ja2V0UmVzb3VyY2VU cmVlRWxlbWVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1dlYlNvY2tldFJlc291cmNlVHJlZUVsZW1lbnQuanMKaW5kZXggNTVjZWRmYWM2YzAzM2RhODQ3 N2EyYzI2NDkyNTI4ZGMyNmM0NDUxOC4uYzEzZDUwOTBhODFlZGIwNzg3YjM3NDBhOTcyYTgwZGE2 NDQ1NjZlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvV2ViU29ja2V0UmVzb3VyY2VUcmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9XZWJTb2NrZXRSZXNvdXJjZVRyZWVFbGVtZW50 LmpzCkBAIC0zOCwxMSArMzgsOSBAQCBXSS5XZWJTb2NrZXRSZXNvdXJjZVRyZWVFbGVtZW50ID0g Y2xhc3MgV2ViU29ja2V0UmVzb3VyY2VUcmVlRWxlbWVudCBleHRlbmRzIFdJLgogCiAgICAgb25k ZXRhY2goKQogICAgIHsKLSAgICAgICAgLy8gRklYTUU6IDxodHRwczovL3dlYmtpdC5vcmcvYi8y MjQ2NTI+IChXZWIgSW5zcGVjdG9yOiBUcmVlIE91dGxpbmVzOiBgb25kZXRhY2hgIGNhbiBiZSBj YWxsZWQgd2l0aG91dCBgb25hdHRhY2hgIGV2ZXIgYmVpbmcgY2FsbGVkKQorICAgICAgICB0aGlz LnJlc291cmNlLnJlbW92ZUV2ZW50TGlzdGVuZXIoV0kuV2ViU29ja2V0UmVzb3VyY2UuRXZlbnQu UmVhZHlTdGF0ZUNoYW5nZWQsIHRoaXMuX3VwZGF0ZUNvbm5lY3Rpb25TdGF0dXMsIHRoaXMpOwog CiAgICAgICAgIHN1cGVyLm9uZGV0YWNoKCk7Ci0KLSAgICAgICAgdGhpcy5yZXNvdXJjZS5yZW1v dmVFdmVudExpc3RlbmVyKFdJLldlYlNvY2tldFJlc291cmNlLkV2ZW50LlJlYWR5U3RhdGVDaGFu Z2VkLCB0aGlzLl91cGRhdGVDb25uZWN0aW9uU3RhdHVzLCB0aGlzKTsKICAgICB9CiAKICAgICBw b3B1bGF0ZUNvbnRleHRNZW51KGNvbnRleHRNZW51LCBldmVudCkK