190986 2018-10-27 10:59:35 -0700 Web Inspector: refactor WI.ScopeBarItem for better extensibility 2018-10-30 10:49:43 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 190754 1 hi hi bburg commit-queue ews-watchlist hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1472716 0 hi 2018-10-27 10:59:35 -0700 This will allow options to be added in the future without having to supply falsy arguments. 1472723 1 353238 hi 2018-10-27 11:04:49 -0700 Created attachment 353238 Patch 1472726 2 ews-watchlist 2018-10-27 11:08:23 -0700 Attachment 353238 did not pass style-queue: ERROR: Source/WebInspectorUI/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Total errors found: 1 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 1472730 3 353242 hi 2018-10-27 11:10:49 -0700 Created attachment 353242 Patch Whoops. Forgot bug number. 1473273 4 353242 bburg 2018-10-30 09:01:39 -0700 Comment on attachment 353242 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=353242&action=review r=me > Source/WebInspectorUI/ChangeLog:8 > + * UserInterface/Views/ScopeBarItem.js: You didn't say what the better extensibility is. > Source/WebInspectorUI/UserInterface/Views/LogContentView.js:82 > + new WI.ScopeBarItem(WI.LogContentView.Scopes.Debugs, WI.UIString("Debugs"), {className: "debugs", hidden: true}), Yaaassss > Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js:58 > + exclusive: true, Nit: No need to wrap this line > Source/WebInspectorUI/UserInterface/Views/ScopeBar.js:-155 > - var replacesCurrentSelection = this._shouldGroupNonExclusiveItems || !event.data.withModifier; Nit: let > Source/WebInspectorUI/UserInterface/Views/ScopeBar.js:157 > + var replacesCurrentSelection = this._shouldGroupNonExclusiveItems || !event.data.extendSelection; You should mention this renaming in the changelog. I thought it was a mistake. 1473285 5 353379 hi 2018-10-30 10:10:32 -0700 Created attachment 353379 Patch 1473310 6 353379 commit-queue 2018-10-30 10:48:25 -0700 Comment on attachment 353379 Patch Clearing flags on attachment: 353379 Committed r237593: <https://trac.webkit.org/changeset/237593> 1473311 7 commit-queue 2018-10-30 10:48:27 -0700 All reviewed patches have been landed. Closing bug. 1473313 8 webkit-bug-importer 2018-10-30 10:49:43 -0700 <rdar://problem/45673205> 353238 2018-10-27 11:04:49 -0700 2018-10-27 11:10:49 -0700 Patch scopeBar.diff text/plain 13673 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGQyZWUzNTcyZjRkLi41YTNjMDc5MDljNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTgtMTAtMjYgIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJl ZmFjdG9yIFdJLlNjb3BlQmFySXRlbSBmb3IgYmV0dGVyIGV4dGVuc2liaWxpdHkKKyAgICAgICAg TmVlZCB0aGUgYnVnIFVSTCAoT09QUyEpLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TY29wZUJhckl0ZW0uanM6 CisgICAgICAgIChXSS5TY29wZUJhckl0ZW0pOgorICAgICAgICAoV0kuU2NvcGVCYXJJdGVtLnBy b3RvdHlwZS5zZXQgc2VsZWN0ZWQpOgorICAgICAgICAoV0kuU2NvcGVCYXJJdGVtLnByb3RvdHlw ZS5faGFuZGxlTW91c2VEb3duKToKKyAgICAgICAgKFdJLlNjb3BlQmFySXRlbS5wcm90b3R5cGUu c2V0U2VsZWN0ZWQpOiBEZWxldGVkLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9T Y29wZUJhci5qczoKKyAgICAgICAgKFdJLlNjb3BlQmFyKToKKyAgICAgICAgKFdJLlNjb3BlQmFy LnByb3RvdHlwZS5fcG9wdWxhdGUpOgorICAgICAgICAoV0kuU2NvcGVCYXIucHJvdG90eXBlLl9p dGVtU2VsZWN0aW9uRGlkQ2hhbmdlKToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv TXVsdGlwbGVTY29wZUJhckl0ZW0uanM6CisgICAgICAgIChXSS5NdWx0aXBsZVNjb3BlQmFySXRl bS5wcm90b3R5cGUuc2V0IHNlbGVjdGVkU2NvcGVCYXJJdGVtKToKKworICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvQ2FudmFzU2lkZWJhclBhbmVsLmpzOgorICAgICAgICAoV0kuQ2FudmFz U2lkZWJhclBhbmVsLnByb3RvdHlwZS5fdXBkYXRlUmVjb3JkaW5nU2NvcGVCYXIpOgorICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5M b2dDb250ZW50Vmlldyk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFi bGVDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3KToK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlU2lkZWJhclBhbmVsLmpzOgor ICAgICAgICAoV0kuUmVzb3VyY2VTaWRlYmFyUGFuZWwpOgorICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvU3RvcmFnZVNpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdJLlN0b3JhZ2VTaWRl YmFyUGFuZWwpOgorCiAyMDE4LTEwLTI1ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNv bT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBDYW52YXMgUmVjb3JkaW5nIGxvYWRpbmcgZ29l cyBzaWduaWZpY2FudGx5IHNsb3dlciB3aGVuICJGcmFtZSIgdHJlZSBlbGVtZW50IGlzIGV4cGFu ZGVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9DYW52YXNTaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9DYW52YXNTaWRlYmFyUGFuZWwuanMKaW5kZXggYjM5MjlhN2YzMWYuLjI3MWNm M2YwZDc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9DYW52YXNTaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzU2lkZWJhclBhbmVsLmpzCkBAIC00OTQsMTAgKzQ5NCwx MCBAQCBXSS5DYW52YXNTaWRlYmFyUGFuZWwgPSBjbGFzcyBDYW52YXNTaWRlYmFyUGFuZWwgZXh0 ZW5kcyBXSS5OYXZpZ2F0aW9uU2lkZWJhclBhbgogICAgICAgICBpZiAoIXNlbGVjdGVkU2NvcGVC YXJJdGVtKSB7CiAgICAgICAgICAgICBzZWxlY3RlZFNjb3BlQmFySXRlbSA9IHNjb3BlQmFySXRl bXNbMF07CiAKLSAgICAgICAgICAgIGNvbnN0IGV4Y2x1c2l2ZSA9IHRydWU7Ci0gICAgICAgICAg ICBjb25zdCBjbGFzc05hbWUgPSBudWxsOwotICAgICAgICAgICAgY29uc3QgaGlkZGVuID0gdHJ1 ZTsKLSAgICAgICAgICAgIHRoaXMuX3BsYWNlaG9sZGVyU2NvcGVCYXJJdGVtID0gbmV3IFdJLlNj b3BlQmFySXRlbSgiY2FudmFzLXJlY29yZGluZy1zY29wZS1iYXItaXRlbS1wbGFjZWhvbGRlciIs IFdJLlVJU3RyaW5nKCJSZWNvcmRpbmdzIiksIGV4Y2x1c2l2ZSwgY2xhc3NOYW1lLCBoaWRkZW4p OworICAgICAgICAgICAgdGhpcy5fcGxhY2Vob2xkZXJTY29wZUJhckl0ZW0gPSBuZXcgV0kuU2Nv cGVCYXJJdGVtKCJjYW52YXMtcmVjb3JkaW5nLXNjb3BlLWJhci1pdGVtLXBsYWNlaG9sZGVyIiwg V0kuVUlTdHJpbmcoIlJlY29yZGluZ3MiKSwgeworICAgICAgICAgICAgICAgIGV4Y2x1c2l2ZTog dHJ1ZSwKKyAgICAgICAgICAgICAgICBoaWRkZW46IHRydWUsCisgICAgICAgICAgICB9KTsKICAg ICAgICAgICAgIHRoaXMuX3BsYWNlaG9sZGVyU2NvcGVCYXJJdGVtLnNlbGVjdGVkID0gdHJ1ZTsK IAogICAgICAgICAgICAgc2NvcGVCYXJJdGVtcy51bnNoaWZ0KHRoaXMuX3BsYWNlaG9sZGVyU2Nv cGVCYXJJdGVtKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanMKaW5kZXggZDIzMDJmZjQ0NzYuLjEzNzJm ZjE3MTk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9Mb2dDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qcwpAQCAtNzQsMTIgKzc0LDEyIEBAIFdJLkxv Z0NvbnRlbnRWaWV3ID0gY2xhc3MgTG9nQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50Vmll dwogICAgICAgICB0aGlzLl9jaGVja2JveHNOYXZpZ2F0aW9uSXRlbUdyb3VwID0gbmV3IFdJLkdy b3VwTmF2aWdhdGlvbkl0ZW0oW3RoaXMuX3ByZXNlcnZlTG9nTmF2aWdhdGlvbkl0ZW0sIG5ldyBX SS5EaXZpZGVyTmF2aWdhdGlvbkl0ZW1dKTsKIAogICAgICAgICBsZXQgc2NvcGVCYXJJdGVtcyA9 IFsKLSAgICAgICAgICAgIG5ldyBXSS5TY29wZUJhckl0ZW0oV0kuTG9nQ29udGVudFZpZXcuU2Nv cGVzLkFsbCwgV0kuVUlTdHJpbmcoIkFsbCIpLCB0cnVlKSwKLSAgICAgICAgICAgIG5ldyBXSS5T Y29wZUJhckl0ZW0oV0kuTG9nQ29udGVudFZpZXcuU2NvcGVzLkVycm9ycywgV0kuVUlTdHJpbmco IkVycm9ycyIpLCBmYWxzZSwgImVycm9ycyIpLAotICAgICAgICAgICAgbmV3IFdJLlNjb3BlQmFy SXRlbShXSS5Mb2dDb250ZW50Vmlldy5TY29wZXMuV2FybmluZ3MsIFdJLlVJU3RyaW5nKCJXYXJu aW5ncyIpLCBmYWxzZSwgIndhcm5pbmdzIiksCi0gICAgICAgICAgICBuZXcgV0kuU2NvcGVCYXJJ dGVtKFdJLkxvZ0NvbnRlbnRWaWV3LlNjb3Blcy5Mb2dzLCBXSS5VSVN0cmluZygiTG9ncyIpLCBm YWxzZSwgImxvZ3MiKSwKLSAgICAgICAgICAgIG5ldyBXSS5TY29wZUJhckl0ZW0oV0kuTG9nQ29u dGVudFZpZXcuU2NvcGVzLkluZm9zLCBXSS5VSVN0cmluZygiSW5mb3MiKSwgZmFsc2UsICJpbmZv cyIsIHRydWUpLAotICAgICAgICAgICAgbmV3IFdJLlNjb3BlQmFySXRlbShXSS5Mb2dDb250ZW50 Vmlldy5TY29wZXMuRGVidWdzLCBXSS5VSVN0cmluZygiRGVidWdzIiksIGZhbHNlLCAiZGVidWdz IiwgdHJ1ZSksCisgICAgICAgICAgICBuZXcgV0kuU2NvcGVCYXJJdGVtKFdJLkxvZ0NvbnRlbnRW aWV3LlNjb3Blcy5BbGwsIFdJLlVJU3RyaW5nKCJBbGwiKSwge2V4Y2x1c2l2ZTogdHJ1ZX0pLAor ICAgICAgICAgICAgbmV3IFdJLlNjb3BlQmFySXRlbShXSS5Mb2dDb250ZW50Vmlldy5TY29wZXMu RXJyb3JzLCBXSS5VSVN0cmluZygiRXJyb3JzIiksIHtjbGFzc05hbWU6ICJlcnJvcnMifSksCisg ICAgICAgICAgICBuZXcgV0kuU2NvcGVCYXJJdGVtKFdJLkxvZ0NvbnRlbnRWaWV3LlNjb3Blcy5X YXJuaW5ncywgV0kuVUlTdHJpbmcoIldhcm5pbmdzIiksIHtjbGFzc05hbWU6ICJ3YXJuaW5ncyJ9 KSwKKyAgICAgICAgICAgIG5ldyBXSS5TY29wZUJhckl0ZW0oV0kuTG9nQ29udGVudFZpZXcuU2Nv cGVzLkxvZ3MsIFdJLlVJU3RyaW5nKCJMb2dzIiksIHtjbGFzc05hbWU6ICJsb2dzIn0pLAorICAg ICAgICAgICAgbmV3IFdJLlNjb3BlQmFySXRlbShXSS5Mb2dDb250ZW50Vmlldy5TY29wZXMuSW5m b3MsIFdJLlVJU3RyaW5nKCJJbmZvcyIpLCB7Y2xhc3NOYW1lOiAiaW5mb3MiLCBoaWRkZW46IHRy dWV9KSwKKyAgICAgICAgICAgIG5ldyBXSS5TY29wZUJhckl0ZW0oV0kuTG9nQ29udGVudFZpZXcu U2NvcGVzLkRlYnVncywgV0kuVUlTdHJpbmcoIkRlYnVncyIpLCB7Y2xhc3NOYW1lOiAiZGVidWdz IiwgaGlkZGVuOiB0cnVlfSksCiAgICAgICAgIF07CiAKICAgICAgICAgdGhpcy5fc2NvcGVCYXIg PSBuZXcgV0kuU2NvcGVCYXIoImxvZy1zY29wZS1iYXIiLCBzY29wZUJhckl0ZW1zLCBzY29wZUJh ckl0ZW1zWzBdKTsKQEAgLTg4LDkgKzg4LDkgQEAgV0kuTG9nQ29udGVudFZpZXcgPSBjbGFzcyBM b2dDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAgICAgICAgIHRoaXMuX2hhc05v bkRlZmF1bHRMb2dDaGFubmVsTWVzc2FnZSA9IGZhbHNlOwogICAgICAgICBpZiAoV0kuQ29uc29s ZU1hbmFnZXIuc3VwcG9ydHNMb2dDaGFubmVscygpKSB7CiAgICAgICAgICAgICBsZXQgbWVzc2Fn ZUNoYW5uZWxCYXJJdGVtcyA9IFsKLSAgICAgICAgICAgICAgICBuZXcgV0kuU2NvcGVCYXJJdGVt KFdJLkxvZ0NvbnRlbnRWaWV3LlNjb3Blcy5BbGxDaGFubmVscywgV0kuVUlTdHJpbmcoIkFsbCIp LCB0cnVlKSwKLSAgICAgICAgICAgICAgICBuZXcgV0kuU2NvcGVCYXJJdGVtKFdJLkxvZ0NvbnRl bnRWaWV3LlNjb3Blcy5NZWRpYSwgV0kuVUlTdHJpbmcoIk1lZGlhIiksIGZhbHNlLCAibWVkaWEi KSwKLSAgICAgICAgICAgICAgICBuZXcgV0kuU2NvcGVCYXJJdGVtKFdJLkxvZ0NvbnRlbnRWaWV3 LlNjb3Blcy5XZWJSVEMsIFdJLlVJU3RyaW5nKCJXZWJSVEMiKSwgZmFsc2UsICJ3ZWJydGMiKQor ICAgICAgICAgICAgICAgIG5ldyBXSS5TY29wZUJhckl0ZW0oV0kuTG9nQ29udGVudFZpZXcuU2Nv cGVzLkFsbENoYW5uZWxzLCBXSS5VSVN0cmluZygiQWxsIiksIHtleGNsdXNpdmU6IHRydWV9KSwK KyAgICAgICAgICAgICAgICBuZXcgV0kuU2NvcGVCYXJJdGVtKFdJLkxvZ0NvbnRlbnRWaWV3LlNj b3Blcy5NZWRpYSwgV0kuVUlTdHJpbmcoIk1lZGlhIiksIHtjbGFzc05hbWU6ICJtZWRpYSJ9KSwK KyAgICAgICAgICAgICAgICBuZXcgV0kuU2NvcGVCYXJJdGVtKFdJLkxvZ0NvbnRlbnRWaWV3LlNj b3Blcy5XZWJSVEMsIFdJLlVJU3RyaW5nKCJXZWJSVEMiKSwge2NsYXNzTmFtZTogIndlYnJ0YyJ9 KSwKICAgICAgICAgICAgIF07CiAKICAgICAgICAgICAgIHRoaXMuX21lc3NhZ2VTb3VyY2VCYXIg PSBuZXcgV0kuU2NvcGVCYXIoIm1lc3NhZ2UtY2hhbm5lbC1zY29wZS1iYXIiLCBtZXNzYWdlQ2hh bm5lbEJhckl0ZW1zLCBtZXNzYWdlQ2hhbm5lbEJhckl0ZW1zWzBdKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL011bHRpcGxlU2NvcGVCYXJJ dGVtLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTXVsdGlw bGVTY29wZUJhckl0ZW0uanMKaW5kZXggNmFhYzI0M2E4ZTYuLjczYjZlMWQyZDJlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9NdWx0aXBsZVNj b3BlQmFySXRlbS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9NdWx0aXBsZVNjb3BlQmFySXRlbS5qcwpAQCAtMTM3LDggKzEzNyw5IEBAIFdJLk11bHRp cGxlU2NvcGVCYXJJdGVtID0gY2xhc3MgTXVsdGlwbGVTY29wZUJhckl0ZW0gZXh0ZW5kcyBXSS5P YmplY3QKICAgICAgICAgICAgIHRoaXMuX3NlbGVjdGVkU2NvcGVCYXJJdGVtLnNlbGVjdGVkID0g dHJ1ZTsKICAgICAgICAgfQogCi0gICAgICAgIHZhciB3aXRoTW9kaWZpZXIgPSBXSS5tb2RpZmll cktleXMubWV0YUtleSAmJiAhV0kubW9kaWZpZXJLZXlzLmN0cmxLZXkgJiYgIVdJLm1vZGlmaWVy S2V5cy5hbHRLZXkgJiYgIVdJLm1vZGlmaWVyS2V5cy5zaGlmdEtleTsKLSAgICAgICAgdGhpcy5k aXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV0kuU2NvcGVCYXJJdGVtLkV2ZW50LlNlbGVjdGlvbkNo YW5nZWQsIHt3aXRoTW9kaWZpZXJ9KTsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0 ZW5lcnMoV0kuU2NvcGVCYXJJdGVtLkV2ZW50LlNlbGVjdGlvbkNoYW5nZWQsIHsKKyAgICAgICAg ICAgIGV4dGVuZFNlbGVjdGlvbjogV0kubW9kaWZpZXJLZXlzLm1ldGFLZXkgJiYgIVdJLm1vZGlm aWVyS2V5cy5jdHJsS2V5ICYmICFXSS5tb2RpZmllcktleXMuYWx0S2V5ICYmICFXSS5tb2RpZmll cktleXMuc2hpZnRLZXksCisgICAgICAgIH0pOwogCiAgICAgICAgIHRoaXMuX2lnbm9yZUl0ZW1T ZWxlY3RlZEV2ZW50ID0gZmFsc2U7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYmxlQ29udGVudFZpZXcuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250 ZW50Vmlldy5qcwppbmRleCA4ZmZhNzIyNTI3Zi4uZDBiZjljZWY1YTMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRl bnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmpzCkBAIC01NCw4ICs1NCw5IEBAIFdJLk5ldHdvcmtU YWJsZUNvbnRlbnRWaWV3ID0gY2xhc3MgTmV0d29ya1RhYmxlQ29udGVudFZpZXcgZXh0ZW5kcyBX SS5Db250ZW50VmllCiAgICAgICAgIC8vIEZJWE1FOiBOZXR3b3JrIFRpbWVsaW5lLgogICAgICAg ICAvLyBGSVhNRTogVGhyb3R0bGluZy4KIAotICAgICAgICBjb25zdCBleGNsdXNpdmUgPSB0cnVl OwotICAgICAgICB0aGlzLl90eXBlRmlsdGVyU2NvcGVCYXJJdGVtQWxsID0gbmV3IFdJLlNjb3Bl QmFySXRlbSgibmV0d29yay10eXBlLWZpbHRlci1hbGwiLCBXSS5VSVN0cmluZygiQWxsIiksIGV4 Y2x1c2l2ZSk7CisgICAgICAgIHRoaXMuX3R5cGVGaWx0ZXJTY29wZUJhckl0ZW1BbGwgPSBuZXcg V0kuU2NvcGVCYXJJdGVtKCJuZXR3b3JrLXR5cGUtZmlsdGVyLWFsbCIsIFdJLlVJU3RyaW5nKCJB bGwiKSwgeworICAgICAgICAgICAgZXhjbHVzaXZlOiB0cnVlLAorICAgICAgICB9KTsKICAgICAg ICAgbGV0IHR5cGVGaWx0ZXJTY29wZUJhckl0ZW1zID0gW3RoaXMuX3R5cGVGaWx0ZXJTY29wZUJh ckl0ZW1BbGxdOwogCiAgICAgICAgIGxldCB1bmlxdWVUeXBlcyA9IFsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlU2lkZWJhclBh bmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3Vy Y2VTaWRlYmFyUGFuZWwuanMKaW5kZXggZDRhMGVhNzgwMmYuLmEzMzlhOWI0Mzk2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVNp ZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9SZXNvdXJjZVNpZGViYXJQYW5lbC5qcwpAQCAtMzcsNyArMzcsNyBAQCBXSS5SZXNvdXJj ZVNpZGViYXJQYW5lbCA9IGNsYXNzIFJlc291cmNlU2lkZWJhclBhbmVsIGV4dGVuZHMgV0kuTmF2 aWdhdGlvblNpZGViYQogICAgICAgICB2YXIgc2NvcGVJdGVtUHJlZml4ID0gInJlc291cmNlLXNp ZGViYXItIjsKICAgICAgICAgdmFyIHNjb3BlQmFySXRlbXMgPSBbXTsKIAotICAgICAgICBzY29w ZUJhckl0ZW1zLnB1c2gobmV3IFdJLlNjb3BlQmFySXRlbShzY29wZUl0ZW1QcmVmaXggKyAidHlw ZS1hbGwiLCBXSS5VSVN0cmluZygiQWxsIFJlc291cmNlcyIpLCB0cnVlKSk7CisgICAgICAgIHNj b3BlQmFySXRlbXMucHVzaChuZXcgV0kuU2NvcGVCYXJJdGVtKHNjb3BlSXRlbVByZWZpeCArICJ0 eXBlLWFsbCIsIFdJLlVJU3RyaW5nKCJBbGwgUmVzb3VyY2VzIiksIHtleGNsdXNpdmU6IHRydWV9 KSk7CiAKICAgICAgICAgZm9yICh2YXIga2V5IGluIFdJLlJlc291cmNlLlR5cGUpIHsKICAgICAg ICAgICAgIHZhciB2YWx1ZSA9IFdJLlJlc291cmNlLlR5cGVba2V5XTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Njb3BlQmFyLmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NvcGVCYXIuanMKaW5kZXgg NjJmYmE4ODE2ODguLjYyZjNlYTAzNDMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9TY29wZUJhci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY29wZUJhci5qcwpAQCAtMTMzLDEwICsxMzMsMTIg QEAgV0kuU2NvcGVCYXIgPSBjbGFzcyBTY29wZUJhciBleHRlbmRzIFdJLk5hdmlnYXRpb25JdGVt CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoIXRoaXMuc2VsZWN0ZWRJ dGVtcy5sZW5ndGggJiYgdGhpcy5fZGVmYXVsdEl0ZW0pCi0gICAgICAgICAgICB0aGlzLl9kZWZh dWx0SXRlbS5zZWxlY3RlZCA9IHRydWU7CisgICAgICAgIGlmICh0aGlzLl9kZWZhdWx0SXRlbSkg eworICAgICAgICAgICAgaWYgKCF0aGlzLnNlbGVjdGVkSXRlbXMubGVuZ3RoKQorICAgICAgICAg ICAgICAgIHRoaXMuX2RlZmF1bHRJdGVtLnNlbGVjdGVkID0gdHJ1ZTsKIAotICAgICAgICB0aGlz Ll9lbGVtZW50LmNsYXNzTGlzdC50b2dnbGUoImRlZmF1bHQtaXRlbS1zZWxlY3RlZCIsIHRoaXMu X2RlZmF1bHRJdGVtLnNlbGVjdGVkKTsKKyAgICAgICAgICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NM aXN0LnRvZ2dsZSgiZGVmYXVsdC1pdGVtLXNlbGVjdGVkIiwgdGhpcy5fZGVmYXVsdEl0ZW0uc2Vs ZWN0ZWQpOworICAgICAgICB9CiAgICAgfQogCiAgICAgX2l0ZW1TZWxlY3Rpb25EaWRDaGFuZ2Uo ZXZlbnQpCkBAIC0xNTIsNyArMTU0LDcgQEAgV0kuU2NvcGVCYXIgPSBjbGFzcyBTY29wZUJhciBl eHRlbmRzIFdJLk5hdmlnYXRpb25JdGVtCiAgICAgICAgICAgICAgICAgICAgIGl0ZW0uc2VsZWN0 ZWQgPSBmYWxzZTsKICAgICAgICAgICAgIH0KICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAg IHZhciByZXBsYWNlc0N1cnJlbnRTZWxlY3Rpb24gPSB0aGlzLl9zaG91bGRHcm91cE5vbkV4Y2x1 c2l2ZUl0ZW1zIHx8ICFldmVudC5kYXRhLndpdGhNb2RpZmllcjsKKyAgICAgICAgICAgIHZhciBy ZXBsYWNlc0N1cnJlbnRTZWxlY3Rpb24gPSB0aGlzLl9zaG91bGRHcm91cE5vbkV4Y2x1c2l2ZUl0 ZW1zIHx8ICFldmVudC5kYXRhLmV4dGVuZFNlbGVjdGlvbjsKICAgICAgICAgICAgIGZvciAodmFy IGkgPSAwOyBpIDwgdGhpcy5faXRlbXMubGVuZ3RoOyArK2kpIHsKICAgICAgICAgICAgICAgICBp dGVtID0gdGhpcy5faXRlbXNbaV07CiAgICAgICAgICAgICAgICAgaWYgKGl0ZW0uZXhjbHVzaXZl ICYmIGl0ZW0gIT09IHNlbmRlciAmJiBzZW5kZXIuc2VsZWN0ZWQpCkBAIC0xNjIsMTEgKzE2NCwx MyBAQCBXSS5TY29wZUJhciA9IGNsYXNzIFNjb3BlQmFyIGV4dGVuZHMgV0kuTmF2aWdhdGlvbkl0 ZW0KICAgICAgICAgICAgIH0KICAgICAgICAgfQogCi0gICAgICAgIC8vIElmIG5vdGhpbmcgaXMg c2VsZWN0ZWQgYW55bW9yZSwgc2VsZWN0IHRoZSBkZWZhdWx0IGl0ZW0uCi0gICAgICAgIGlmICgh dGhpcy5zZWxlY3RlZEl0ZW1zLmxlbmd0aCAmJiB0aGlzLl9kZWZhdWx0SXRlbSkKLSAgICAgICAg ICAgIHRoaXMuX2RlZmF1bHRJdGVtLnNlbGVjdGVkID0gdHJ1ZTsKKyAgICAgICAgaWYgKHRoaXMu X2RlZmF1bHRJdGVtKSB7CisgICAgICAgICAgICBpZiAoIXRoaXMuc2VsZWN0ZWRJdGVtcy5sZW5n dGgpCisgICAgICAgICAgICAgICAgdGhpcy5fZGVmYXVsdEl0ZW0uc2VsZWN0ZWQgPSB0cnVlOwor CisgICAgICAgICAgICB0aGlzLl9lbGVtZW50LmNsYXNzTGlzdC50b2dnbGUoImRlZmF1bHQtaXRl bS1zZWxlY3RlZCIsIHRoaXMuX2RlZmF1bHRJdGVtLnNlbGVjdGVkKTsKKyAgICAgICAgfQogCi0g ICAgICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NMaXN0LnRvZ2dsZSgiZGVmYXVsdC1pdGVtLXNlbGVj dGVkIiwgdGhpcy5fZGVmYXVsdEl0ZW0uc2VsZWN0ZWQpOwogICAgICAgICB0aGlzLmRpc3BhdGNo RXZlbnRUb0xpc3RlbmVycyhXSS5TY29wZUJhci5FdmVudC5TZWxlY3Rpb25DaGFuZ2VkKTsKICAg ICB9CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvU2NvcGVCYXJJdGVtLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvU2NvcGVCYXJJdGVtLmpzCmluZGV4IDQxZWE5NzczNzQ5Li5mYmNhMzkzMDI4MSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2Nv cGVCYXJJdGVtLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1Njb3BlQmFySXRlbS5qcwpAQCAtMjUsNyArMjUsNyBAQAogCiBXSS5TY29wZUJhckl0ZW0g PSBjbGFzcyBTY29wZUJhckl0ZW0gZXh0ZW5kcyBXSS5PYmplY3QKIHsKLSAgICBjb25zdHJ1Y3Rv cihpZCwgbGFiZWwsIGV4Y2x1c2l2ZSwgY2xhc3NOYW1lLCBoaWRkZW4pCisgICAgY29uc3RydWN0 b3IoaWQsIGxhYmVsLCB7Y2xhc3NOYW1lLCBleGNsdXNpdmUsIGhpZGRlbn0gPSB7fSkKICAgICB7 CiAgICAgICAgIHN1cGVyKCk7CiAKQEAgLTM4LDcgKzM4LDcgQEAgV0kuU2NvcGVCYXJJdGVtID0g Y2xhc3MgU2NvcGVCYXJJdGVtIGV4dGVuZHMgV0kuT2JqZWN0CiAKICAgICAgICAgdGhpcy5faWQg PSBpZDsKICAgICAgICAgdGhpcy5fbGFiZWwgPSBsYWJlbDsKLSAgICAgICAgdGhpcy5fZXhjbHVz aXZlID0gZXhjbHVzaXZlOworICAgICAgICB0aGlzLl9leGNsdXNpdmUgPSBleGNsdXNpdmUgfHwg ZmFsc2U7CiAgICAgICAgIHRoaXMuX2hpZGRlbiA9ICEhaGlkZGVuOwogCiAgICAgICAgIHRoaXMu X3NlbGVjdGVkU2V0dGluZyA9IG5ldyBXSS5TZXR0aW5nKCJzY29wZWJhcml0ZW0tIiArIGlkLCBm YWxzZSk7CkBAIC03NSwxMSArNzUsNiBAQCBXSS5TY29wZUJhckl0ZW0gPSBjbGFzcyBTY29wZUJh ckl0ZW0gZXh0ZW5kcyBXSS5PYmplY3QKICAgICB9CiAKICAgICBzZXQgc2VsZWN0ZWQoc2VsZWN0 ZWQpCi0gICAgewotICAgICAgICB0aGlzLnNldFNlbGVjdGVkKHNlbGVjdGVkLCBmYWxzZSk7Ci0g ICAgfQotCi0gICAgc2V0U2VsZWN0ZWQoc2VsZWN0ZWQsIHdpdGhNb2RpZmllcikKICAgICB7CiAg ICAgICAgIGlmICh0aGlzLl9zZWxlY3RlZFNldHRpbmcudmFsdWUgPT09IHNlbGVjdGVkKQogICAg ICAgICAgICAgcmV0dXJuOwpAQCAtODcsNyArODIsOSBAQCBXSS5TY29wZUJhckl0ZW0gPSBjbGFz cyBTY29wZUJhckl0ZW0gZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgdGhpcy5fZWxlbWVudC5j bGFzc0xpc3QudG9nZ2xlKCJzZWxlY3RlZCIsIHNlbGVjdGVkKTsKICAgICAgICAgdGhpcy5fc2Vs ZWN0ZWRTZXR0aW5nLnZhbHVlID0gc2VsZWN0ZWQ7CiAKLSAgICAgICAgdGhpcy5kaXNwYXRjaEV2 ZW50VG9MaXN0ZW5lcnMoV0kuU2NvcGVCYXJJdGVtLkV2ZW50LlNlbGVjdGlvbkNoYW5nZWQsIHt3 aXRoTW9kaWZpZXJ9KTsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV0ku U2NvcGVCYXJJdGVtLkV2ZW50LlNlbGVjdGlvbkNoYW5nZWQsIHsKKyAgICAgICAgICAgIGV4dGVu ZFNlbGVjdGlvbjogV0kubW9kaWZpZXJLZXlzLm1ldGFLZXkgJiYgIVdJLm1vZGlmaWVyS2V5cy5j dHJsS2V5ICYmICFXSS5tb2RpZmllcktleXMuYWx0S2V5ICYmICFXSS5tb2RpZmllcktleXMuc2hp ZnRLZXksCisgICAgICAgIH0pOwogICAgIH0KIAogICAgIGdldCBoaWRkZW4oKQpAQCAtMTEzLDcg KzExMCw3IEBAIFdJLlNjb3BlQmFySXRlbSA9IGNsYXNzIFNjb3BlQmFySXRlbSBleHRlbmRzIFdJ Lk9iamVjdAogICAgICAgICBpZiAoZXZlbnQuYnV0dG9uICE9PSAwKQogICAgICAgICAgICAgcmV0 dXJuOwogCi0gICAgICAgIHRoaXMuc2V0U2VsZWN0ZWQoIXRoaXMuc2VsZWN0ZWQsIGV2ZW50Lm1l dGFLZXkgJiYgIWV2ZW50LmN0cmxLZXkgJiYgIWV2ZW50LmFsdEtleSAmJiAhZXZlbnQuc2hpZnRL ZXkpOworICAgICAgICB0aGlzLnNlbGVjdGVkID0gIXRoaXMuc2VsZWN0ZWQ7CiAgICAgfQogfTsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv U3RvcmFnZVNpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1N0b3JhZ2VTaWRlYmFyUGFuZWwuanMKaW5kZXggZDFjZjEzNDIzODUuLmEwNWM5 ZjFhZDc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9TdG9yYWdlU2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1N0b3JhZ2VTaWRlYmFyUGFuZWwuanMKQEAgLTM1LDcgKzM1LDcg QEAgV0kuU3RvcmFnZVNpZGViYXJQYW5lbCA9IGNsYXNzIFN0b3JhZ2VTaWRlYmFyUGFuZWwgZXh0 ZW5kcyBXSS5OYXZpZ2F0aW9uU2lkZWJhclAKICAgICAgICAgdmFyIHNjb3BlSXRlbVByZWZpeCA9 ICJzdG9yYWdlLXNpZGViYXItIjsKICAgICAgICAgdmFyIHNjb3BlQmFySXRlbXMgPSBbXTsKIAot ICAgICAgICBzY29wZUJhckl0ZW1zLnB1c2gobmV3IFdJLlNjb3BlQmFySXRlbShzY29wZUl0ZW1Q cmVmaXggKyAidHlwZS1hbGwiLCBXSS5VSVN0cmluZygiQWxsIFN0b3JhZ2UiKSwgdHJ1ZSkpOwor ICAgICAgICBzY29wZUJhckl0ZW1zLnB1c2gobmV3IFdJLlNjb3BlQmFySXRlbShzY29wZUl0ZW1Q cmVmaXggKyAidHlwZS1hbGwiLCBXSS5VSVN0cmluZygiQWxsIFN0b3JhZ2UiKSwge2V4Y2x1c2l2 ZTogdHJ1ZX0pKTsKIAogICAgICAgICB2YXIgc3RvcmFnZVR5cGVzID0gWwogICAgICAgICAgICAg e2lkZW50aWZpZXI6ICJhcHBsaWNhdGlvbi1jYWNoZSIsIHRpdGxlOiBXSS5VSVN0cmluZygiQXBw bGljYXRpb24gQ2FjaGUiKSwgY2xhc3NlczogW1dJLkFwcGxpY2F0aW9uQ2FjaGVGcmFtZVRyZWVF bGVtZW50LCBXSS5BcHBsaWNhdGlvbkNhY2hlTWFuaWZlc3RUcmVlRWxlbWVudF19LAo= 353242 2018-10-27 11:10:49 -0700 2018-10-30 10:10:27 -0700 Patch scopeBar.diff text/plain 13694 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGQyZWUzNTcyZjRkLi41YTNjMDc5MDljNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTgtMTAtMjcgIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJl ZmFjdG9yIFdJLlNjb3BlQmFySXRlbSBmb3IgYmV0dGVyIGV4dGVuc2liaWxpdHkKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MDk4NgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9W aWV3cy9TY29wZUJhckl0ZW0uanM6CisgICAgICAgIChXSS5TY29wZUJhckl0ZW0pOgorICAgICAg ICAoV0kuU2NvcGVCYXJJdGVtLnByb3RvdHlwZS5zZXQgc2VsZWN0ZWQpOgorICAgICAgICAoV0ku U2NvcGVCYXJJdGVtLnByb3RvdHlwZS5faGFuZGxlTW91c2VEb3duKToKKyAgICAgICAgKFdJLlNj b3BlQmFySXRlbS5wcm90b3R5cGUuc2V0U2VsZWN0ZWQpOiBEZWxldGVkLgorCisgICAgICAgICog VXNlckludGVyZmFjZS9WaWV3cy9TY29wZUJhci5qczoKKyAgICAgICAgKFdJLlNjb3BlQmFyKToK KyAgICAgICAgKFdJLlNjb3BlQmFyLnByb3RvdHlwZS5fcG9wdWxhdGUpOgorICAgICAgICAoV0ku U2NvcGVCYXIucHJvdG90eXBlLl9pdGVtU2VsZWN0aW9uRGlkQ2hhbmdlKToKKworICAgICAgICAq IFVzZXJJbnRlcmZhY2UvVmlld3MvTXVsdGlwbGVTY29wZUJhckl0ZW0uanM6CisgICAgICAgIChX SS5NdWx0aXBsZVNjb3BlQmFySXRlbS5wcm90b3R5cGUuc2V0IHNlbGVjdGVkU2NvcGVCYXJJdGVt KToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzU2lkZWJhclBhbmVsLmpz OgorICAgICAgICAoV0kuQ2FudmFzU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fdXBkYXRlUmVjb3Jk aW5nU2NvcGVCYXIpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZp ZXcuanM6CisgICAgICAgIChXSS5Mb2dDb250ZW50Vmlldyk6CisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLk5ldHdv cmtUYWJsZUNvbnRlbnRWaWV3KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291 cmNlU2lkZWJhclBhbmVsLmpzOgorICAgICAgICAoV0kuUmVzb3VyY2VTaWRlYmFyUGFuZWwpOgor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU3RvcmFnZVNpZGViYXJQYW5lbC5qczoKKyAg ICAgICAgKFdJLlN0b3JhZ2VTaWRlYmFyUGFuZWwpOgorCiAyMDE4LTEwLTI1ICBEZXZpbiBSb3Vz c28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBDYW52YXMg UmVjb3JkaW5nIGxvYWRpbmcgZ29lcyBzaWduaWZpY2FudGx5IHNsb3dlciB3aGVuICJGcmFtZSIg dHJlZSBlbGVtZW50IGlzIGV4cGFuZGVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNTaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNTaWRlYmFyUGFuZWwuanMKaW5k ZXggYjM5MjlhN2YzMWYuLjI3MWNmM2YwZDc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNTaWRlYmFyUGFuZWwuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzU2lkZWJhclBhbmVs LmpzCkBAIC00OTQsMTAgKzQ5NCwxMCBAQCBXSS5DYW52YXNTaWRlYmFyUGFuZWwgPSBjbGFzcyBD YW52YXNTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXSS5OYXZpZ2F0aW9uU2lkZWJhclBhbgogICAgICAg ICBpZiAoIXNlbGVjdGVkU2NvcGVCYXJJdGVtKSB7CiAgICAgICAgICAgICBzZWxlY3RlZFNjb3Bl QmFySXRlbSA9IHNjb3BlQmFySXRlbXNbMF07CiAKLSAgICAgICAgICAgIGNvbnN0IGV4Y2x1c2l2 ZSA9IHRydWU7Ci0gICAgICAgICAgICBjb25zdCBjbGFzc05hbWUgPSBudWxsOwotICAgICAgICAg ICAgY29uc3QgaGlkZGVuID0gdHJ1ZTsKLSAgICAgICAgICAgIHRoaXMuX3BsYWNlaG9sZGVyU2Nv cGVCYXJJdGVtID0gbmV3IFdJLlNjb3BlQmFySXRlbSgiY2FudmFzLXJlY29yZGluZy1zY29wZS1i YXItaXRlbS1wbGFjZWhvbGRlciIsIFdJLlVJU3RyaW5nKCJSZWNvcmRpbmdzIiksIGV4Y2x1c2l2 ZSwgY2xhc3NOYW1lLCBoaWRkZW4pOworICAgICAgICAgICAgdGhpcy5fcGxhY2Vob2xkZXJTY29w ZUJhckl0ZW0gPSBuZXcgV0kuU2NvcGVCYXJJdGVtKCJjYW52YXMtcmVjb3JkaW5nLXNjb3BlLWJh ci1pdGVtLXBsYWNlaG9sZGVyIiwgV0kuVUlTdHJpbmcoIlJlY29yZGluZ3MiKSwgeworICAgICAg ICAgICAgICAgIGV4Y2x1c2l2ZTogdHJ1ZSwKKyAgICAgICAgICAgICAgICBoaWRkZW46IHRydWUs CisgICAgICAgICAgICB9KTsKICAgICAgICAgICAgIHRoaXMuX3BsYWNlaG9sZGVyU2NvcGVCYXJJ dGVtLnNlbGVjdGVkID0gdHJ1ZTsKIAogICAgICAgICAgICAgc2NvcGVCYXJJdGVtcy51bnNoaWZ0 KHRoaXMuX3BsYWNlaG9sZGVyU2NvcGVCYXJJdGVtKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanMKaW5k ZXggZDIzMDJmZjQ0NzYuLjEzNzJmZjE3MTk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qcwpAQCAt NzQsMTIgKzc0LDEyIEBAIFdJLkxvZ0NvbnRlbnRWaWV3ID0gY2xhc3MgTG9nQ29udGVudFZpZXcg ZXh0ZW5kcyBXSS5Db250ZW50VmlldwogICAgICAgICB0aGlzLl9jaGVja2JveHNOYXZpZ2F0aW9u SXRlbUdyb3VwID0gbmV3IFdJLkdyb3VwTmF2aWdhdGlvbkl0ZW0oW3RoaXMuX3ByZXNlcnZlTG9n TmF2aWdhdGlvbkl0ZW0sIG5ldyBXSS5EaXZpZGVyTmF2aWdhdGlvbkl0ZW1dKTsKIAogICAgICAg ICBsZXQgc2NvcGVCYXJJdGVtcyA9IFsKLSAgICAgICAgICAgIG5ldyBXSS5TY29wZUJhckl0ZW0o V0kuTG9nQ29udGVudFZpZXcuU2NvcGVzLkFsbCwgV0kuVUlTdHJpbmcoIkFsbCIpLCB0cnVlKSwK LSAgICAgICAgICAgIG5ldyBXSS5TY29wZUJhckl0ZW0oV0kuTG9nQ29udGVudFZpZXcuU2NvcGVz LkVycm9ycywgV0kuVUlTdHJpbmcoIkVycm9ycyIpLCBmYWxzZSwgImVycm9ycyIpLAotICAgICAg ICAgICAgbmV3IFdJLlNjb3BlQmFySXRlbShXSS5Mb2dDb250ZW50Vmlldy5TY29wZXMuV2Fybmlu Z3MsIFdJLlVJU3RyaW5nKCJXYXJuaW5ncyIpLCBmYWxzZSwgIndhcm5pbmdzIiksCi0gICAgICAg ICAgICBuZXcgV0kuU2NvcGVCYXJJdGVtKFdJLkxvZ0NvbnRlbnRWaWV3LlNjb3Blcy5Mb2dzLCBX SS5VSVN0cmluZygiTG9ncyIpLCBmYWxzZSwgImxvZ3MiKSwKLSAgICAgICAgICAgIG5ldyBXSS5T Y29wZUJhckl0ZW0oV0kuTG9nQ29udGVudFZpZXcuU2NvcGVzLkluZm9zLCBXSS5VSVN0cmluZygi SW5mb3MiKSwgZmFsc2UsICJpbmZvcyIsIHRydWUpLAotICAgICAgICAgICAgbmV3IFdJLlNjb3Bl QmFySXRlbShXSS5Mb2dDb250ZW50Vmlldy5TY29wZXMuRGVidWdzLCBXSS5VSVN0cmluZygiRGVi dWdzIiksIGZhbHNlLCAiZGVidWdzIiwgdHJ1ZSksCisgICAgICAgICAgICBuZXcgV0kuU2NvcGVC YXJJdGVtKFdJLkxvZ0NvbnRlbnRWaWV3LlNjb3Blcy5BbGwsIFdJLlVJU3RyaW5nKCJBbGwiKSwg e2V4Y2x1c2l2ZTogdHJ1ZX0pLAorICAgICAgICAgICAgbmV3IFdJLlNjb3BlQmFySXRlbShXSS5M b2dDb250ZW50Vmlldy5TY29wZXMuRXJyb3JzLCBXSS5VSVN0cmluZygiRXJyb3JzIiksIHtjbGFz c05hbWU6ICJlcnJvcnMifSksCisgICAgICAgICAgICBuZXcgV0kuU2NvcGVCYXJJdGVtKFdJLkxv Z0NvbnRlbnRWaWV3LlNjb3Blcy5XYXJuaW5ncywgV0kuVUlTdHJpbmcoIldhcm5pbmdzIiksIHtj bGFzc05hbWU6ICJ3YXJuaW5ncyJ9KSwKKyAgICAgICAgICAgIG5ldyBXSS5TY29wZUJhckl0ZW0o V0kuTG9nQ29udGVudFZpZXcuU2NvcGVzLkxvZ3MsIFdJLlVJU3RyaW5nKCJMb2dzIiksIHtjbGFz c05hbWU6ICJsb2dzIn0pLAorICAgICAgICAgICAgbmV3IFdJLlNjb3BlQmFySXRlbShXSS5Mb2dD b250ZW50Vmlldy5TY29wZXMuSW5mb3MsIFdJLlVJU3RyaW5nKCJJbmZvcyIpLCB7Y2xhc3NOYW1l OiAiaW5mb3MiLCBoaWRkZW46IHRydWV9KSwKKyAgICAgICAgICAgIG5ldyBXSS5TY29wZUJhckl0 ZW0oV0kuTG9nQ29udGVudFZpZXcuU2NvcGVzLkRlYnVncywgV0kuVUlTdHJpbmcoIkRlYnVncyIp LCB7Y2xhc3NOYW1lOiAiZGVidWdzIiwgaGlkZGVuOiB0cnVlfSksCiAgICAgICAgIF07CiAKICAg ICAgICAgdGhpcy5fc2NvcGVCYXIgPSBuZXcgV0kuU2NvcGVCYXIoImxvZy1zY29wZS1iYXIiLCBz Y29wZUJhckl0ZW1zLCBzY29wZUJhckl0ZW1zWzBdKTsKQEAgLTg4LDkgKzg4LDkgQEAgV0kuTG9n Q29udGVudFZpZXcgPSBjbGFzcyBMb2dDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3 CiAgICAgICAgIHRoaXMuX2hhc05vbkRlZmF1bHRMb2dDaGFubmVsTWVzc2FnZSA9IGZhbHNlOwog ICAgICAgICBpZiAoV0kuQ29uc29sZU1hbmFnZXIuc3VwcG9ydHNMb2dDaGFubmVscygpKSB7CiAg ICAgICAgICAgICBsZXQgbWVzc2FnZUNoYW5uZWxCYXJJdGVtcyA9IFsKLSAgICAgICAgICAgICAg ICBuZXcgV0kuU2NvcGVCYXJJdGVtKFdJLkxvZ0NvbnRlbnRWaWV3LlNjb3Blcy5BbGxDaGFubmVs cywgV0kuVUlTdHJpbmcoIkFsbCIpLCB0cnVlKSwKLSAgICAgICAgICAgICAgICBuZXcgV0kuU2Nv cGVCYXJJdGVtKFdJLkxvZ0NvbnRlbnRWaWV3LlNjb3Blcy5NZWRpYSwgV0kuVUlTdHJpbmcoIk1l ZGlhIiksIGZhbHNlLCAibWVkaWEiKSwKLSAgICAgICAgICAgICAgICBuZXcgV0kuU2NvcGVCYXJJ dGVtKFdJLkxvZ0NvbnRlbnRWaWV3LlNjb3Blcy5XZWJSVEMsIFdJLlVJU3RyaW5nKCJXZWJSVEMi KSwgZmFsc2UsICJ3ZWJydGMiKQorICAgICAgICAgICAgICAgIG5ldyBXSS5TY29wZUJhckl0ZW0o V0kuTG9nQ29udGVudFZpZXcuU2NvcGVzLkFsbENoYW5uZWxzLCBXSS5VSVN0cmluZygiQWxsIiks IHtleGNsdXNpdmU6IHRydWV9KSwKKyAgICAgICAgICAgICAgICBuZXcgV0kuU2NvcGVCYXJJdGVt KFdJLkxvZ0NvbnRlbnRWaWV3LlNjb3Blcy5NZWRpYSwgV0kuVUlTdHJpbmcoIk1lZGlhIiksIHtj bGFzc05hbWU6ICJtZWRpYSJ9KSwKKyAgICAgICAgICAgICAgICBuZXcgV0kuU2NvcGVCYXJJdGVt KFdJLkxvZ0NvbnRlbnRWaWV3LlNjb3Blcy5XZWJSVEMsIFdJLlVJU3RyaW5nKCJXZWJSVEMiKSwg e2NsYXNzTmFtZTogIndlYnJ0YyJ9KSwKICAgICAgICAgICAgIF07CiAKICAgICAgICAgICAgIHRo aXMuX21lc3NhZ2VTb3VyY2VCYXIgPSBuZXcgV0kuU2NvcGVCYXIoIm1lc3NhZ2UtY2hhbm5lbC1z Y29wZS1iYXIiLCBtZXNzYWdlQ2hhbm5lbEJhckl0ZW1zLCBtZXNzYWdlQ2hhbm5lbEJhckl0ZW1z WzBdKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL011bHRpcGxlU2NvcGVCYXJJdGVtLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvTXVsdGlwbGVTY29wZUJhckl0ZW0uanMKaW5kZXggNmFhYzI0M2E4ZTYu LjczYjZlMWQyZDJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9NdWx0aXBsZVNjb3BlQmFySXRlbS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9NdWx0aXBsZVNjb3BlQmFySXRlbS5qcwpAQCAtMTM3 LDggKzEzNyw5IEBAIFdJLk11bHRpcGxlU2NvcGVCYXJJdGVtID0gY2xhc3MgTXVsdGlwbGVTY29w ZUJhckl0ZW0gZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgICAgIHRoaXMuX3NlbGVjdGVkU2Nv cGVCYXJJdGVtLnNlbGVjdGVkID0gdHJ1ZTsKICAgICAgICAgfQogCi0gICAgICAgIHZhciB3aXRo TW9kaWZpZXIgPSBXSS5tb2RpZmllcktleXMubWV0YUtleSAmJiAhV0kubW9kaWZpZXJLZXlzLmN0 cmxLZXkgJiYgIVdJLm1vZGlmaWVyS2V5cy5hbHRLZXkgJiYgIVdJLm1vZGlmaWVyS2V5cy5zaGlm dEtleTsKLSAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV0kuU2NvcGVCYXJJ dGVtLkV2ZW50LlNlbGVjdGlvbkNoYW5nZWQsIHt3aXRoTW9kaWZpZXJ9KTsKKyAgICAgICAgdGhp cy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV0kuU2NvcGVCYXJJdGVtLkV2ZW50LlNlbGVjdGlv bkNoYW5nZWQsIHsKKyAgICAgICAgICAgIGV4dGVuZFNlbGVjdGlvbjogV0kubW9kaWZpZXJLZXlz Lm1ldGFLZXkgJiYgIVdJLm1vZGlmaWVyS2V5cy5jdHJsS2V5ICYmICFXSS5tb2RpZmllcktleXMu YWx0S2V5ICYmICFXSS5tb2RpZmllcktleXMuc2hpZnRLZXksCisgICAgICAgIH0pOwogCiAgICAg ICAgIHRoaXMuX2lnbm9yZUl0ZW1TZWxlY3RlZEV2ZW50ID0gZmFsc2U7CiAgICAgfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1Rh YmxlQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qcwppbmRleCA4ZmZhNzIyNTI3Zi4uZDBiZjlj ZWY1YTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmpzCkBAIC01NCw4 ICs1NCw5IEBAIFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3ID0gY2xhc3MgTmV0d29ya1RhYmxl Q29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmllCiAgICAgICAgIC8vIEZJWE1FOiBOZXR3 b3JrIFRpbWVsaW5lLgogICAgICAgICAvLyBGSVhNRTogVGhyb3R0bGluZy4KIAotICAgICAgICBj b25zdCBleGNsdXNpdmUgPSB0cnVlOwotICAgICAgICB0aGlzLl90eXBlRmlsdGVyU2NvcGVCYXJJ dGVtQWxsID0gbmV3IFdJLlNjb3BlQmFySXRlbSgibmV0d29yay10eXBlLWZpbHRlci1hbGwiLCBX SS5VSVN0cmluZygiQWxsIiksIGV4Y2x1c2l2ZSk7CisgICAgICAgIHRoaXMuX3R5cGVGaWx0ZXJT Y29wZUJhckl0ZW1BbGwgPSBuZXcgV0kuU2NvcGVCYXJJdGVtKCJuZXR3b3JrLXR5cGUtZmlsdGVy LWFsbCIsIFdJLlVJU3RyaW5nKCJBbGwiKSwgeworICAgICAgICAgICAgZXhjbHVzaXZlOiB0cnVl LAorICAgICAgICB9KTsKICAgICAgICAgbGV0IHR5cGVGaWx0ZXJTY29wZUJhckl0ZW1zID0gW3Ro aXMuX3R5cGVGaWx0ZXJTY29wZUJhckl0ZW1BbGxdOwogCiAgICAgICAgIGxldCB1bmlxdWVUeXBl cyA9IFsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1Jlc291cmNlU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvUmVzb3VyY2VTaWRlYmFyUGFuZWwuanMKaW5kZXggZDRhMGVhNzgwMmYu LmEzMzlhOWI0Mzk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9SZXNvdXJjZVNpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVNpZGViYXJQYW5lbC5qcwpAQCAtMzcs NyArMzcsNyBAQCBXSS5SZXNvdXJjZVNpZGViYXJQYW5lbCA9IGNsYXNzIFJlc291cmNlU2lkZWJh clBhbmVsIGV4dGVuZHMgV0kuTmF2aWdhdGlvblNpZGViYQogICAgICAgICB2YXIgc2NvcGVJdGVt UHJlZml4ID0gInJlc291cmNlLXNpZGViYXItIjsKICAgICAgICAgdmFyIHNjb3BlQmFySXRlbXMg PSBbXTsKIAotICAgICAgICBzY29wZUJhckl0ZW1zLnB1c2gobmV3IFdJLlNjb3BlQmFySXRlbShz Y29wZUl0ZW1QcmVmaXggKyAidHlwZS1hbGwiLCBXSS5VSVN0cmluZygiQWxsIFJlc291cmNlcyIp LCB0cnVlKSk7CisgICAgICAgIHNjb3BlQmFySXRlbXMucHVzaChuZXcgV0kuU2NvcGVCYXJJdGVt KHNjb3BlSXRlbVByZWZpeCArICJ0eXBlLWFsbCIsIFdJLlVJU3RyaW5nKCJBbGwgUmVzb3VyY2Vz IiksIHtleGNsdXNpdmU6IHRydWV9KSk7CiAKICAgICAgICAgZm9yICh2YXIga2V5IGluIFdJLlJl c291cmNlLlR5cGUpIHsKICAgICAgICAgICAgIHZhciB2YWx1ZSA9IFdJLlJlc291cmNlLlR5cGVb a2V5XTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1Njb3BlQmFyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvU2NvcGVCYXIuanMKaW5kZXggNjJmYmE4ODE2ODguLjYyZjNlYTAzNDMxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY29wZUJhci5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY29wZUJhci5q cwpAQCAtMTMzLDEwICsxMzMsMTIgQEAgV0kuU2NvcGVCYXIgPSBjbGFzcyBTY29wZUJhciBleHRl bmRzIFdJLk5hdmlnYXRpb25JdGVtCiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAotICAgICAg ICBpZiAoIXRoaXMuc2VsZWN0ZWRJdGVtcy5sZW5ndGggJiYgdGhpcy5fZGVmYXVsdEl0ZW0pCi0g ICAgICAgICAgICB0aGlzLl9kZWZhdWx0SXRlbS5zZWxlY3RlZCA9IHRydWU7CisgICAgICAgIGlm ICh0aGlzLl9kZWZhdWx0SXRlbSkgeworICAgICAgICAgICAgaWYgKCF0aGlzLnNlbGVjdGVkSXRl bXMubGVuZ3RoKQorICAgICAgICAgICAgICAgIHRoaXMuX2RlZmF1bHRJdGVtLnNlbGVjdGVkID0g dHJ1ZTsKIAotICAgICAgICB0aGlzLl9lbGVtZW50LmNsYXNzTGlzdC50b2dnbGUoImRlZmF1bHQt aXRlbS1zZWxlY3RlZCIsIHRoaXMuX2RlZmF1bHRJdGVtLnNlbGVjdGVkKTsKKyAgICAgICAgICAg IHRoaXMuX2VsZW1lbnQuY2xhc3NMaXN0LnRvZ2dsZSgiZGVmYXVsdC1pdGVtLXNlbGVjdGVkIiwg dGhpcy5fZGVmYXVsdEl0ZW0uc2VsZWN0ZWQpOworICAgICAgICB9CiAgICAgfQogCiAgICAgX2l0 ZW1TZWxlY3Rpb25EaWRDaGFuZ2UoZXZlbnQpCkBAIC0xNTIsNyArMTU0LDcgQEAgV0kuU2NvcGVC YXIgPSBjbGFzcyBTY29wZUJhciBleHRlbmRzIFdJLk5hdmlnYXRpb25JdGVtCiAgICAgICAgICAg ICAgICAgICAgIGl0ZW0uc2VsZWN0ZWQgPSBmYWxzZTsKICAgICAgICAgICAgIH0KICAgICAgICAg fSBlbHNlIHsKLSAgICAgICAgICAgIHZhciByZXBsYWNlc0N1cnJlbnRTZWxlY3Rpb24gPSB0aGlz Ll9zaG91bGRHcm91cE5vbkV4Y2x1c2l2ZUl0ZW1zIHx8ICFldmVudC5kYXRhLndpdGhNb2RpZmll cjsKKyAgICAgICAgICAgIHZhciByZXBsYWNlc0N1cnJlbnRTZWxlY3Rpb24gPSB0aGlzLl9zaG91 bGRHcm91cE5vbkV4Y2x1c2l2ZUl0ZW1zIHx8ICFldmVudC5kYXRhLmV4dGVuZFNlbGVjdGlvbjsK ICAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5faXRlbXMubGVuZ3RoOyArK2kp IHsKICAgICAgICAgICAgICAgICBpdGVtID0gdGhpcy5faXRlbXNbaV07CiAgICAgICAgICAgICAg ICAgaWYgKGl0ZW0uZXhjbHVzaXZlICYmIGl0ZW0gIT09IHNlbmRlciAmJiBzZW5kZXIuc2VsZWN0 ZWQpCkBAIC0xNjIsMTEgKzE2NCwxMyBAQCBXSS5TY29wZUJhciA9IGNsYXNzIFNjb3BlQmFyIGV4 dGVuZHMgV0kuTmF2aWdhdGlvbkl0ZW0KICAgICAgICAgICAgIH0KICAgICAgICAgfQogCi0gICAg ICAgIC8vIElmIG5vdGhpbmcgaXMgc2VsZWN0ZWQgYW55bW9yZSwgc2VsZWN0IHRoZSBkZWZhdWx0 IGl0ZW0uCi0gICAgICAgIGlmICghdGhpcy5zZWxlY3RlZEl0ZW1zLmxlbmd0aCAmJiB0aGlzLl9k ZWZhdWx0SXRlbSkKLSAgICAgICAgICAgIHRoaXMuX2RlZmF1bHRJdGVtLnNlbGVjdGVkID0gdHJ1 ZTsKKyAgICAgICAgaWYgKHRoaXMuX2RlZmF1bHRJdGVtKSB7CisgICAgICAgICAgICBpZiAoIXRo aXMuc2VsZWN0ZWRJdGVtcy5sZW5ndGgpCisgICAgICAgICAgICAgICAgdGhpcy5fZGVmYXVsdEl0 ZW0uc2VsZWN0ZWQgPSB0cnVlOworCisgICAgICAgICAgICB0aGlzLl9lbGVtZW50LmNsYXNzTGlz dC50b2dnbGUoImRlZmF1bHQtaXRlbS1zZWxlY3RlZCIsIHRoaXMuX2RlZmF1bHRJdGVtLnNlbGVj dGVkKTsKKyAgICAgICAgfQogCi0gICAgICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NMaXN0LnRvZ2ds ZSgiZGVmYXVsdC1pdGVtLXNlbGVjdGVkIiwgdGhpcy5fZGVmYXVsdEl0ZW0uc2VsZWN0ZWQpOwog ICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXSS5TY29wZUJhci5FdmVudC5T ZWxlY3Rpb25DaGFuZ2VkKTsKICAgICB9CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NvcGVCYXJJdGVtLmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NvcGVCYXJJdGVtLmpzCmluZGV4IDQxZWE5 NzczNzQ5Li5mYmNhMzkzMDI4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvU2NvcGVCYXJJdGVtLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Njb3BlQmFySXRlbS5qcwpAQCAtMjUsNyArMjUsNyBA QAogCiBXSS5TY29wZUJhckl0ZW0gPSBjbGFzcyBTY29wZUJhckl0ZW0gZXh0ZW5kcyBXSS5PYmpl Y3QKIHsKLSAgICBjb25zdHJ1Y3RvcihpZCwgbGFiZWwsIGV4Y2x1c2l2ZSwgY2xhc3NOYW1lLCBo aWRkZW4pCisgICAgY29uc3RydWN0b3IoaWQsIGxhYmVsLCB7Y2xhc3NOYW1lLCBleGNsdXNpdmUs IGhpZGRlbn0gPSB7fSkKICAgICB7CiAgICAgICAgIHN1cGVyKCk7CiAKQEAgLTM4LDcgKzM4LDcg QEAgV0kuU2NvcGVCYXJJdGVtID0gY2xhc3MgU2NvcGVCYXJJdGVtIGV4dGVuZHMgV0kuT2JqZWN0 CiAKICAgICAgICAgdGhpcy5faWQgPSBpZDsKICAgICAgICAgdGhpcy5fbGFiZWwgPSBsYWJlbDsK LSAgICAgICAgdGhpcy5fZXhjbHVzaXZlID0gZXhjbHVzaXZlOworICAgICAgICB0aGlzLl9leGNs dXNpdmUgPSBleGNsdXNpdmUgfHwgZmFsc2U7CiAgICAgICAgIHRoaXMuX2hpZGRlbiA9ICEhaGlk ZGVuOwogCiAgICAgICAgIHRoaXMuX3NlbGVjdGVkU2V0dGluZyA9IG5ldyBXSS5TZXR0aW5nKCJz Y29wZWJhcml0ZW0tIiArIGlkLCBmYWxzZSk7CkBAIC03NSwxMSArNzUsNiBAQCBXSS5TY29wZUJh ckl0ZW0gPSBjbGFzcyBTY29wZUJhckl0ZW0gZXh0ZW5kcyBXSS5PYmplY3QKICAgICB9CiAKICAg ICBzZXQgc2VsZWN0ZWQoc2VsZWN0ZWQpCi0gICAgewotICAgICAgICB0aGlzLnNldFNlbGVjdGVk KHNlbGVjdGVkLCBmYWxzZSk7Ci0gICAgfQotCi0gICAgc2V0U2VsZWN0ZWQoc2VsZWN0ZWQsIHdp dGhNb2RpZmllcikKICAgICB7CiAgICAgICAgIGlmICh0aGlzLl9zZWxlY3RlZFNldHRpbmcudmFs dWUgPT09IHNlbGVjdGVkKQogICAgICAgICAgICAgcmV0dXJuOwpAQCAtODcsNyArODIsOSBAQCBX SS5TY29wZUJhckl0ZW0gPSBjbGFzcyBTY29wZUJhckl0ZW0gZXh0ZW5kcyBXSS5PYmplY3QKICAg ICAgICAgdGhpcy5fZWxlbWVudC5jbGFzc0xpc3QudG9nZ2xlKCJzZWxlY3RlZCIsIHNlbGVjdGVk KTsKICAgICAgICAgdGhpcy5fc2VsZWN0ZWRTZXR0aW5nLnZhbHVlID0gc2VsZWN0ZWQ7CiAKLSAg ICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV0kuU2NvcGVCYXJJdGVtLkV2ZW50 LlNlbGVjdGlvbkNoYW5nZWQsIHt3aXRoTW9kaWZpZXJ9KTsKKyAgICAgICAgdGhpcy5kaXNwYXRj aEV2ZW50VG9MaXN0ZW5lcnMoV0kuU2NvcGVCYXJJdGVtLkV2ZW50LlNlbGVjdGlvbkNoYW5nZWQs IHsKKyAgICAgICAgICAgIGV4dGVuZFNlbGVjdGlvbjogV0kubW9kaWZpZXJLZXlzLm1ldGFLZXkg JiYgIVdJLm1vZGlmaWVyS2V5cy5jdHJsS2V5ICYmICFXSS5tb2RpZmllcktleXMuYWx0S2V5ICYm ICFXSS5tb2RpZmllcktleXMuc2hpZnRLZXksCisgICAgICAgIH0pOwogICAgIH0KIAogICAgIGdl dCBoaWRkZW4oKQpAQCAtMTEzLDcgKzExMCw3IEBAIFdJLlNjb3BlQmFySXRlbSA9IGNsYXNzIFNj b3BlQmFySXRlbSBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICBpZiAoZXZlbnQuYnV0dG9uICE9 PSAwKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHRoaXMuc2V0U2VsZWN0ZWQoIXRo aXMuc2VsZWN0ZWQsIGV2ZW50Lm1ldGFLZXkgJiYgIWV2ZW50LmN0cmxLZXkgJiYgIWV2ZW50LmFs dEtleSAmJiAhZXZlbnQuc2hpZnRLZXkpOworICAgICAgICB0aGlzLnNlbGVjdGVkID0gIXRoaXMu c2VsZWN0ZWQ7CiAgICAgfQogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvU3RvcmFnZVNpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1N0b3JhZ2VTaWRlYmFyUGFuZWwuanMKaW5k ZXggZDFjZjEzNDIzODUuLmEwNWM5ZjFhZDc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TdG9yYWdlU2lkZWJhclBhbmVsLmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1N0b3JhZ2VTaWRlYmFyUGFu ZWwuanMKQEAgLTM1LDcgKzM1LDcgQEAgV0kuU3RvcmFnZVNpZGViYXJQYW5lbCA9IGNsYXNzIFN0 b3JhZ2VTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXSS5OYXZpZ2F0aW9uU2lkZWJhclAKICAgICAgICAg dmFyIHNjb3BlSXRlbVByZWZpeCA9ICJzdG9yYWdlLXNpZGViYXItIjsKICAgICAgICAgdmFyIHNj b3BlQmFySXRlbXMgPSBbXTsKIAotICAgICAgICBzY29wZUJhckl0ZW1zLnB1c2gobmV3IFdJLlNj b3BlQmFySXRlbShzY29wZUl0ZW1QcmVmaXggKyAidHlwZS1hbGwiLCBXSS5VSVN0cmluZygiQWxs IFN0b3JhZ2UiKSwgdHJ1ZSkpOworICAgICAgICBzY29wZUJhckl0ZW1zLnB1c2gobmV3IFdJLlNj b3BlQmFySXRlbShzY29wZUl0ZW1QcmVmaXggKyAidHlwZS1hbGwiLCBXSS5VSVN0cmluZygiQWxs IFN0b3JhZ2UiKSwge2V4Y2x1c2l2ZTogdHJ1ZX0pKTsKIAogICAgICAgICB2YXIgc3RvcmFnZVR5 cGVzID0gWwogICAgICAgICAgICAge2lkZW50aWZpZXI6ICJhcHBsaWNhdGlvbi1jYWNoZSIsIHRp dGxlOiBXSS5VSVN0cmluZygiQXBwbGljYXRpb24gQ2FjaGUiKSwgY2xhc3NlczogW1dJLkFwcGxp Y2F0aW9uQ2FjaGVGcmFtZVRyZWVFbGVtZW50LCBXSS5BcHBsaWNhdGlvbkNhY2hlTWFuaWZlc3RU cmVlRWxlbWVudF19LAo= 353379 2018-10-30 10:10:32 -0700 2018-10-30 10:48:25 -0700 Patch bug-190986-20181030101030.patch text/plain 14381 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDhmNDdkNWYwMWM3ZTE2ZTBhN2I2MTRiOGExZjI5 M2RlNWQ5YzJiYWUuLmUyNDQyMmZlZTBjODcxYThlNjcwZTIyMDZjN2M4ZThlNWM3YWIxYjEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDE4LTEwLTMwICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBy ZWZhY3RvciBXSS5TY29wZUJhckl0ZW0gZm9yIGJldHRlciBleHRlbnNpYmlsaXR5CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTA5ODYKKworICAgICAg ICBSZXZpZXdlZCBieSBCcmlhbiBCdXJnLgorCisgICAgICAgIFJlbmFtZXMgYHdpdGhNb2RpZmll cmAgdG8gYGV4dGVuZFNlbGVjdGlvbmAgZm9yIGNsYXJpdHkgb2YgdXNhZ2UsIGFuZCB0byBhbGxv dyB0aGUgY2hhbmdlcworICAgICAgICBpbiA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTkwNzU0PiAo YWRkaW5nIGFuIG9wdGlvbiB0byBhbGxvdyBgV0kuU2NvcGVCYXJJdGVtYHMgdG8gYmUKKyAgICAg ICAgc2VsZWN0ZWQgd2l0aG91dCBkZXNlbGN0aW5nIGFueSBvdGhlciBgV0kuU2NvcGVCYXJJdGVt YHMpIHRvIHVzZSB0aGUgc2FtZSB2YXJpYWJsZS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvU2NvcGVCYXJJdGVtLmpzOgorICAgICAgICAoV0kuU2NvcGVCYXJJdGVtKToKKyAgICAg ICAgKFdJLlNjb3BlQmFySXRlbS5wcm90b3R5cGUuc2V0IHNlbGVjdGVkKToKKyAgICAgICAgKFdJ LlNjb3BlQmFySXRlbS5wcm90b3R5cGUuX2hhbmRsZU1vdXNlRG93bik6CisgICAgICAgIChXSS5T Y29wZUJhckl0ZW0ucHJvdG90eXBlLnNldFNlbGVjdGVkKTogRGVsZXRlZC4KKworICAgICAgICAq IFVzZXJJbnRlcmZhY2UvVmlld3MvU2NvcGVCYXIuanM6CisgICAgICAgIChXSS5TY29wZUJhcik6 CisgICAgICAgIChXSS5TY29wZUJhci5wcm90b3R5cGUuX3BvcHVsYXRlKToKKyAgICAgICAgKFdJ LlNjb3BlQmFyLnByb3RvdHlwZS5faXRlbVNlbGVjdGlvbkRpZENoYW5nZSk6CisKKyAgICAgICAg KiBVc2VySW50ZXJmYWNlL1ZpZXdzL011bHRpcGxlU2NvcGVCYXJJdGVtLmpzOgorICAgICAgICAo V0kuTXVsdGlwbGVTY29wZUJhckl0ZW0ucHJvdG90eXBlLnNldCBzZWxlY3RlZFNjb3BlQmFySXRl bSk6CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZhc1NpZGViYXJQYW5lbC5q czoKKyAgICAgICAgKFdJLkNhbnZhc1NpZGViYXJQYW5lbC5wcm90b3R5cGUuX3VwZGF0ZVJlY29y ZGluZ1Njb3BlQmFyKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRW aWV3LmpzOgorICAgICAgICAoV0kuTG9nQ29udGVudFZpZXcpOgorICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvTmV0d29ya1RhYmxlQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5OZXR3 b3JrVGFibGVDb250ZW50Vmlldyk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9SZXNv dXJjZVNpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdJLlJlc291cmNlU2lkZWJhclBhbmVsKToK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1N0b3JhZ2VTaWRlYmFyUGFuZWwuanM6Cisg ICAgICAgIChXSS5TdG9yYWdlU2lkZWJhclBhbmVsKToKKwogMjAxOC0xMC0yOSAgTmlraXRhIFZh c2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBG bGFzaCB2aWV3cyB3aXRoIHJlZCBvdXRsaW5lIG9uIGluaXRpYWwgbGF5b3V0CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNTaWRlYmFy UGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52 YXNTaWRlYmFyUGFuZWwuanMKaW5kZXggYjM5MjlhN2YzMWZiOGZjYTNiMTgwN2I1YWFkODQ0M2My NDAzNjQ3OC4uODJlNWM5YmIyYzAxMjNlMzNlMTIzMTY4YmI1NzE1OTJlNTQzOWY1ZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzU2lk ZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0NhbnZhc1NpZGViYXJQYW5lbC5qcwpAQCAtNDk0LDEwICs0OTQsNyBAQCBXSS5DYW52YXNT aWRlYmFyUGFuZWwgPSBjbGFzcyBDYW52YXNTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXSS5OYXZpZ2F0 aW9uU2lkZWJhclBhbgogICAgICAgICBpZiAoIXNlbGVjdGVkU2NvcGVCYXJJdGVtKSB7CiAgICAg ICAgICAgICBzZWxlY3RlZFNjb3BlQmFySXRlbSA9IHNjb3BlQmFySXRlbXNbMF07CiAKLSAgICAg ICAgICAgIGNvbnN0IGV4Y2x1c2l2ZSA9IHRydWU7Ci0gICAgICAgICAgICBjb25zdCBjbGFzc05h bWUgPSBudWxsOwotICAgICAgICAgICAgY29uc3QgaGlkZGVuID0gdHJ1ZTsKLSAgICAgICAgICAg IHRoaXMuX3BsYWNlaG9sZGVyU2NvcGVCYXJJdGVtID0gbmV3IFdJLlNjb3BlQmFySXRlbSgiY2Fu dmFzLXJlY29yZGluZy1zY29wZS1iYXItaXRlbS1wbGFjZWhvbGRlciIsIFdJLlVJU3RyaW5nKCJS ZWNvcmRpbmdzIiksIGV4Y2x1c2l2ZSwgY2xhc3NOYW1lLCBoaWRkZW4pOworICAgICAgICAgICAg dGhpcy5fcGxhY2Vob2xkZXJTY29wZUJhckl0ZW0gPSBuZXcgV0kuU2NvcGVCYXJJdGVtKCJjYW52 YXMtcmVjb3JkaW5nLXNjb3BlLWJhci1pdGVtLXBsYWNlaG9sZGVyIiwgV0kuVUlTdHJpbmcoIlJl Y29yZGluZ3MiKSwge2V4Y2x1c2l2ZTogdHJ1ZSwgaGlkZGVuOiB0cnVlfSk7CiAgICAgICAgICAg ICB0aGlzLl9wbGFjZWhvbGRlclNjb3BlQmFySXRlbS5zZWxlY3RlZCA9IHRydWU7CiAKICAgICAg ICAgICAgIHNjb3BlQmFySXRlbXMudW5zaGlmdCh0aGlzLl9wbGFjZWhvbGRlclNjb3BlQmFySXRl bSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9Mb2dDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzCmluZGV4IGQyMzAyZmY0NDc2ZmNhYjA2YTQ4ZTZmYjdm NjE0OWJjZjkzYzE1YjIuLjEzNzJmZjE3MTk1ZjhlMDg3NDhkYTQ4ZGI5Yjg1ZTUwNjgzMzdjMjcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xv Z0NvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzCkBAIC03NCwxMiArNzQsMTIgQEAgV0kuTG9nQ29udGVu dFZpZXcgPSBjbGFzcyBMb2dDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAgICAg ICAgIHRoaXMuX2NoZWNrYm94c05hdmlnYXRpb25JdGVtR3JvdXAgPSBuZXcgV0kuR3JvdXBOYXZp Z2F0aW9uSXRlbShbdGhpcy5fcHJlc2VydmVMb2dOYXZpZ2F0aW9uSXRlbSwgbmV3IFdJLkRpdmlk ZXJOYXZpZ2F0aW9uSXRlbV0pOwogCiAgICAgICAgIGxldCBzY29wZUJhckl0ZW1zID0gWwotICAg ICAgICAgICAgbmV3IFdJLlNjb3BlQmFySXRlbShXSS5Mb2dDb250ZW50Vmlldy5TY29wZXMuQWxs LCBXSS5VSVN0cmluZygiQWxsIiksIHRydWUpLAotICAgICAgICAgICAgbmV3IFdJLlNjb3BlQmFy SXRlbShXSS5Mb2dDb250ZW50Vmlldy5TY29wZXMuRXJyb3JzLCBXSS5VSVN0cmluZygiRXJyb3Jz IiksIGZhbHNlLCAiZXJyb3JzIiksCi0gICAgICAgICAgICBuZXcgV0kuU2NvcGVCYXJJdGVtKFdJ LkxvZ0NvbnRlbnRWaWV3LlNjb3Blcy5XYXJuaW5ncywgV0kuVUlTdHJpbmcoIldhcm5pbmdzIiks IGZhbHNlLCAid2FybmluZ3MiKSwKLSAgICAgICAgICAgIG5ldyBXSS5TY29wZUJhckl0ZW0oV0ku TG9nQ29udGVudFZpZXcuU2NvcGVzLkxvZ3MsIFdJLlVJU3RyaW5nKCJMb2dzIiksIGZhbHNlLCAi bG9ncyIpLAotICAgICAgICAgICAgbmV3IFdJLlNjb3BlQmFySXRlbShXSS5Mb2dDb250ZW50Vmll dy5TY29wZXMuSW5mb3MsIFdJLlVJU3RyaW5nKCJJbmZvcyIpLCBmYWxzZSwgImluZm9zIiwgdHJ1 ZSksCi0gICAgICAgICAgICBuZXcgV0kuU2NvcGVCYXJJdGVtKFdJLkxvZ0NvbnRlbnRWaWV3LlNj b3Blcy5EZWJ1Z3MsIFdJLlVJU3RyaW5nKCJEZWJ1Z3MiKSwgZmFsc2UsICJkZWJ1Z3MiLCB0cnVl KSwKKyAgICAgICAgICAgIG5ldyBXSS5TY29wZUJhckl0ZW0oV0kuTG9nQ29udGVudFZpZXcuU2Nv cGVzLkFsbCwgV0kuVUlTdHJpbmcoIkFsbCIpLCB7ZXhjbHVzaXZlOiB0cnVlfSksCisgICAgICAg ICAgICBuZXcgV0kuU2NvcGVCYXJJdGVtKFdJLkxvZ0NvbnRlbnRWaWV3LlNjb3Blcy5FcnJvcnMs IFdJLlVJU3RyaW5nKCJFcnJvcnMiKSwge2NsYXNzTmFtZTogImVycm9ycyJ9KSwKKyAgICAgICAg ICAgIG5ldyBXSS5TY29wZUJhckl0ZW0oV0kuTG9nQ29udGVudFZpZXcuU2NvcGVzLldhcm5pbmdz LCBXSS5VSVN0cmluZygiV2FybmluZ3MiKSwge2NsYXNzTmFtZTogIndhcm5pbmdzIn0pLAorICAg ICAgICAgICAgbmV3IFdJLlNjb3BlQmFySXRlbShXSS5Mb2dDb250ZW50Vmlldy5TY29wZXMuTG9n cywgV0kuVUlTdHJpbmcoIkxvZ3MiKSwge2NsYXNzTmFtZTogImxvZ3MifSksCisgICAgICAgICAg ICBuZXcgV0kuU2NvcGVCYXJJdGVtKFdJLkxvZ0NvbnRlbnRWaWV3LlNjb3Blcy5JbmZvcywgV0ku VUlTdHJpbmcoIkluZm9zIiksIHtjbGFzc05hbWU6ICJpbmZvcyIsIGhpZGRlbjogdHJ1ZX0pLAor ICAgICAgICAgICAgbmV3IFdJLlNjb3BlQmFySXRlbShXSS5Mb2dDb250ZW50Vmlldy5TY29wZXMu RGVidWdzLCBXSS5VSVN0cmluZygiRGVidWdzIiksIHtjbGFzc05hbWU6ICJkZWJ1Z3MiLCBoaWRk ZW46IHRydWV9KSwKICAgICAgICAgXTsKIAogICAgICAgICB0aGlzLl9zY29wZUJhciA9IG5ldyBX SS5TY29wZUJhcigibG9nLXNjb3BlLWJhciIsIHNjb3BlQmFySXRlbXMsIHNjb3BlQmFySXRlbXNb MF0pOwpAQCAtODgsOSArODgsOSBAQCBXSS5Mb2dDb250ZW50VmlldyA9IGNsYXNzIExvZ0NvbnRl bnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZXcKICAgICAgICAgdGhpcy5faGFzTm9uRGVmYXVs dExvZ0NoYW5uZWxNZXNzYWdlID0gZmFsc2U7CiAgICAgICAgIGlmIChXSS5Db25zb2xlTWFuYWdl ci5zdXBwb3J0c0xvZ0NoYW5uZWxzKCkpIHsKICAgICAgICAgICAgIGxldCBtZXNzYWdlQ2hhbm5l bEJhckl0ZW1zID0gWwotICAgICAgICAgICAgICAgIG5ldyBXSS5TY29wZUJhckl0ZW0oV0kuTG9n Q29udGVudFZpZXcuU2NvcGVzLkFsbENoYW5uZWxzLCBXSS5VSVN0cmluZygiQWxsIiksIHRydWUp LAotICAgICAgICAgICAgICAgIG5ldyBXSS5TY29wZUJhckl0ZW0oV0kuTG9nQ29udGVudFZpZXcu U2NvcGVzLk1lZGlhLCBXSS5VSVN0cmluZygiTWVkaWEiKSwgZmFsc2UsICJtZWRpYSIpLAotICAg ICAgICAgICAgICAgIG5ldyBXSS5TY29wZUJhckl0ZW0oV0kuTG9nQ29udGVudFZpZXcuU2NvcGVz LldlYlJUQywgV0kuVUlTdHJpbmcoIldlYlJUQyIpLCBmYWxzZSwgIndlYnJ0YyIpCisgICAgICAg ICAgICAgICAgbmV3IFdJLlNjb3BlQmFySXRlbShXSS5Mb2dDb250ZW50Vmlldy5TY29wZXMuQWxs Q2hhbm5lbHMsIFdJLlVJU3RyaW5nKCJBbGwiKSwge2V4Y2x1c2l2ZTogdHJ1ZX0pLAorICAgICAg ICAgICAgICAgIG5ldyBXSS5TY29wZUJhckl0ZW0oV0kuTG9nQ29udGVudFZpZXcuU2NvcGVzLk1l ZGlhLCBXSS5VSVN0cmluZygiTWVkaWEiKSwge2NsYXNzTmFtZTogIm1lZGlhIn0pLAorICAgICAg ICAgICAgICAgIG5ldyBXSS5TY29wZUJhckl0ZW0oV0kuTG9nQ29udGVudFZpZXcuU2NvcGVzLldl YlJUQywgV0kuVUlTdHJpbmcoIldlYlJUQyIpLCB7Y2xhc3NOYW1lOiAid2VicnRjIn0pLAogICAg ICAgICAgICAgXTsKIAogICAgICAgICAgICAgdGhpcy5fbWVzc2FnZVNvdXJjZUJhciA9IG5ldyBX SS5TY29wZUJhcigibWVzc2FnZS1jaGFubmVsLXNjb3BlLWJhciIsIG1lc3NhZ2VDaGFubmVsQmFy SXRlbXMsIG1lc3NhZ2VDaGFubmVsQmFySXRlbXNbMF0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTXVsdGlwbGVTY29wZUJhckl0ZW0uanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9NdWx0aXBsZVNjb3Bl QmFySXRlbS5qcwppbmRleCA2YWFjMjQzYThlNmFlMjIzYmM1YjUzOGFlZWJiNzMxOTUwMjU3YjFl Li43M2I2ZTFkMmQyZTUyMWMzYTMzMTdjMGUyZGI4ODU4YzZjM2IyMGFhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9NdWx0aXBsZVNjb3BlQmFy SXRlbS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9N dWx0aXBsZVNjb3BlQmFySXRlbS5qcwpAQCAtMTM3LDggKzEzNyw5IEBAIFdJLk11bHRpcGxlU2Nv cGVCYXJJdGVtID0gY2xhc3MgTXVsdGlwbGVTY29wZUJhckl0ZW0gZXh0ZW5kcyBXSS5PYmplY3QK ICAgICAgICAgICAgIHRoaXMuX3NlbGVjdGVkU2NvcGVCYXJJdGVtLnNlbGVjdGVkID0gdHJ1ZTsK ICAgICAgICAgfQogCi0gICAgICAgIHZhciB3aXRoTW9kaWZpZXIgPSBXSS5tb2RpZmllcktleXMu bWV0YUtleSAmJiAhV0kubW9kaWZpZXJLZXlzLmN0cmxLZXkgJiYgIVdJLm1vZGlmaWVyS2V5cy5h bHRLZXkgJiYgIVdJLm1vZGlmaWVyS2V5cy5zaGlmdEtleTsKLSAgICAgICAgdGhpcy5kaXNwYXRj aEV2ZW50VG9MaXN0ZW5lcnMoV0kuU2NvcGVCYXJJdGVtLkV2ZW50LlNlbGVjdGlvbkNoYW5nZWQs IHt3aXRoTW9kaWZpZXJ9KTsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMo V0kuU2NvcGVCYXJJdGVtLkV2ZW50LlNlbGVjdGlvbkNoYW5nZWQsIHsKKyAgICAgICAgICAgIGV4 dGVuZFNlbGVjdGlvbjogV0kubW9kaWZpZXJLZXlzLm1ldGFLZXkgJiYgIVdJLm1vZGlmaWVyS2V5 cy5jdHJsS2V5ICYmICFXSS5tb2RpZmllcktleXMuYWx0S2V5ICYmICFXSS5tb2RpZmllcktleXMu c2hpZnRLZXksCisgICAgICAgIH0pOwogCiAgICAgICAgIHRoaXMuX2lnbm9yZUl0ZW1TZWxlY3Rl ZEV2ZW50ID0gZmFsc2U7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYmxlQ29udGVudFZpZXcuanMgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmll dy5qcwppbmRleCA4ZmZhNzIyNTI3ZmUzNjc5NmZlMWVmZTUzZDEyYjgwNzk1OWJlYzA3Li5mYjYz MGViMzY0YjQ0ZGVlZTliODdkYzc3MTNmZmY0ZWE1NGU4MjRhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmll dy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3 b3JrVGFibGVDb250ZW50Vmlldy5qcwpAQCAtNTQsOCArNTQsNyBAQCBXSS5OZXR3b3JrVGFibGVD b250ZW50VmlldyA9IGNsYXNzIE5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29u dGVudFZpZQogICAgICAgICAvLyBGSVhNRTogTmV0d29yayBUaW1lbGluZS4KICAgICAgICAgLy8g RklYTUU6IFRocm90dGxpbmcuCiAKLSAgICAgICAgY29uc3QgZXhjbHVzaXZlID0gdHJ1ZTsKLSAg ICAgICAgdGhpcy5fdHlwZUZpbHRlclNjb3BlQmFySXRlbUFsbCA9IG5ldyBXSS5TY29wZUJhckl0 ZW0oIm5ldHdvcmstdHlwZS1maWx0ZXItYWxsIiwgV0kuVUlTdHJpbmcoIkFsbCIpLCBleGNsdXNp dmUpOworICAgICAgICB0aGlzLl90eXBlRmlsdGVyU2NvcGVCYXJJdGVtQWxsID0gbmV3IFdJLlNj b3BlQmFySXRlbSgibmV0d29yay10eXBlLWZpbHRlci1hbGwiLCBXSS5VSVN0cmluZygiQWxsIiks IHtleGNsdXNpdmU6IHRydWV9KTsKICAgICAgICAgbGV0IHR5cGVGaWx0ZXJTY29wZUJhckl0ZW1z ID0gW3RoaXMuX3R5cGVGaWx0ZXJTY29wZUJhckl0ZW1BbGxdOwogCiAgICAgICAgIGxldCB1bmlx dWVUeXBlcyA9IFsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1Jlc291cmNlU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VTaWRlYmFyUGFuZWwuanMKaW5kZXggZDRhMGVh NzgwMmY3NGQzNDdjZTY5YWFiN2Q1Njg0NmE5YjIyODYyYy4uYTMzOWE5YjQzOTY4N2ZmNjdiZTgx ZDk3Yjk5OTBmNWE1NDBiMGM5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VTaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VTaWRlYmFyUGFuZWwuanMK QEAgLTM3LDcgKzM3LDcgQEAgV0kuUmVzb3VyY2VTaWRlYmFyUGFuZWwgPSBjbGFzcyBSZXNvdXJj ZVNpZGViYXJQYW5lbCBleHRlbmRzIFdJLk5hdmlnYXRpb25TaWRlYmEKICAgICAgICAgdmFyIHNj b3BlSXRlbVByZWZpeCA9ICJyZXNvdXJjZS1zaWRlYmFyLSI7CiAgICAgICAgIHZhciBzY29wZUJh ckl0ZW1zID0gW107CiAKLSAgICAgICAgc2NvcGVCYXJJdGVtcy5wdXNoKG5ldyBXSS5TY29wZUJh ckl0ZW0oc2NvcGVJdGVtUHJlZml4ICsgInR5cGUtYWxsIiwgV0kuVUlTdHJpbmcoIkFsbCBSZXNv dXJjZXMiKSwgdHJ1ZSkpOworICAgICAgICBzY29wZUJhckl0ZW1zLnB1c2gobmV3IFdJLlNjb3Bl QmFySXRlbShzY29wZUl0ZW1QcmVmaXggKyAidHlwZS1hbGwiLCBXSS5VSVN0cmluZygiQWxsIFJl c291cmNlcyIpLCB7ZXhjbHVzaXZlOiB0cnVlfSkpOwogCiAgICAgICAgIGZvciAodmFyIGtleSBp biBXSS5SZXNvdXJjZS5UeXBlKSB7CiAgICAgICAgICAgICB2YXIgdmFsdWUgPSBXSS5SZXNvdXJj ZS5UeXBlW2tleV07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9TY29wZUJhci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1Njb3BlQmFyLmpzCmluZGV4IDYyZmJhODgxNjg4MWIwY2I2NjcxMjQ2YzQ0ZjBm MDlmYjRmZDRkOWUuLmNlYzE2MTMxMzhhMTQyZTNmNjg5MjRhNzY2YmZhOTdmMWVjMWU2MzcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Njb3Bl QmFyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Nj b3BlQmFyLmpzCkBAIC0xMzMsMTAgKzEzMywxMiBAQCBXSS5TY29wZUJhciA9IGNsYXNzIFNjb3Bl QmFyIGV4dGVuZHMgV0kuTmF2aWdhdGlvbkl0ZW0KICAgICAgICAgICAgIH0KICAgICAgICAgfQog Ci0gICAgICAgIGlmICghdGhpcy5zZWxlY3RlZEl0ZW1zLmxlbmd0aCAmJiB0aGlzLl9kZWZhdWx0 SXRlbSkKLSAgICAgICAgICAgIHRoaXMuX2RlZmF1bHRJdGVtLnNlbGVjdGVkID0gdHJ1ZTsKKyAg ICAgICAgaWYgKHRoaXMuX2RlZmF1bHRJdGVtKSB7CisgICAgICAgICAgICBpZiAoIXRoaXMuc2Vs ZWN0ZWRJdGVtcy5sZW5ndGgpCisgICAgICAgICAgICAgICAgdGhpcy5fZGVmYXVsdEl0ZW0uc2Vs ZWN0ZWQgPSB0cnVlOwogCi0gICAgICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NMaXN0LnRvZ2dsZSgi ZGVmYXVsdC1pdGVtLXNlbGVjdGVkIiwgdGhpcy5fZGVmYXVsdEl0ZW0uc2VsZWN0ZWQpOworICAg ICAgICAgICAgdGhpcy5fZWxlbWVudC5jbGFzc0xpc3QudG9nZ2xlKCJkZWZhdWx0LWl0ZW0tc2Vs ZWN0ZWQiLCB0aGlzLl9kZWZhdWx0SXRlbS5zZWxlY3RlZCk7CisgICAgICAgIH0KICAgICB9CiAK ICAgICBfaXRlbVNlbGVjdGlvbkRpZENoYW5nZShldmVudCkKQEAgLTE1Miw3ICsxNTQsNyBAQCBX SS5TY29wZUJhciA9IGNsYXNzIFNjb3BlQmFyIGV4dGVuZHMgV0kuTmF2aWdhdGlvbkl0ZW0KICAg ICAgICAgICAgICAgICAgICAgaXRlbS5zZWxlY3RlZCA9IGZhbHNlOwogICAgICAgICAgICAgfQog ICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgdmFyIHJlcGxhY2VzQ3VycmVudFNlbGVjdGlv biA9IHRoaXMuX3Nob3VsZEdyb3VwTm9uRXhjbHVzaXZlSXRlbXMgfHwgIWV2ZW50LmRhdGEud2l0 aE1vZGlmaWVyOworICAgICAgICAgICAgbGV0IHJlcGxhY2VzQ3VycmVudFNlbGVjdGlvbiA9IHRo aXMuX3Nob3VsZEdyb3VwTm9uRXhjbHVzaXZlSXRlbXMgfHwgIWV2ZW50LmRhdGEuZXh0ZW5kU2Vs ZWN0aW9uOwogICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0aGlzLl9pdGVtcy5sZW5n dGg7ICsraSkgewogICAgICAgICAgICAgICAgIGl0ZW0gPSB0aGlzLl9pdGVtc1tpXTsKICAgICAg ICAgICAgICAgICBpZiAoaXRlbS5leGNsdXNpdmUgJiYgaXRlbSAhPT0gc2VuZGVyICYmIHNlbmRl ci5zZWxlY3RlZCkKQEAgLTE2MiwxMSArMTY0LDEzIEBAIFdJLlNjb3BlQmFyID0gY2xhc3MgU2Nv cGVCYXIgZXh0ZW5kcyBXSS5OYXZpZ2F0aW9uSXRlbQogICAgICAgICAgICAgfQogICAgICAgICB9 CiAKLSAgICAgICAgLy8gSWYgbm90aGluZyBpcyBzZWxlY3RlZCBhbnltb3JlLCBzZWxlY3QgdGhl IGRlZmF1bHQgaXRlbS4KLSAgICAgICAgaWYgKCF0aGlzLnNlbGVjdGVkSXRlbXMubGVuZ3RoICYm IHRoaXMuX2RlZmF1bHRJdGVtKQotICAgICAgICAgICAgdGhpcy5fZGVmYXVsdEl0ZW0uc2VsZWN0 ZWQgPSB0cnVlOworICAgICAgICBpZiAodGhpcy5fZGVmYXVsdEl0ZW0pIHsKKyAgICAgICAgICAg IGlmICghdGhpcy5zZWxlY3RlZEl0ZW1zLmxlbmd0aCkKKyAgICAgICAgICAgICAgICB0aGlzLl9k ZWZhdWx0SXRlbS5zZWxlY3RlZCA9IHRydWU7CisKKyAgICAgICAgICAgIHRoaXMuX2VsZW1lbnQu Y2xhc3NMaXN0LnRvZ2dsZSgiZGVmYXVsdC1pdGVtLXNlbGVjdGVkIiwgdGhpcy5fZGVmYXVsdEl0 ZW0uc2VsZWN0ZWQpOworICAgICAgICB9CiAKLSAgICAgICAgdGhpcy5fZWxlbWVudC5jbGFzc0xp c3QudG9nZ2xlKCJkZWZhdWx0LWl0ZW0tc2VsZWN0ZWQiLCB0aGlzLl9kZWZhdWx0SXRlbS5zZWxl Y3RlZCk7CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdJLlNjb3BlQmFy LkV2ZW50LlNlbGVjdGlvbkNoYW5nZWQpOwogICAgIH0KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY29wZUJhckl0ZW0uanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY29wZUJhckl0ZW0uanMKaW5k ZXggNDFlYTk3NzM3NDkwODY1YjYxYWIwMmRlNzI0YmUzMWJhODYwNWI4YS4uNDdiOTE2OTMzNmRi MWU1MTcwYTdjNjIyOTMyMTI2NDFlZWMyMDk3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NvcGVCYXJJdGVtLmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Njb3BlQmFySXRlbS5qcwpAQCAtMjUs NyArMjUsNyBAQAogCiBXSS5TY29wZUJhckl0ZW0gPSBjbGFzcyBTY29wZUJhckl0ZW0gZXh0ZW5k cyBXSS5PYmplY3QKIHsKLSAgICBjb25zdHJ1Y3RvcihpZCwgbGFiZWwsIGV4Y2x1c2l2ZSwgY2xh c3NOYW1lLCBoaWRkZW4pCisgICAgY29uc3RydWN0b3IoaWQsIGxhYmVsLCB7Y2xhc3NOYW1lLCBl eGNsdXNpdmUsIGhpZGRlbn0gPSB7fSkKICAgICB7CiAgICAgICAgIHN1cGVyKCk7CiAKQEAgLTM4 LDcgKzM4LDcgQEAgV0kuU2NvcGVCYXJJdGVtID0gY2xhc3MgU2NvcGVCYXJJdGVtIGV4dGVuZHMg V0kuT2JqZWN0CiAKICAgICAgICAgdGhpcy5faWQgPSBpZDsKICAgICAgICAgdGhpcy5fbGFiZWwg PSBsYWJlbDsKLSAgICAgICAgdGhpcy5fZXhjbHVzaXZlID0gZXhjbHVzaXZlOworICAgICAgICB0 aGlzLl9leGNsdXNpdmUgPSAhIWV4Y2x1c2l2ZTsKICAgICAgICAgdGhpcy5faGlkZGVuID0gISFo aWRkZW47CiAKICAgICAgICAgdGhpcy5fc2VsZWN0ZWRTZXR0aW5nID0gbmV3IFdJLlNldHRpbmco InNjb3BlYmFyaXRlbS0iICsgaWQsIGZhbHNlKTsKQEAgLTc1LDExICs3NSw2IEBAIFdJLlNjb3Bl QmFySXRlbSA9IGNsYXNzIFNjb3BlQmFySXRlbSBleHRlbmRzIFdJLk9iamVjdAogICAgIH0KIAog ICAgIHNldCBzZWxlY3RlZChzZWxlY3RlZCkKLSAgICB7Ci0gICAgICAgIHRoaXMuc2V0U2VsZWN0 ZWQoc2VsZWN0ZWQsIGZhbHNlKTsKLSAgICB9Ci0KLSAgICBzZXRTZWxlY3RlZChzZWxlY3RlZCwg d2l0aE1vZGlmaWVyKQogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX3NlbGVjdGVkU2V0dGluZy52 YWx1ZSA9PT0gc2VsZWN0ZWQpCiAgICAgICAgICAgICByZXR1cm47CkBAIC04Nyw3ICs4Miw5IEBA IFdJLlNjb3BlQmFySXRlbSA9IGNsYXNzIFNjb3BlQmFySXRlbSBleHRlbmRzIFdJLk9iamVjdAog ICAgICAgICB0aGlzLl9lbGVtZW50LmNsYXNzTGlzdC50b2dnbGUoInNlbGVjdGVkIiwgc2VsZWN0 ZWQpOwogICAgICAgICB0aGlzLl9zZWxlY3RlZFNldHRpbmcudmFsdWUgPSBzZWxlY3RlZDsKIAot ICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXSS5TY29wZUJhckl0ZW0uRXZl bnQuU2VsZWN0aW9uQ2hhbmdlZCwge3dpdGhNb2RpZmllcn0pOworICAgICAgICB0aGlzLmRpc3Bh dGNoRXZlbnRUb0xpc3RlbmVycyhXSS5TY29wZUJhckl0ZW0uRXZlbnQuU2VsZWN0aW9uQ2hhbmdl ZCwgeworICAgICAgICAgICAgZXh0ZW5kU2VsZWN0aW9uOiBXSS5tb2RpZmllcktleXMubWV0YUtl eSAmJiAhV0kubW9kaWZpZXJLZXlzLmN0cmxLZXkgJiYgIVdJLm1vZGlmaWVyS2V5cy5hbHRLZXkg JiYgIVdJLm1vZGlmaWVyS2V5cy5zaGlmdEtleSwKKyAgICAgICAgfSk7CiAgICAgfQogCiAgICAg Z2V0IGhpZGRlbigpCkBAIC0xMTMsNyArMTEwLDcgQEAgV0kuU2NvcGVCYXJJdGVtID0gY2xhc3Mg U2NvcGVCYXJJdGVtIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgIGlmIChldmVudC5idXR0b24g IT09IDApCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgdGhpcy5zZXRTZWxlY3RlZCgh dGhpcy5zZWxlY3RlZCwgZXZlbnQubWV0YUtleSAmJiAhZXZlbnQuY3RybEtleSAmJiAhZXZlbnQu YWx0S2V5ICYmICFldmVudC5zaGlmdEtleSk7CisgICAgICAgIHRoaXMuc2VsZWN0ZWQgPSAhdGhp cy5zZWxlY3RlZDsKICAgICB9CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9TdG9yYWdlU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3RvcmFnZVNpZGViYXJQYW5lbC5qcwpp bmRleCBkMWNmMTM0MjM4NWI3N2JhN2U4ZDJiYTg1MDQ1NjE2MGUxMWUxYzFmLi5hMDVjOWYxYWQ3 OGZiNjViN2Y5MjdhYTM0MjQ3N2QwNDUyNzYzMDE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TdG9yYWdlU2lkZWJhclBhbmVsLmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1N0b3JhZ2VTaWRlYmFy UGFuZWwuanMKQEAgLTM1LDcgKzM1LDcgQEAgV0kuU3RvcmFnZVNpZGViYXJQYW5lbCA9IGNsYXNz IFN0b3JhZ2VTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXSS5OYXZpZ2F0aW9uU2lkZWJhclAKICAgICAg ICAgdmFyIHNjb3BlSXRlbVByZWZpeCA9ICJzdG9yYWdlLXNpZGViYXItIjsKICAgICAgICAgdmFy IHNjb3BlQmFySXRlbXMgPSBbXTsKIAotICAgICAgICBzY29wZUJhckl0ZW1zLnB1c2gobmV3IFdJ LlNjb3BlQmFySXRlbShzY29wZUl0ZW1QcmVmaXggKyAidHlwZS1hbGwiLCBXSS5VSVN0cmluZygi QWxsIFN0b3JhZ2UiKSwgdHJ1ZSkpOworICAgICAgICBzY29wZUJhckl0ZW1zLnB1c2gobmV3IFdJ LlNjb3BlQmFySXRlbShzY29wZUl0ZW1QcmVmaXggKyAidHlwZS1hbGwiLCBXSS5VSVN0cmluZygi QWxsIFN0b3JhZ2UiKSwge2V4Y2x1c2l2ZTogdHJ1ZX0pKTsKIAogICAgICAgICB2YXIgc3RvcmFn ZVR5cGVzID0gWwogICAgICAgICAgICAge2lkZW50aWZpZXI6ICJhcHBsaWNhdGlvbi1jYWNoZSIs IHRpdGxlOiBXSS5VSVN0cmluZygiQXBwbGljYXRpb24gQ2FjaGUiKSwgY2xhc3NlczogW1dJLkFw cGxpY2F0aW9uQ2FjaGVGcmFtZVRyZWVFbGVtZW50LCBXSS5BcHBsaWNhdGlvbkNhY2hlTWFuaWZl c3RUcmVlRWxlbWVudF19LAo=