172621 2017-05-25 16:21:40 -0700 Web Inspector: Don't create NavigationSidebarPanel classes until they are needed by a Tab 2017-06-02 20:44:56 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 172393 1 hi hi commit-queue inspector-bugzilla-changes timothy oldest_to_newest 1312946 0 hi 2017-05-25 16:21:40 -0700 Currently, each of these classes are constructed when the related TabContentView is constructed, which all happen when the TabBrowser loads the open tabs from settings. Instead, they should only be created once a tab that requires it is shown. 1312954 1 311314 hi 2017-05-25 16:33:11 -0700 Created attachment 311314 Patch 1312994 2 311323 hi 2017-05-25 18:35:07 -0700 Created attachment 311323 Patch 1315087 3 311323 timothy 2017-06-02 10:09:02 -0700 Comment on attachment 311323 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=311323&action=review Looks good. > Source/WebInspectorUI/UserInterface/Views/TabContentView.js:182 > get navigationSidebarCollapsedSetting() { return this._navigationSidebarCollapsedSetting; } Add a new line above since the new getter is not a single line. 1315354 4 311901 hi 2017-06-02 20:06:34 -0700 Created attachment 311901 Patch 1315360 5 311901 commit-queue 2017-06-02 20:44:55 -0700 Comment on attachment 311901 Patch Clearing flags on attachment: 311901 Committed r217750: <http://trac.webkit.org/changeset/217750> 1315361 6 commit-queue 2017-06-02 20:44:56 -0700 All reviewed patches have been landed. Closing bug. 311314 2017-05-25 16:33:11 -0700 2017-05-25 18:35:06 -0700 Patch bug-172621-20170525163310.patch text/plain 10800 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDM3NmUyY2I0NjFmOTQ4ZjhlZDQ0ZTViOTFlNGUy YTA5ZGE3YzE2NzAuLjY4M2M3ZThmN2I0ZDk1MzM5N2E4N2I0OTA3YTI3ZTYwZDRkYzFiYjEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE3LTA1LTI1ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBE b24ndCBjcmVhdGUgTmF2aWdhdGlvblNpZGViYXJQYW5lbCBjbGFzc2VzIHVudGlsIHRoZXkgYXJl IG5lZWRlZCBieSBhIFRhYgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTcyNjIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyVGFiQ29udGVudFZp ZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXJUYWJDb250ZW50Vmll dyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXJUYWJDb250ZW50Vmlldy5w cm90b3R5cGUuc2hvd24pOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1Rh YkNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtUYWJDb250ZW50 Vmlldy5wcm90b3R5cGUuY2FuU2hvd1JlcHJlc2VudGVkT2JqZWN0KToKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlU2lkZWJhclBhbmVsLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlJlc291cmNlU2lkZWJhclBhbmVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNv dXJjZVNpZGViYXJQYW5lbC5wcm90b3R5cGUuaW5pdGlhbExheW91dCk6CisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9TZWFyY2hUYWJDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5TZWFyY2hUYWJDb250ZW50Vmlldy5wcm90b3R5cGUuY2FuU2hvd1JlcHJlc2VudGVk T2JqZWN0KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RhYkNvbnRlbnRWaWV3Lmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYkNvbnRlbnRWaWV3KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5UYWJDb250ZW50Vmlldy5wcm90b3R5cGUuZ2V0IG5hdmlnYXRpb25TaWRlYmFyUGFu ZWwpOgorCiAyMDE3LTA1LTI1ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnku Y29tPgogCiAgICAgICAgIFtHVEtdIFdlYiBJbnNwZWN0b3I6IEFkZCBMaXN0U3R5bGVQb3NpdGlv bkluc2lkZS5zdmcgYW5kIExpc3RTdHlsZVBvc2l0aW9uT3V0c2lkZS5zdmcKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2Vy VGFiQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9Db250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3LmpzCmluZGV4IGU4ZDgyYWFjMzE0OWEx ZTJmMzQ0NzEyOTU4MDIxZmMyYWMwZTYyOGQuLjFlOGU1NzdkYmJkNWU2MDhmMjAwOTkyMTJjMTA0 NWI4ZTViYWI1YWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXJUYWJDb250ZW50 Vmlldy5qcwpAQCAtMjUsNyArMjUsNyBAQAogCiBXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXJU YWJDb250ZW50VmlldyA9IGNsYXNzIENvbnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcgZXh0ZW5k cyBXZWJJbnNwZWN0b3IuVGFiQ29udGVudFZpZXcKIHsKLSAgICBjb25zdHJ1Y3RvcihpZGVudGlm aWVyLCBzdHlsZUNsYXNzTmFtZXMsIHRhYkJhckl0ZW0sIG5hdmlnYXRpb25TaWRlYmFyUGFuZWxD bGFzcywgZGV0YWlsc1NpZGViYXJQYW5lbHMsIGRpc2FibGVCYWNrRm9yd2FyZCkKKyAgICBjb25z dHJ1Y3RvcihpZGVudGlmaWVyLCBzdHlsZUNsYXNzTmFtZXMsIHRhYkJhckl0ZW0sIG5hdmlnYXRp b25TaWRlYmFyUGFuZWxDb25zdHJ1Y3RvciwgZGV0YWlsc1NpZGViYXJQYW5lbHMsIGRpc2FibGVC YWNrRm9yd2FyZCkKICAgICB7CiAgICAgICAgIGlmICh0eXBlb2Ygc3R5bGVDbGFzc05hbWVzID09 PSAic3RyaW5nIikKICAgICAgICAgICAgIHN0eWxlQ2xhc3NOYW1lcyA9IFtzdHlsZUNsYXNzTmFt ZXNdOwpAQCAtMzMsOSArMzMsOCBAQCBXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXJUYWJDb250 ZW50VmlldyA9IGNsYXNzIENvbnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcgZQogICAgICAgICBz dHlsZUNsYXNzTmFtZXMucHVzaCgiY29udGVudC1icm93c2VyIik7CiAKICAgICAgICAgdmFyIGNv bnRlbnRCcm93c2VyID0gbmV3IFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3NlcihudWxsLCBudWxs LCBkaXNhYmxlQmFja0ZvcndhcmQpOwotICAgICAgICB2YXIgbmF2aWdhdGlvblNpZGViYXJQYW5l bCA9IG5hdmlnYXRpb25TaWRlYmFyUGFuZWxDbGFzcyA/IG5ldyBuYXZpZ2F0aW9uU2lkZWJhclBh bmVsQ2xhc3MoY29udGVudEJyb3dzZXIpIDogbnVsbDsKIAotICAgICAgICBzdXBlcihpZGVudGlm aWVyLCBzdHlsZUNsYXNzTmFtZXMsIHRhYkJhckl0ZW0sIG5hdmlnYXRpb25TaWRlYmFyUGFuZWws IGRldGFpbHNTaWRlYmFyUGFuZWxzKTsKKyAgICAgICAgc3VwZXIoaWRlbnRpZmllciwgc3R5bGVD bGFzc05hbWVzLCB0YWJCYXJJdGVtLCBuYXZpZ2F0aW9uU2lkZWJhclBhbmVsQ29uc3RydWN0b3Is IGRldGFpbHNTaWRlYmFyUGFuZWxzKTsKIAogICAgICAgICB0aGlzLl9jb250ZW50QnJvd3NlciA9 IGNvbnRlbnRCcm93c2VyOwogICAgICAgICB0aGlzLl9jb250ZW50QnJvd3Nlci5kZWxlZ2F0ZSA9 IHRoaXM7CkBAIC00OSw3ICs0OCw3IEBAIFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3NlclRhYkNv bnRlbnRWaWV3ID0gY2xhc3MgQ29udGVudEJyb3dzZXJUYWJDb250ZW50VmlldyBlCiAgICAgICAg IC8vIEV4cGxpY2l0bHkgdXBkYXRlIHRoZSBwYXRoIGZvciB0aGUgbmF2aWdhdGlvbiBiYXIgdG8g cHJldmVudCBpdCBmcm9tIHNob3dpbmcgdXAgYXMgYmxhbmsuCiAgICAgICAgIHRoaXMuX2NvbnRl bnRCcm93c2VyLnVwZGF0ZUhpZXJhcmNoaWNhbFBhdGhGb3JDdXJyZW50Q29udGVudFZpZXcoKTsK IAotICAgICAgICBpZiAobmF2aWdhdGlvblNpZGViYXJQYW5lbCkgeworICAgICAgICBpZiAobmF2 aWdhdGlvblNpZGViYXJQYW5lbENvbnN0cnVjdG9yKSB7CiAgICAgICAgICAgICBsZXQgc2hvd1Rv b2xUaXAgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNob3cgdGhlIG5hdmlnYXRpb24gc2lkZWJh ciAoJXMpIikuZm9ybWF0KFdlYkluc3BlY3Rvci5uYXZpZ2F0aW9uU2lkZWJhcktleWJvYXJkU2hv cnRjdXQuZGlzcGxheU5hbWUpOwogICAgICAgICAgICAgbGV0IGhpZGVUb29sVGlwID0gV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJIaWRlIHRoZSBuYXZpZ2F0aW9uIHNpZGViYXIgKCVzKSIpLmZvcm1h dChXZWJJbnNwZWN0b3IubmF2aWdhdGlvblNpZGViYXJLZXlib2FyZFNob3J0Y3V0LmRpc3BsYXlO YW1lKTsKICAgICAgICAgICAgIGxldCBpbWFnZSA9IFdlYkluc3BlY3Rvci5yZXNvbHZlZExheW91 dERpcmVjdGlvbigpID09IFdlYkluc3BlY3Rvci5MYXlvdXREaXJlY3Rpb24uUlRMID8gIkltYWdl cy9Ub2dnbGVSaWdodFNpZGViYXIuc3ZnIiA6ICJJbWFnZXMvVG9nZ2xlTGVmdFNpZGViYXIuc3Zn IjsKQEAgLTYxLDggKzYwLDYgQEAgV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2VyVGFiQ29udGVu dFZpZXcgPSBjbGFzcyBDb250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3IGUKICAgICAgICAgICAg IHRoaXMuX2NvbnRlbnRCcm93c2VyLm5hdmlnYXRpb25CYXIuaW5zZXJ0TmF2aWdhdGlvbkl0ZW0o dGhpcy5fc2hvd05hdmlnYXRpb25TaWRlYmFySXRlbSwgMCk7CiAgICAgICAgICAgICB0aGlzLl9j b250ZW50QnJvd3Nlci5uYXZpZ2F0aW9uQmFyLmluc2VydE5hdmlnYXRpb25JdGVtKG5ldyBXZWJJ bnNwZWN0b3IuRGl2aWRlck5hdmlnYXRpb25JdGVtLCAxKTsKIAotICAgICAgICAgICAgbmF2aWdh dGlvblNpZGViYXJQYW5lbC5jb250ZW50QnJvd3NlciA9IHRoaXMuX2NvbnRlbnRCcm93c2VyOwot CiAgICAgICAgICAgICBXZWJJbnNwZWN0b3IubmF2aWdhdGlvblNpZGViYXIuYWRkRXZlbnRMaXN0 ZW5lcihXZWJJbnNwZWN0b3IuU2lkZWJhci5FdmVudC5Db2xsYXBzZWRTdGF0ZURpZENoYW5nZSwg dGhpcy5fbmF2aWdhdGlvblNpZGViYXJDb2xsYXBzZWRTdGF0ZURpZENoYW5nZSwgdGhpcyk7CiAg ICAgICAgIH0KIApAQCAtOTksOCArOTYsMTMgQEAgV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2Vy VGFiQ29udGVudFZpZXcgPSBjbGFzcyBDb250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3IGUKIAog ICAgICAgICB0aGlzLl9jb250ZW50QnJvd3Nlci5zaG93bigpOwogCi0gICAgICAgIGlmICh0aGlz Lm5hdmlnYXRpb25TaWRlYmFyUGFuZWwgJiYgIXRoaXMuX2NvbnRlbnRCcm93c2VyLmN1cnJlbnRD b250ZW50VmlldykKLSAgICAgICAgICAgIHRoaXMubmF2aWdhdGlvblNpZGViYXJQYW5lbC5zaG93 RGVmYXVsdENvbnRlbnRWaWV3KCk7CisgICAgICAgIGlmICh0aGlzLm5hdmlnYXRpb25TaWRlYmFy UGFuZWwpIHsKKyAgICAgICAgICAgIGlmICghdGhpcy5uYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmNv bnRlbnRCcm93c2VyKQorICAgICAgICAgICAgICAgIHRoaXMubmF2aWdhdGlvblNpZGViYXJQYW5l bC5jb250ZW50QnJvd3NlciA9IHRoaXMuX2NvbnRlbnRCcm93c2VyOworCisgICAgICAgICAgICBp ZiAoIXRoaXMuX2NvbnRlbnRCcm93c2VyLmN1cnJlbnRDb250ZW50VmlldykKKyAgICAgICAgICAg ICAgICB0aGlzLm5hdmlnYXRpb25TaWRlYmFyUGFuZWwuc2hvd0RlZmF1bHRDb250ZW50Vmlldygp OworICAgICAgICB9CiAgICAgfQogCiAgICAgaGlkZGVuKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJDb250ZW50Vmlldy5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJD b250ZW50Vmlldy5qcwppbmRleCA2NzQ1YjlkNTNkMmQyNTI2Y2U5OWQ1MzJlODE3ZDk2ZGE4OWU3 MDlmLi45ZWI4MzYxOGU1ZjMxMWU3NmQ0ZmMwYWM0NDM4NTIyZmRkYjdkMzMwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFiQ29u dGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvTmV0d29ya1RhYkNvbnRlbnRWaWV3LmpzCkBAIC01OSw3ICs1OSw3IEBAIFdlYkluc3BlY3Rv ci5OZXR3b3JrVGFiQ29udGVudFZpZXcgPSBjbGFzcyBOZXR3b3JrVGFiQ29udGVudFZpZXcgZXh0 ZW5kcyBXZWJJbnNwCiAgICAgICAgIGlmICghKHJlcHJlc2VudGVkT2JqZWN0IGluc3RhbmNlb2Yg V2ViSW5zcGVjdG9yLlJlc291cmNlKSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAg ICAgICByZXR1cm4gISF0aGlzLl9uYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmNvbnRlbnRUcmVlT3V0 bGluZS5nZXRDYWNoZWRUcmVlRWxlbWVudChyZXByZXNlbnRlZE9iamVjdCk7CisgICAgICAgIHJl dHVybiAhIXRoaXMubmF2aWdhdGlvblNpZGViYXJQYW5lbC5jb250ZW50VHJlZU91dGxpbmUuZ2V0 Q2FjaGVkVHJlZUVsZW1lbnQocmVwcmVzZW50ZWRPYmplY3QpOwogICAgIH0KIAogICAgIGdldCBz dXBwb3J0c1NwbGl0Q29udGVudEJyb3dzZXIoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VTaWRlYmFyUGFuZWwuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVNpZGViYXJQYW5l bC5qcwppbmRleCA2ZGUwZThkM2M5MWQ1MWZmZjNjNGZhZThkZTQ1MTMxYjU1YWU2NjI2Li5iNzc0 YjIzNmNiZTgxNzVhMWE0ODU4YmZlMzU2NmI3NjIwMGFlNzZiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVNpZGViYXJQYW5lbC5q cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJj ZVNpZGViYXJQYW5lbC5qcwpAQCAtNzYsOSArNzYsNiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VT aWRlYmFyUGFuZWwgPSBjbGFzcyBSZXNvdXJjZVNpZGViYXJQYW5lbCBleHRlbmRzIFdlYkluc3Bl YwogICAgICAgICAgICAgdGhpcy5jb250ZW50VHJlZU91dGxpbmUuZGlzY2xvc3VyZUJ1dHRvbnMg PSBmYWxzZTsKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5Tb3VyY2VDb2RlLmFkZEV2ZW50TGlz dGVuZXIoV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGUuRXZlbnQuU291cmNlTWFwQWRkZWQsICgpID0+ IHsgdGhpcy5jb250ZW50VHJlZU91dGxpbmUuZGlzY2xvc3VyZUJ1dHRvbnMgPSB0cnVlOyB9LCB0 aGlzKTsKICAgICAgICAgfQotCi0gICAgICAgIGlmIChXZWJJbnNwZWN0b3IuZnJhbWVSZXNvdXJj ZU1hbmFnZXIubWFpbkZyYW1lKQotICAgICAgICAgICAgdGhpcy5fbWFpbkZyYW1lTWFpblJlc291 cmNlRGlkQ2hhbmdlKFdlYkluc3BlY3Rvci5mcmFtZVJlc291cmNlTWFuYWdlci5tYWluRnJhbWUp OwogICAgIH0KIAogICAgIC8vIFB1YmxpYwpAQCAtMTkyLDYgKzE4OSwxNCBAQCBXZWJJbnNwZWN0 b3IuUmVzb3VyY2VTaWRlYmFyUGFuZWwgPSBjbGFzcyBSZXNvdXJjZVNpZGViYXJQYW5lbCBleHRl bmRzIFdlYkluc3BlYwogCiAgICAgLy8gUHJvdGVjdGVkCiAKKyAgICBpbml0aWFsTGF5b3V0KCkK KyAgICB7CisgICAgICAgIHN1cGVyLmluaXRpYWxMYXlvdXQoKTsKKworICAgICAgICBpZiAoV2Vi SW5zcGVjdG9yLmZyYW1lUmVzb3VyY2VNYW5hZ2VyLm1haW5GcmFtZSkKKyAgICAgICAgICAgIHRo aXMuX21haW5GcmFtZU1haW5SZXNvdXJjZURpZENoYW5nZShXZWJJbnNwZWN0b3IuZnJhbWVSZXNv dXJjZU1hbmFnZXIubWFpbkZyYW1lKTsKKyAgICB9CisKICAgICBoYXNDdXN0b21GaWx0ZXJzKCkK ICAgICB7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMuX3Njb3BlQmFyLnNlbGVjdGVkSXRl bXMubGVuZ3RoID09PSAxKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1NlYXJjaFRhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2VhcmNoVGFiQ29udGVudFZpZXcuanMKaW5kZXgg NzgwOTM2YWU5NDI1NTg3ZTZhYmU3ODgzNDBlNGI3N2YyYzE3OTQ2Ni4uNmIyMjk1YmQxOTZmOTIx NjJmNTliMjM4OWJkN2M1N2ZkMTgyODIzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2VhcmNoVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2VhcmNoVGFiQ29udGVudFZp ZXcuanMKQEAgLTczLDcgKzczLDcgQEAgV2ViSW5zcGVjdG9yLlNlYXJjaFRhYkNvbnRlbnRWaWV3 ID0gY2xhc3MgU2VhcmNoVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJbnNwZWMKICAgICAgICAg aWYgKCEocmVwcmVzZW50ZWRPYmplY3QgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuUmVzb3VyY2Up ICYmICEocmVwcmVzZW50ZWRPYmplY3QgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuU2NyaXB0KSAm JiAhKHJlcHJlc2VudGVkT2JqZWN0IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLkRPTVRyZWUpKQog ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgICAgIHJldHVybiAhIXRoaXMuX25hdmln YXRpb25TaWRlYmFyUGFuZWwuY29udGVudFRyZWVPdXRsaW5lLmdldENhY2hlZFRyZWVFbGVtZW50 KHJlcHJlc2VudGVkT2JqZWN0KTsKKyAgICAgICAgcmV0dXJuICEhdGhpcy5uYXZpZ2F0aW9uU2lk ZWJhclBhbmVsLmNvbnRlbnRUcmVlT3V0bGluZS5nZXRDYWNoZWRUcmVlRWxlbWVudChyZXByZXNl bnRlZE9iamVjdCk7CiAgICAgfQogCiAgICAgZm9jdXNTZWFyY2hGaWVsZCgpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UYWJDb250ZW50Vmll dy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RhYkNvbnRl bnRWaWV3LmpzCmluZGV4IGQwYTg4YWI5OGNhMmI3NzkyZTcxNjY2MDU4N2E4M2E1MTdjYmEwNTku LjVjZTQ5MDVkMGI3ZDQzMGJkZDUwZTNmMzBhNmZjOWI2ZjdiMjlhMDcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RhYkNvbnRlbnRWaWV3Lmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RhYkNvbnRl bnRWaWV3LmpzCkBAIC0yNSwxMiArMjUsMTIgQEAKIAogV2ViSW5zcGVjdG9yLlRhYkNvbnRlbnRW aWV3ID0gY2xhc3MgVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuQ29udGVudFZp ZXcKIHsKLSAgICBjb25zdHJ1Y3RvcihpZGVudGlmaWVyLCBzdHlsZUNsYXNzTmFtZXMsIHRhYkJh ckl0ZW0sIG5hdmlnYXRpb25TaWRlYmFyUGFuZWwsIGRldGFpbHNTaWRlYmFyUGFuZWxzKQorICAg IGNvbnN0cnVjdG9yKGlkZW50aWZpZXIsIHN0eWxlQ2xhc3NOYW1lcywgdGFiQmFySXRlbSwgbmF2 aWdhdGlvblNpZGViYXJQYW5lbENvbnN0cnVjdG9yLCBkZXRhaWxzU2lkZWJhclBhbmVscykKICAg ICB7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHR5cGVvZiBpZGVudGlmaWVyID09PSAic3RyaW5n Iik7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHR5cGVvZiBzdHlsZUNsYXNzTmFtZXMgPT09ICJz dHJpbmciIHx8IHN0eWxlQ2xhc3NOYW1lcy5ldmVyeSgoY2xhc3NOYW1lKSA9PiB0eXBlb2YgY2xh c3NOYW1lID09PSAic3RyaW5nIikpOwogICAgICAgICBjb25zb2xlLmFzc2VydCh0YWJCYXJJdGVt IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlRhYkJhckl0ZW0pOwotICAgICAgICBjb25zb2xlLmFz c2VydCghbmF2aWdhdGlvblNpZGViYXJQYW5lbCB8fCBuYXZpZ2F0aW9uU2lkZWJhclBhbmVsIGlu c3RhbmNlb2YgV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwpOworICAgICAgICBj b25zb2xlLmFzc2VydCghbmF2aWdhdGlvblNpZGViYXJQYW5lbENvbnN0cnVjdG9yIHx8IHR5cGVv ZiBuYXZpZ2F0aW9uU2lkZWJhclBhbmVsQ29uc3RydWN0b3IgPT09ICJmdW5jdGlvbiIpOwogICAg ICAgICBjb25zb2xlLmFzc2VydCghZGV0YWlsc1NpZGViYXJQYW5lbHMgfHwgZGV0YWlsc1NpZGVi YXJQYW5lbHMuZXZlcnkoKGRldGFpbHNTaWRlYmFyUGFuZWwpID0+IGRldGFpbHNTaWRlYmFyUGFu ZWwgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuRGV0YWlsc1NpZGViYXJQYW5lbCkpOwogCiAgICAg ICAgIHN1cGVyKG51bGwpOwpAQCAtNDQsNyArNDQsNyBAQCBXZWJJbnNwZWN0b3IuVGFiQ29udGVu dFZpZXcgPSBjbGFzcyBUYWJDb250ZW50VmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci5Db250ZW50 VgogCiAgICAgICAgIHRoaXMuX2lkZW50aWZpZXIgPSBpZGVudGlmaWVyOwogICAgICAgICB0aGlz Ll90YWJCYXJJdGVtID0gdGFiQmFySXRlbTsKLSAgICAgICAgdGhpcy5fbmF2aWdhdGlvblNpZGVi YXJQYW5lbCA9IG5hdmlnYXRpb25TaWRlYmFyUGFuZWwgfHwgbnVsbDsKKyAgICAgICAgdGhpcy5f bmF2aWdhdGlvblNpZGViYXJQYW5lbENvbnN0cnVjdG9yID0gbmF2aWdhdGlvblNpZGViYXJQYW5l bENvbnN0cnVjdG9yIHx8IG51bGw7CiAgICAgICAgIHRoaXMuX2RldGFpbHNTaWRlYmFyUGFuZWxz ID0gZGV0YWlsc1NpZGViYXJQYW5lbHMgfHwgW107CiAKICAgICAgICAgY29uc3QgZGVmYXVsdFNp ZGViYXJXaWR0aCA9IDMwMDsKQEAgLTE3Myw3ICsxNzMsMTIgQEAgV2ViSW5zcGVjdG9yLlRhYkNv bnRlbnRWaWV3ID0gY2xhc3MgVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuQ29u dGVudFYKICAgICAgICAgdGhpcy5fY29va2llU2V0dGluZy52YWx1ZSA9IGNvb2tpZTsKICAgICB9 CiAKLSAgICBnZXQgbmF2aWdhdGlvblNpZGViYXJQYW5lbCgpIHsgcmV0dXJuIHRoaXMuX25hdmln YXRpb25TaWRlYmFyUGFuZWw7IH0KKyAgICBnZXQgbmF2aWdhdGlvblNpZGViYXJQYW5lbCgpCisg ICAgeworICAgICAgICBpZiAoIXRoaXMuX25hdmlnYXRpb25TaWRlYmFyUGFuZWxDb25zdHJ1Y3Rv cikKKyAgICAgICAgICAgIHJldHVybiBudWxsOworICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9y Lmluc3RhbmNlRm9yQ2xhc3ModGhpcy5fbmF2aWdhdGlvblNpZGViYXJQYW5lbENvbnN0cnVjdG9y KTsKKyAgICB9CiAgICAgZ2V0IG5hdmlnYXRpb25TaWRlYmFyQ29sbGFwc2VkU2V0dGluZygpIHsg cmV0dXJuIHRoaXMuX25hdmlnYXRpb25TaWRlYmFyQ29sbGFwc2VkU2V0dGluZzsgfQogICAgIGdl dCBuYXZpZ2F0aW9uU2lkZWJhcldpZHRoU2V0dGluZygpIHsgcmV0dXJuIHRoaXMuX25hdmlnYXRp b25TaWRlYmFyV2lkdGhTZXR0aW5nOyB9CiAK 311323 2017-05-25 18:35:07 -0700 2017-06-02 20:06:34 -0700 Patch bug-172621-20170525183506.patch text/plain 11114 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGM1YjA3OTdiNGNjOGI0ZjkxM2I0MDI1NGU3NWQ1 YWU5NDM1OTU3MzkuLjhjNjkyZjBiMGY5NWM0YWYxOGI2MzYxYTVkMTNmZGZiOTg5MjYyMjAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDE3LTA1LTI1ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAorICAgICAgICBXZWIgSW5zcGVjdG9yOiBE b24ndCBjcmVhdGUgTmF2aWdhdGlvblNpZGViYXJQYW5lbCBjbGFzc2VzIHVudGlsIHRoZXkgYXJl IG5lZWRlZCBieSBhIFRhYgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTcyNjIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyVGFiQ29udGVudFZp ZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXJUYWJDb250ZW50Vmll dyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXJUYWJDb250ZW50Vmlldy5w cm90b3R5cGUuc2hvd24pOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGFiQ29udGVu dFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGFiQ29udGVudFZpZXcpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlRhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5nZXQgbmF2aWdhdGlvblNp ZGViYXJQYW5lbCk6CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJD b250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrVGFiQ29udGVudFZp ZXcucHJvdG90eXBlLmNhblNob3dSZXByZXNlbnRlZE9iamVjdCk6CisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9TZWFyY2hUYWJDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5TZWFyY2hUYWJDb250ZW50Vmlldy5wcm90b3R5cGUuY2FuU2hvd1JlcHJlc2VudGVkT2Jq ZWN0KToKKyAgICAgICAgVXNlIHB1YmxpYyBnZXR0ZXIgZm9yIG5hdmlnYXRpb25TaWRlYmFyUGFu ZWwuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlU2lkZWJhclBhbmVs LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlU2lkZWJhclBhbmVsKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVNpZGViYXJQYW5lbC5wcm90b3R5cGUuaW5pdGlhbExh eW91dCk6IEFkZGVkLgorICAgICAgICBMb2FkIGluZm9ybWF0aW9uIGFib3V0IHRoZSBjdXJyZW50 IGZyYW1lIG9uY2UgdGhlIHNpZGViYXIgcGFuZWwgaXMgZGlzcGxheWVkLgorCisyMDE3LTA1LTI1 ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVj dG9yOiBEb24ndCBjcmVhdGUgRGV0YWlsc1NpZGViYXJQYW5lbCBjbGFzc2VzIHVudGlsIHRoZXkg YXJlIG5lZWRlZCBieSBhIFRhYgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTcyMzkzCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3NlclRhYkNv bnRlbnRWaWV3LmpzCmluZGV4IDE4MTM0NDA1MzFmZGQ4N2U5ZmU1ZmYwZDFkYjUxZjEzYWRiNGEw MzMuLmVjOGNkNzc4NmY2ZjFlYjhhMjA5Y2E0YzViZDdjYTdkZDFjMmMyODUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2Vy VGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQ29udGVudEJyb3dzZXJUYWJDb250ZW50Vmlldy5qcwpAQCAtMjUsNyArMjUsNyBA QAogCiBXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXJUYWJDb250ZW50VmlldyA9IGNsYXNzIENv bnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVGFiQ29udGVu dFZpZXcKIHsKLSAgICBjb25zdHJ1Y3RvcihpZGVudGlmaWVyLCBzdHlsZUNsYXNzTmFtZXMsIHRh YkJhckl0ZW0sIG5hdmlnYXRpb25TaWRlYmFyUGFuZWxDbGFzcywgZGV0YWlsc1NpZGViYXJQYW5l bENvbnN0cnVjdG9ycywgZGlzYWJsZUJhY2tGb3J3YXJkKQorICAgIGNvbnN0cnVjdG9yKGlkZW50 aWZpZXIsIHN0eWxlQ2xhc3NOYW1lcywgdGFiQmFySXRlbSwgbmF2aWdhdGlvblNpZGViYXJQYW5l bENvbnN0cnVjdG9yLCBkZXRhaWxzU2lkZWJhclBhbmVsQ29uc3RydWN0b3JzLCBkaXNhYmxlQmFj a0ZvcndhcmQpCiAgICAgewogICAgICAgICBpZiAodHlwZW9mIHN0eWxlQ2xhc3NOYW1lcyA9PT0g InN0cmluZyIpCiAgICAgICAgICAgICBzdHlsZUNsYXNzTmFtZXMgPSBbc3R5bGVDbGFzc05hbWVz XTsKQEAgLTMzLDkgKzMzLDggQEAgV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2VyVGFiQ29udGVu dFZpZXcgPSBjbGFzcyBDb250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3IGUKICAgICAgICAgc3R5 bGVDbGFzc05hbWVzLnB1c2goImNvbnRlbnQtYnJvd3NlciIpOwogCiAgICAgICAgIHZhciBjb250 ZW50QnJvd3NlciA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXIobnVsbCwgbnVsbCwg ZGlzYWJsZUJhY2tGb3J3YXJkKTsKLSAgICAgICAgdmFyIG5hdmlnYXRpb25TaWRlYmFyUGFuZWwg PSBuYXZpZ2F0aW9uU2lkZWJhclBhbmVsQ2xhc3MgPyBuZXcgbmF2aWdhdGlvblNpZGViYXJQYW5l bENsYXNzKGNvbnRlbnRCcm93c2VyKSA6IG51bGw7CiAKLSAgICAgICAgc3VwZXIoaWRlbnRpZmll ciwgc3R5bGVDbGFzc05hbWVzLCB0YWJCYXJJdGVtLCBuYXZpZ2F0aW9uU2lkZWJhclBhbmVsLCBk ZXRhaWxzU2lkZWJhclBhbmVsQ29uc3RydWN0b3JzKTsKKyAgICAgICAgc3VwZXIoaWRlbnRpZmll ciwgc3R5bGVDbGFzc05hbWVzLCB0YWJCYXJJdGVtLCBuYXZpZ2F0aW9uU2lkZWJhclBhbmVsQ29u c3RydWN0b3IsIGRldGFpbHNTaWRlYmFyUGFuZWxDb25zdHJ1Y3RvcnMpOwogCiAgICAgICAgIHRo aXMuX2NvbnRlbnRCcm93c2VyID0gY29udGVudEJyb3dzZXI7CiAgICAgICAgIHRoaXMuX2NvbnRl bnRCcm93c2VyLmRlbGVnYXRlID0gdGhpczsKQEAgLTQ5LDcgKzQ4LDcgQEAgV2ViSW5zcGVjdG9y LkNvbnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcgPSBjbGFzcyBDb250ZW50QnJvd3NlclRhYkNv bnRlbnRWaWV3IGUKICAgICAgICAgLy8gRXhwbGljaXRseSB1cGRhdGUgdGhlIHBhdGggZm9yIHRo ZSBuYXZpZ2F0aW9uIGJhciB0byBwcmV2ZW50IGl0IGZyb20gc2hvd2luZyB1cCBhcyBibGFuay4K ICAgICAgICAgdGhpcy5fY29udGVudEJyb3dzZXIudXBkYXRlSGllcmFyY2hpY2FsUGF0aEZvckN1 cnJlbnRDb250ZW50VmlldygpOwogCi0gICAgICAgIGlmIChuYXZpZ2F0aW9uU2lkZWJhclBhbmVs KSB7CisgICAgICAgIGlmIChuYXZpZ2F0aW9uU2lkZWJhclBhbmVsQ29uc3RydWN0b3IpIHsKICAg ICAgICAgICAgIGxldCBzaG93VG9vbFRpcCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2hvdyB0 aGUgbmF2aWdhdGlvbiBzaWRlYmFyICglcykiKS5mb3JtYXQoV2ViSW5zcGVjdG9yLm5hdmlnYXRp b25TaWRlYmFyS2V5Ym9hcmRTaG9ydGN1dC5kaXNwbGF5TmFtZSk7CiAgICAgICAgICAgICBsZXQg aGlkZVRvb2xUaXAgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkhpZGUgdGhlIG5hdmlnYXRpb24g c2lkZWJhciAoJXMpIikuZm9ybWF0KFdlYkluc3BlY3Rvci5uYXZpZ2F0aW9uU2lkZWJhcktleWJv YXJkU2hvcnRjdXQuZGlzcGxheU5hbWUpOwogICAgICAgICAgICAgbGV0IGltYWdlID0gV2ViSW5z cGVjdG9yLnJlc29sdmVkTGF5b3V0RGlyZWN0aW9uKCkgPT0gV2ViSW5zcGVjdG9yLkxheW91dERp cmVjdGlvbi5SVEwgPyAiSW1hZ2VzL1RvZ2dsZVJpZ2h0U2lkZWJhci5zdmciIDogIkltYWdlcy9U b2dnbGVMZWZ0U2lkZWJhci5zdmciOwpAQCAtNjEsOCArNjAsNiBAQCBXZWJJbnNwZWN0b3IuQ29u dGVudEJyb3dzZXJUYWJDb250ZW50VmlldyA9IGNsYXNzIENvbnRlbnRCcm93c2VyVGFiQ29udGVu dFZpZXcgZQogICAgICAgICAgICAgdGhpcy5fY29udGVudEJyb3dzZXIubmF2aWdhdGlvbkJhci5p bnNlcnROYXZpZ2F0aW9uSXRlbSh0aGlzLl9zaG93TmF2aWdhdGlvblNpZGViYXJJdGVtLCAwKTsK ICAgICAgICAgICAgIHRoaXMuX2NvbnRlbnRCcm93c2VyLm5hdmlnYXRpb25CYXIuaW5zZXJ0TmF2 aWdhdGlvbkl0ZW0obmV3IFdlYkluc3BlY3Rvci5EaXZpZGVyTmF2aWdhdGlvbkl0ZW0sIDEpOwog Ci0gICAgICAgICAgICBuYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmNvbnRlbnRCcm93c2VyID0gdGhp cy5fY29udGVudEJyb3dzZXI7Ci0KICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5uYXZpZ2F0aW9u U2lkZWJhci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5TaWRlYmFyLkV2ZW50LkNvbGxh cHNlZFN0YXRlRGlkQ2hhbmdlLCB0aGlzLl9uYXZpZ2F0aW9uU2lkZWJhckNvbGxhcHNlZFN0YXRl RGlkQ2hhbmdlLCB0aGlzKTsKICAgICAgICAgfQogCkBAIC05OSw4ICs5NiwxMyBAQCBXZWJJbnNw ZWN0b3IuQ29udGVudEJyb3dzZXJUYWJDb250ZW50VmlldyA9IGNsYXNzIENvbnRlbnRCcm93c2Vy VGFiQ29udGVudFZpZXcgZQogCiAgICAgICAgIHRoaXMuX2NvbnRlbnRCcm93c2VyLnNob3duKCk7 CiAKLSAgICAgICAgaWYgKHRoaXMubmF2aWdhdGlvblNpZGViYXJQYW5lbCAmJiAhdGhpcy5fY29u dGVudEJyb3dzZXIuY3VycmVudENvbnRlbnRWaWV3KQotICAgICAgICAgICAgdGhpcy5uYXZpZ2F0 aW9uU2lkZWJhclBhbmVsLnNob3dEZWZhdWx0Q29udGVudFZpZXcoKTsKKyAgICAgICAgaWYgKHRo aXMubmF2aWdhdGlvblNpZGViYXJQYW5lbCkgeworICAgICAgICAgICAgaWYgKCF0aGlzLm5hdmln YXRpb25TaWRlYmFyUGFuZWwuY29udGVudEJyb3dzZXIpCisgICAgICAgICAgICAgICAgdGhpcy5u YXZpZ2F0aW9uU2lkZWJhclBhbmVsLmNvbnRlbnRCcm93c2VyID0gdGhpcy5fY29udGVudEJyb3dz ZXI7CisKKyAgICAgICAgICAgIGlmICghdGhpcy5fY29udGVudEJyb3dzZXIuY3VycmVudENvbnRl bnRWaWV3KQorICAgICAgICAgICAgICAgIHRoaXMubmF2aWdhdGlvblNpZGViYXJQYW5lbC5zaG93 RGVmYXVsdENvbnRlbnRWaWV3KCk7CisgICAgICAgIH0KICAgICB9CiAKICAgICBoaWRkZW4oKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0 d29ya1RhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvTmV0d29ya1RhYkNvbnRlbnRWaWV3LmpzCmluZGV4IDk1ODA5MGEyYzdiMDQ4YzZk MjNmOTNmMWM3MTUyYjEwMjliOWVjZmUuLjk1NmRhNTk0MjQxZjc3ZTg4NTlmODY0YmY2NTFiM2Ew NTU4YjBiYTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL05ldHdvcmtUYWJDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFiQ29udGVudFZpZXcuanMKQEAgLTU5LDcg KzU5LDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtUYWJDb250ZW50VmlldyA9IGNsYXNzIE5ldHdv cmtUYWJDb250ZW50VmlldyBleHRlbmRzIFdlYkluc3AKICAgICAgICAgaWYgKCEocmVwcmVzZW50 ZWRPYmplY3QgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuUmVzb3VyY2UpKQogICAgICAgICAgICAg cmV0dXJuIGZhbHNlOwogCi0gICAgICAgIHJldHVybiAhIXRoaXMuX25hdmlnYXRpb25TaWRlYmFy UGFuZWwuY29udGVudFRyZWVPdXRsaW5lLmdldENhY2hlZFRyZWVFbGVtZW50KHJlcHJlc2VudGVk T2JqZWN0KTsKKyAgICAgICAgcmV0dXJuICEhdGhpcy5uYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmNv bnRlbnRUcmVlT3V0bGluZS5nZXRDYWNoZWRUcmVlRWxlbWVudChyZXByZXNlbnRlZE9iamVjdCk7 CiAgICAgfQogCiAgICAgZ2V0IHN1cHBvcnRzU3BsaXRDb250ZW50QnJvd3NlcigpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVNp ZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1Jlc291cmNlU2lkZWJhclBhbmVsLmpzCmluZGV4IDZkZTBlOGQzYzkxZDUxZmZmM2M0ZmFlOGRl NDUxMzFiNTVhZTY2MjYuLmI3NzRiMjM2Y2JlODE3NWExYTQ4NThiZmUzNTY2Yjc2MjAwYWU3NmIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jl c291cmNlU2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1Jlc291cmNlU2lkZWJhclBhbmVsLmpzCkBAIC03Niw5ICs3Niw2IEBAIFdl Ykluc3BlY3Rvci5SZXNvdXJjZVNpZGViYXJQYW5lbCA9IGNsYXNzIFJlc291cmNlU2lkZWJhclBh bmVsIGV4dGVuZHMgV2ViSW5zcGVjCiAgICAgICAgICAgICB0aGlzLmNvbnRlbnRUcmVlT3V0bGlu ZS5kaXNjbG9zdXJlQnV0dG9ucyA9IGZhbHNlOwogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLlNv dXJjZUNvZGUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuU291cmNlQ29kZS5FdmVudC5T b3VyY2VNYXBBZGRlZCwgKCkgPT4geyB0aGlzLmNvbnRlbnRUcmVlT3V0bGluZS5kaXNjbG9zdXJl QnV0dG9ucyA9IHRydWU7IH0sIHRoaXMpOwogICAgICAgICB9Ci0KLSAgICAgICAgaWYgKFdlYklu c3BlY3Rvci5mcmFtZVJlc291cmNlTWFuYWdlci5tYWluRnJhbWUpCi0gICAgICAgICAgICB0aGlz Ll9tYWluRnJhbWVNYWluUmVzb3VyY2VEaWRDaGFuZ2UoV2ViSW5zcGVjdG9yLmZyYW1lUmVzb3Vy Y2VNYW5hZ2VyLm1haW5GcmFtZSk7CiAgICAgfQogCiAgICAgLy8gUHVibGljCkBAIC0xOTIsNiAr MTg5LDE0IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVNpZGViYXJQYW5lbCA9IGNsYXNzIFJlc291 cmNlU2lkZWJhclBhbmVsIGV4dGVuZHMgV2ViSW5zcGVjCiAKICAgICAvLyBQcm90ZWN0ZWQKIAor ICAgIGluaXRpYWxMYXlvdXQoKQorICAgIHsKKyAgICAgICAgc3VwZXIuaW5pdGlhbExheW91dCgp OworCisgICAgICAgIGlmIChXZWJJbnNwZWN0b3IuZnJhbWVSZXNvdXJjZU1hbmFnZXIubWFpbkZy YW1lKQorICAgICAgICAgICAgdGhpcy5fbWFpbkZyYW1lTWFpblJlc291cmNlRGlkQ2hhbmdlKFdl Ykluc3BlY3Rvci5mcmFtZVJlc291cmNlTWFuYWdlci5tYWluRnJhbWUpOworICAgIH0KKwogICAg IGhhc0N1c3RvbUZpbHRlcnMoKQogICAgIHsKICAgICAgICAgY29uc29sZS5hc3NlcnQodGhpcy5f c2NvcGVCYXIuc2VsZWN0ZWRJdGVtcy5sZW5ndGggPT09IDEpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2VhcmNoVGFiQ29udGVudFZpZXcu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZWFyY2hUYWJD b250ZW50Vmlldy5qcwppbmRleCBiMmVlZTIzNmNiYzdiM2JiYzk4YTUxMDJlOTdhNWRhY2EwNDgy MzE5Li5jZDdkNmQ0ZDM1NjcxOWQ3M2E2NjJjMjcwZGQ5ZmY2OGVlY2FkNDhkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZWFyY2hUYWJDb250 ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9TZWFyY2hUYWJDb250ZW50Vmlldy5qcwpAQCAtNzMsNyArNzMsNyBAQCBXZWJJbnNwZWN0b3Iu U2VhcmNoVGFiQ29udGVudFZpZXcgPSBjbGFzcyBTZWFyY2hUYWJDb250ZW50VmlldyBleHRlbmRz IFdlYkluc3BlYwogICAgICAgICBpZiAoIShyZXByZXNlbnRlZE9iamVjdCBpbnN0YW5jZW9mIFdl Ykluc3BlY3Rvci5SZXNvdXJjZSkgJiYgIShyZXByZXNlbnRlZE9iamVjdCBpbnN0YW5jZW9mIFdl Ykluc3BlY3Rvci5TY3JpcHQpICYmICEocmVwcmVzZW50ZWRPYmplY3QgaW5zdGFuY2VvZiBXZWJJ bnNwZWN0b3IuRE9NVHJlZSkpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICAgICAg cmV0dXJuICEhdGhpcy5fbmF2aWdhdGlvblNpZGViYXJQYW5lbC5jb250ZW50VHJlZU91dGxpbmUu Z2V0Q2FjaGVkVHJlZUVsZW1lbnQocmVwcmVzZW50ZWRPYmplY3QpOworICAgICAgICByZXR1cm4g ISF0aGlzLm5hdmlnYXRpb25TaWRlYmFyUGFuZWwuY29udGVudFRyZWVPdXRsaW5lLmdldENhY2hl ZFRyZWVFbGVtZW50KHJlcHJlc2VudGVkT2JqZWN0KTsKICAgICB9CiAKICAgICBmb2N1c1NlYXJj aEZpZWxkKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1RhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvVGFiQ29udGVudFZpZXcuanMKaW5kZXggMTY4NjZjYjY1ZGQ5YzZlZmI2YjAy MTVlNjRkZjdmYmI4YTA1NjZlMC4uYzU0NjE5MTMxYmE4OWJmOWU5NWQyNmUzYzViYjU2MDRiOTQ4 YTA4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvVGFiQ29udGVudFZpZXcuanMKQEAgLTI1LDEyICsyNSwxMiBAQAogCiBXZWJJ bnNwZWN0b3IuVGFiQ29udGVudFZpZXcgPSBjbGFzcyBUYWJDb250ZW50VmlldyBleHRlbmRzIFdl Ykluc3BlY3Rvci5Db250ZW50VmlldwogewotICAgIGNvbnN0cnVjdG9yKGlkZW50aWZpZXIsIHN0 eWxlQ2xhc3NOYW1lcywgdGFiQmFySXRlbSwgbmF2aWdhdGlvblNpZGViYXJQYW5lbCwgZGV0YWls c1NpZGViYXJQYW5lbENvbnN0cnVjdG9ycykKKyAgICBjb25zdHJ1Y3RvcihpZGVudGlmaWVyLCBz dHlsZUNsYXNzTmFtZXMsIHRhYkJhckl0ZW0sIG5hdmlnYXRpb25TaWRlYmFyUGFuZWxDb25zdHJ1 Y3RvciwgZGV0YWlsc1NpZGViYXJQYW5lbENvbnN0cnVjdG9ycykKICAgICB7CiAgICAgICAgIGNv bnNvbGUuYXNzZXJ0KHR5cGVvZiBpZGVudGlmaWVyID09PSAic3RyaW5nIik7CiAgICAgICAgIGNv bnNvbGUuYXNzZXJ0KHR5cGVvZiBzdHlsZUNsYXNzTmFtZXMgPT09ICJzdHJpbmciIHx8IHN0eWxl Q2xhc3NOYW1lcy5ldmVyeSgoY2xhc3NOYW1lKSA9PiB0eXBlb2YgY2xhc3NOYW1lID09PSAic3Ry aW5nIikpOwogICAgICAgICBjb25zb2xlLmFzc2VydCh0YWJCYXJJdGVtIGluc3RhbmNlb2YgV2Vi SW5zcGVjdG9yLlRhYkJhckl0ZW0pOwotICAgICAgICBjb25zb2xlLmFzc2VydCghbmF2aWdhdGlv blNpZGViYXJQYW5lbCB8fCBuYXZpZ2F0aW9uU2lkZWJhclBhbmVsIGluc3RhbmNlb2YgV2ViSW5z cGVjdG9yLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwpOworICAgICAgICBjb25zb2xlLmFzc2VydCgh bmF2aWdhdGlvblNpZGViYXJQYW5lbENvbnN0cnVjdG9yIHx8IHR5cGVvZiBuYXZpZ2F0aW9uU2lk ZWJhclBhbmVsQ29uc3RydWN0b3IgPT09ICJmdW5jdGlvbiIpOwogICAgICAgICBjb25zb2xlLmFz c2VydCghZGV0YWlsc1NpZGViYXJQYW5lbENvbnN0cnVjdG9ycyB8fCBkZXRhaWxzU2lkZWJhclBh bmVsQ29uc3RydWN0b3JzLmV2ZXJ5KChkZXRhaWxzU2lkZWJhclBhbmVsQ29uc3RydWN0b3IpID0+ IHR5cGVvZiBkZXRhaWxzU2lkZWJhclBhbmVsQ29uc3RydWN0b3IgPT09ICJmdW5jdGlvbiIpKTsK IAogICAgICAgICBzdXBlcihudWxsKTsKQEAgLTQ0LDcgKzQ0LDcgQEAgV2ViSW5zcGVjdG9yLlRh YkNvbnRlbnRWaWV3ID0gY2xhc3MgVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3Iu Q29udGVudFYKIAogICAgICAgICB0aGlzLl9pZGVudGlmaWVyID0gaWRlbnRpZmllcjsKICAgICAg ICAgdGhpcy5fdGFiQmFySXRlbSA9IHRhYkJhckl0ZW07Ci0gICAgICAgIHRoaXMuX25hdmlnYXRp b25TaWRlYmFyUGFuZWwgPSBuYXZpZ2F0aW9uU2lkZWJhclBhbmVsIHx8IG51bGw7CisgICAgICAg IHRoaXMuX25hdmlnYXRpb25TaWRlYmFyUGFuZWxDb25zdHJ1Y3RvciA9IG5hdmlnYXRpb25TaWRl YmFyUGFuZWxDb25zdHJ1Y3RvciB8fCBudWxsOwogICAgICAgICB0aGlzLl9kZXRhaWxzU2lkZWJh clBhbmVsQ29uc3RydWN0b3JzID0gZGV0YWlsc1NpZGViYXJQYW5lbENvbnN0cnVjdG9ycyB8fCBb XTsKIAogICAgICAgICBjb25zdCBkZWZhdWx0U2lkZWJhcldpZHRoID0gMzAwOwpAQCAtMTczLDcg KzE3MywxMiBAQCBXZWJJbnNwZWN0b3IuVGFiQ29udGVudFZpZXcgPSBjbGFzcyBUYWJDb250ZW50 VmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci5Db250ZW50VgogICAgICAgICB0aGlzLl9jb29raWVT ZXR0aW5nLnZhbHVlID0gY29va2llOwogICAgIH0KIAotICAgIGdldCBuYXZpZ2F0aW9uU2lkZWJh clBhbmVsKCkgeyByZXR1cm4gdGhpcy5fbmF2aWdhdGlvblNpZGViYXJQYW5lbDsgfQorICAgIGdl dCBuYXZpZ2F0aW9uU2lkZWJhclBhbmVsKCkKKyAgICB7CisgICAgICAgIGlmICghdGhpcy5fbmF2 aWdhdGlvblNpZGViYXJQYW5lbENvbnN0cnVjdG9yKQorICAgICAgICAgICAgcmV0dXJuIG51bGw7 CisgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuaW5zdGFuY2VGb3JDbGFzcyh0aGlzLl9uYXZp Z2F0aW9uU2lkZWJhclBhbmVsQ29uc3RydWN0b3IpOworICAgIH0KICAgICBnZXQgbmF2aWdhdGlv blNpZGViYXJDb2xsYXBzZWRTZXR0aW5nKCkgeyByZXR1cm4gdGhpcy5fbmF2aWdhdGlvblNpZGVi YXJDb2xsYXBzZWRTZXR0aW5nOyB9CiAgICAgZ2V0IG5hdmlnYXRpb25TaWRlYmFyV2lkdGhTZXR0 aW5nKCkgeyByZXR1cm4gdGhpcy5fbmF2aWdhdGlvblNpZGViYXJXaWR0aFNldHRpbmc7IH0KIAo= 311901 2017-06-02 20:06:34 -0700 2017-06-02 20:44:55 -0700 Patch 172621.diff text/plain 11183 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDI4ZTVlOWZjNWRhLi5mNjY0OGU5MTQwZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzAgQEAKIDIwMTctMDYtMDIgIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IERv bid0IGNyZWF0ZSBOYXZpZ2F0aW9uU2lkZWJhclBhbmVsIGNsYXNzZXMgdW50aWwgdGhleSBhcmUg bmVlZGVkIGJ5IGEgVGFiCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNzI2MjEKKworICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIuCisK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyVGFiQ29udGVudFZp ZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXJUYWJDb250ZW50Vmll dyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXJUYWJDb250ZW50Vmlldy5w cm90b3R5cGUuc2hvd24pOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGFiQ29udGVu dFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGFiQ29udGVudFZpZXcpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlRhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5nZXQgbmF2aWdhdGlvblNp ZGViYXJQYW5lbCk6CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJD b250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrVGFiQ29udGVudFZp ZXcucHJvdG90eXBlLmNhblNob3dSZXByZXNlbnRlZE9iamVjdCk6CisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9TZWFyY2hUYWJDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5TZWFyY2hUYWJDb250ZW50Vmlldy5wcm90b3R5cGUuY2FuU2hvd1JlcHJlc2VudGVkT2Jq ZWN0KToKKyAgICAgICAgVXNlIHB1YmxpYyBnZXR0ZXIgZm9yIG5hdmlnYXRpb25TaWRlYmFyUGFu ZWwuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlU2lkZWJhclBhbmVs LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlU2lkZWJhclBhbmVsKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVNpZGViYXJQYW5lbC5wcm90b3R5cGUuaW5pdGlhbExh eW91dCk6IEFkZGVkLgorICAgICAgICBMb2FkIGluZm9ybWF0aW9uIGFib3V0IHRoZSBjdXJyZW50 IGZyYW1lIG9uY2UgdGhlIHNpZGViYXIgcGFuZWwgaXMgZGlzcGxheWVkLgorCisyMDE3LTA2LTAy ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVj dG9yOiBTaG91bGQgc2VlIGFjdGl2ZSBXZWIgU29ja2V0cyB3aGVuIG9wZW5pbmcgV2ViIEluc3Bl Y3RvcgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcy MzEyCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0NvbnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3LmpzCmlu ZGV4IDE4MTM0NDA1MzFmLi5lYzhjZDc3ODZmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXJUYWJDb250ZW50Vmlldy5q cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50 QnJvd3NlclRhYkNvbnRlbnRWaWV3LmpzCkBAIC0yNSw3ICsyNSw3IEBACiAKIFdlYkluc3BlY3Rv ci5Db250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3ID0gY2xhc3MgQ29udGVudEJyb3dzZXJUYWJD b250ZW50VmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci5UYWJDb250ZW50VmlldwogewotICAgIGNv bnN0cnVjdG9yKGlkZW50aWZpZXIsIHN0eWxlQ2xhc3NOYW1lcywgdGFiQmFySXRlbSwgbmF2aWdh dGlvblNpZGViYXJQYW5lbENsYXNzLCBkZXRhaWxzU2lkZWJhclBhbmVsQ29uc3RydWN0b3JzLCBk aXNhYmxlQmFja0ZvcndhcmQpCisgICAgY29uc3RydWN0b3IoaWRlbnRpZmllciwgc3R5bGVDbGFz c05hbWVzLCB0YWJCYXJJdGVtLCBuYXZpZ2F0aW9uU2lkZWJhclBhbmVsQ29uc3RydWN0b3IsIGRl dGFpbHNTaWRlYmFyUGFuZWxDb25zdHJ1Y3RvcnMsIGRpc2FibGVCYWNrRm9yd2FyZCkKICAgICB7 CiAgICAgICAgIGlmICh0eXBlb2Ygc3R5bGVDbGFzc05hbWVzID09PSAic3RyaW5nIikKICAgICAg ICAgICAgIHN0eWxlQ2xhc3NOYW1lcyA9IFtzdHlsZUNsYXNzTmFtZXNdOwpAQCAtMzMsOSArMzMs OCBAQCBXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXJUYWJDb250ZW50VmlldyA9IGNsYXNzIENv bnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcgZQogICAgICAgICBzdHlsZUNsYXNzTmFtZXMucHVz aCgiY29udGVudC1icm93c2VyIik7CiAKICAgICAgICAgdmFyIGNvbnRlbnRCcm93c2VyID0gbmV3 IFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3NlcihudWxsLCBudWxsLCBkaXNhYmxlQmFja0Zvcndh cmQpOwotICAgICAgICB2YXIgbmF2aWdhdGlvblNpZGViYXJQYW5lbCA9IG5hdmlnYXRpb25TaWRl YmFyUGFuZWxDbGFzcyA/IG5ldyBuYXZpZ2F0aW9uU2lkZWJhclBhbmVsQ2xhc3MoY29udGVudEJy b3dzZXIpIDogbnVsbDsKIAotICAgICAgICBzdXBlcihpZGVudGlmaWVyLCBzdHlsZUNsYXNzTmFt ZXMsIHRhYkJhckl0ZW0sIG5hdmlnYXRpb25TaWRlYmFyUGFuZWwsIGRldGFpbHNTaWRlYmFyUGFu ZWxDb25zdHJ1Y3RvcnMpOworICAgICAgICBzdXBlcihpZGVudGlmaWVyLCBzdHlsZUNsYXNzTmFt ZXMsIHRhYkJhckl0ZW0sIG5hdmlnYXRpb25TaWRlYmFyUGFuZWxDb25zdHJ1Y3RvciwgZGV0YWls c1NpZGViYXJQYW5lbENvbnN0cnVjdG9ycyk7CiAKICAgICAgICAgdGhpcy5fY29udGVudEJyb3dz ZXIgPSBjb250ZW50QnJvd3NlcjsKICAgICAgICAgdGhpcy5fY29udGVudEJyb3dzZXIuZGVsZWdh dGUgPSB0aGlzOwpAQCAtNDksNyArNDgsNyBAQCBXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXJU YWJDb250ZW50VmlldyA9IGNsYXNzIENvbnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcgZQogICAg ICAgICAvLyBFeHBsaWNpdGx5IHVwZGF0ZSB0aGUgcGF0aCBmb3IgdGhlIG5hdmlnYXRpb24gYmFy IHRvIHByZXZlbnQgaXQgZnJvbSBzaG93aW5nIHVwIGFzIGJsYW5rLgogICAgICAgICB0aGlzLl9j b250ZW50QnJvd3Nlci51cGRhdGVIaWVyYXJjaGljYWxQYXRoRm9yQ3VycmVudENvbnRlbnRWaWV3 KCk7CiAKLSAgICAgICAgaWYgKG5hdmlnYXRpb25TaWRlYmFyUGFuZWwpIHsKKyAgICAgICAgaWYg KG5hdmlnYXRpb25TaWRlYmFyUGFuZWxDb25zdHJ1Y3RvcikgewogICAgICAgICAgICAgbGV0IHNo b3dUb29sVGlwID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTaG93IHRoZSBuYXZpZ2F0aW9uIHNp ZGViYXIgKCVzKSIpLmZvcm1hdChXZWJJbnNwZWN0b3IubmF2aWdhdGlvblNpZGViYXJLZXlib2Fy ZFNob3J0Y3V0LmRpc3BsYXlOYW1lKTsKICAgICAgICAgICAgIGxldCBoaWRlVG9vbFRpcCA9IFdl Ykluc3BlY3Rvci5VSVN0cmluZygiSGlkZSB0aGUgbmF2aWdhdGlvbiBzaWRlYmFyICglcykiKS5m b3JtYXQoV2ViSW5zcGVjdG9yLm5hdmlnYXRpb25TaWRlYmFyS2V5Ym9hcmRTaG9ydGN1dC5kaXNw bGF5TmFtZSk7CiAgICAgICAgICAgICBsZXQgaW1hZ2UgPSBXZWJJbnNwZWN0b3IucmVzb2x2ZWRM YXlvdXREaXJlY3Rpb24oKSA9PSBXZWJJbnNwZWN0b3IuTGF5b3V0RGlyZWN0aW9uLlJUTCA/ICJJ bWFnZXMvVG9nZ2xlUmlnaHRTaWRlYmFyLnN2ZyIgOiAiSW1hZ2VzL1RvZ2dsZUxlZnRTaWRlYmFy LnN2ZyI7CkBAIC02MSw4ICs2MCw2IEBAIFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3NlclRhYkNv bnRlbnRWaWV3ID0gY2xhc3MgQ29udGVudEJyb3dzZXJUYWJDb250ZW50VmlldyBlCiAgICAgICAg ICAgICB0aGlzLl9jb250ZW50QnJvd3Nlci5uYXZpZ2F0aW9uQmFyLmluc2VydE5hdmlnYXRpb25J dGVtKHRoaXMuX3Nob3dOYXZpZ2F0aW9uU2lkZWJhckl0ZW0sIDApOwogICAgICAgICAgICAgdGhp cy5fY29udGVudEJyb3dzZXIubmF2aWdhdGlvbkJhci5pbnNlcnROYXZpZ2F0aW9uSXRlbShuZXcg V2ViSW5zcGVjdG9yLkRpdmlkZXJOYXZpZ2F0aW9uSXRlbSwgMSk7CiAKLSAgICAgICAgICAgIG5h dmlnYXRpb25TaWRlYmFyUGFuZWwuY29udGVudEJyb3dzZXIgPSB0aGlzLl9jb250ZW50QnJvd3Nl cjsKLQogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLm5hdmlnYXRpb25TaWRlYmFyLmFkZEV2ZW50 TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNpZGViYXIuRXZlbnQuQ29sbGFwc2VkU3RhdGVEaWRDaGFu Z2UsIHRoaXMuX25hdmlnYXRpb25TaWRlYmFyQ29sbGFwc2VkU3RhdGVEaWRDaGFuZ2UsIHRoaXMp OwogICAgICAgICB9CiAKQEAgLTk5LDggKzk2LDEzIEBAIFdlYkluc3BlY3Rvci5Db250ZW50QnJv d3NlclRhYkNvbnRlbnRWaWV3ID0gY2xhc3MgQ29udGVudEJyb3dzZXJUYWJDb250ZW50VmlldyBl CiAKICAgICAgICAgdGhpcy5fY29udGVudEJyb3dzZXIuc2hvd24oKTsKIAotICAgICAgICBpZiAo dGhpcy5uYXZpZ2F0aW9uU2lkZWJhclBhbmVsICYmICF0aGlzLl9jb250ZW50QnJvd3Nlci5jdXJy ZW50Q29udGVudFZpZXcpCi0gICAgICAgICAgICB0aGlzLm5hdmlnYXRpb25TaWRlYmFyUGFuZWwu c2hvd0RlZmF1bHRDb250ZW50VmlldygpOworICAgICAgICBpZiAodGhpcy5uYXZpZ2F0aW9uU2lk ZWJhclBhbmVsKSB7CisgICAgICAgICAgICBpZiAoIXRoaXMubmF2aWdhdGlvblNpZGViYXJQYW5l bC5jb250ZW50QnJvd3NlcikKKyAgICAgICAgICAgICAgICB0aGlzLm5hdmlnYXRpb25TaWRlYmFy UGFuZWwuY29udGVudEJyb3dzZXIgPSB0aGlzLl9jb250ZW50QnJvd3NlcjsKKworICAgICAgICAg ICAgaWYgKCF0aGlzLl9jb250ZW50QnJvd3Nlci5jdXJyZW50Q29udGVudFZpZXcpCisgICAgICAg ICAgICAgICAgdGhpcy5uYXZpZ2F0aW9uU2lkZWJhclBhbmVsLnNob3dEZWZhdWx0Q29udGVudFZp ZXcoKTsKKyAgICAgICAgfQogICAgIH0KIAogICAgIGhpZGRlbigpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFiQ29udGVudFZp ZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3Jr VGFiQ29udGVudFZpZXcuanMKaW5kZXggOTU4MDkwYTJjN2IuLjk1NmRhNTk0MjQxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFi Q29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvTmV0d29ya1RhYkNvbnRlbnRWaWV3LmpzCkBAIC01OSw3ICs1OSw3IEBAIFdlYkluc3Bl Y3Rvci5OZXR3b3JrVGFiQ29udGVudFZpZXcgPSBjbGFzcyBOZXR3b3JrVGFiQ29udGVudFZpZXcg ZXh0ZW5kcyBXZWJJbnNwCiAgICAgICAgIGlmICghKHJlcHJlc2VudGVkT2JqZWN0IGluc3RhbmNl b2YgV2ViSW5zcGVjdG9yLlJlc291cmNlKSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAot ICAgICAgICByZXR1cm4gISF0aGlzLl9uYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmNvbnRlbnRUcmVl T3V0bGluZS5nZXRDYWNoZWRUcmVlRWxlbWVudChyZXByZXNlbnRlZE9iamVjdCk7CisgICAgICAg IHJldHVybiAhIXRoaXMubmF2aWdhdGlvblNpZGViYXJQYW5lbC5jb250ZW50VHJlZU91dGxpbmUu Z2V0Q2FjaGVkVHJlZUVsZW1lbnQocmVwcmVzZW50ZWRPYmplY3QpOwogICAgIH0KIAogICAgIGdl dCBzdXBwb3J0c1NwbGl0Q29udGVudEJyb3dzZXIoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VTaWRlYmFyUGFuZWwuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVNpZGViYXJQ YW5lbC5qcwppbmRleCBlZjIxZTE1ODJlOS4uNGVjZDhlM2E0YTQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlU2lkZWJhclBhbmVs LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291 cmNlU2lkZWJhclBhbmVsLmpzCkBAIC03Niw5ICs3Niw2IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJj ZVNpZGViYXJQYW5lbCA9IGNsYXNzIFJlc291cmNlU2lkZWJhclBhbmVsIGV4dGVuZHMgV2ViSW5z cGVjCiAgICAgICAgICAgICB0aGlzLmNvbnRlbnRUcmVlT3V0bGluZS5kaXNjbG9zdXJlQnV0dG9u cyA9IGZhbHNlOwogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGUuYWRkRXZlbnRM aXN0ZW5lcihXZWJJbnNwZWN0b3IuU291cmNlQ29kZS5FdmVudC5Tb3VyY2VNYXBBZGRlZCwgKCkg PT4geyB0aGlzLmNvbnRlbnRUcmVlT3V0bGluZS5kaXNjbG9zdXJlQnV0dG9ucyA9IHRydWU7IH0s IHRoaXMpOwogICAgICAgICB9Ci0KLSAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5mcmFtZVJlc291 cmNlTWFuYWdlci5tYWluRnJhbWUpCi0gICAgICAgICAgICB0aGlzLl9tYWluRnJhbWVNYWluUmVz b3VyY2VEaWRDaGFuZ2UoV2ViSW5zcGVjdG9yLmZyYW1lUmVzb3VyY2VNYW5hZ2VyLm1haW5GcmFt ZSk7CiAgICAgfQogCiAgICAgLy8gUHVibGljCkBAIC0xOTIsNiArMTg5LDE0IEBAIFdlYkluc3Bl Y3Rvci5SZXNvdXJjZVNpZGViYXJQYW5lbCA9IGNsYXNzIFJlc291cmNlU2lkZWJhclBhbmVsIGV4 dGVuZHMgV2ViSW5zcGVjCiAKICAgICAvLyBQcm90ZWN0ZWQKIAorICAgIGluaXRpYWxMYXlvdXQo KQorICAgIHsKKyAgICAgICAgc3VwZXIuaW5pdGlhbExheW91dCgpOworCisgICAgICAgIGlmIChX ZWJJbnNwZWN0b3IuZnJhbWVSZXNvdXJjZU1hbmFnZXIubWFpbkZyYW1lKQorICAgICAgICAgICAg dGhpcy5fbWFpbkZyYW1lTWFpblJlc291cmNlRGlkQ2hhbmdlKFdlYkluc3BlY3Rvci5mcmFtZVJl c291cmNlTWFuYWdlci5tYWluRnJhbWUpOworICAgIH0KKwogICAgIGhhc0N1c3RvbUZpbHRlcnMo KQogICAgIHsKICAgICAgICAgY29uc29sZS5hc3NlcnQodGhpcy5fc2NvcGVCYXIuc2VsZWN0ZWRJ dGVtcy5sZW5ndGggPT09IDEpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvU2VhcmNoVGFiQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZWFyY2hUYWJDb250ZW50Vmlldy5qcwppbmRl eCBiMmVlZTIzNmNiYy4uY2Q3ZDZkNGQzNTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NlYXJjaFRhYkNvbnRlbnRWaWV3LmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NlYXJjaFRhYkNvbnRlbnRW aWV3LmpzCkBAIC03Myw3ICs3Myw3IEBAIFdlYkluc3BlY3Rvci5TZWFyY2hUYWJDb250ZW50Vmll dyA9IGNsYXNzIFNlYXJjaFRhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV2ViSW5zcGVjCiAgICAgICAg IGlmICghKHJlcHJlc2VudGVkT2JqZWN0IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlJlc291cmNl KSAmJiAhKHJlcHJlc2VudGVkT2JqZWN0IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlNjcmlwdCkg JiYgIShyZXByZXNlbnRlZE9iamVjdCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5ET01UcmVlKSkK ICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgICAgICByZXR1cm4gISF0aGlzLl9uYXZp Z2F0aW9uU2lkZWJhclBhbmVsLmNvbnRlbnRUcmVlT3V0bGluZS5nZXRDYWNoZWRUcmVlRWxlbWVu dChyZXByZXNlbnRlZE9iamVjdCk7CisgICAgICAgIHJldHVybiAhIXRoaXMubmF2aWdhdGlvblNp ZGViYXJQYW5lbC5jb250ZW50VHJlZU91dGxpbmUuZ2V0Q2FjaGVkVHJlZUVsZW1lbnQocmVwcmVz ZW50ZWRPYmplY3QpOwogICAgIH0KIAogICAgIGZvY3VzU2VhcmNoRmllbGQoKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFiQ29udGVudFZp ZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UYWJDb250 ZW50Vmlldy5qcwppbmRleCAxNjg2NmNiNjVkZC4uNjM2YjI4Mzk2YmIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RhYkNvbnRlbnRWaWV3Lmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RhYkNvbnRl bnRWaWV3LmpzCkBAIC0yNSwxMiArMjUsMTIgQEAKIAogV2ViSW5zcGVjdG9yLlRhYkNvbnRlbnRW aWV3ID0gY2xhc3MgVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuQ29udGVudFZp ZXcKIHsKLSAgICBjb25zdHJ1Y3RvcihpZGVudGlmaWVyLCBzdHlsZUNsYXNzTmFtZXMsIHRhYkJh ckl0ZW0sIG5hdmlnYXRpb25TaWRlYmFyUGFuZWwsIGRldGFpbHNTaWRlYmFyUGFuZWxDb25zdHJ1 Y3RvcnMpCisgICAgY29uc3RydWN0b3IoaWRlbnRpZmllciwgc3R5bGVDbGFzc05hbWVzLCB0YWJC YXJJdGVtLCBuYXZpZ2F0aW9uU2lkZWJhclBhbmVsQ29uc3RydWN0b3IsIGRldGFpbHNTaWRlYmFy UGFuZWxDb25zdHJ1Y3RvcnMpCiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2VydCh0eXBlb2Yg aWRlbnRpZmllciA9PT0gInN0cmluZyIpOwogICAgICAgICBjb25zb2xlLmFzc2VydCh0eXBlb2Yg c3R5bGVDbGFzc05hbWVzID09PSAic3RyaW5nIiB8fCBzdHlsZUNsYXNzTmFtZXMuZXZlcnkoKGNs YXNzTmFtZSkgPT4gdHlwZW9mIGNsYXNzTmFtZSA9PT0gInN0cmluZyIpKTsKICAgICAgICAgY29u c29sZS5hc3NlcnQodGFiQmFySXRlbSBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5UYWJCYXJJdGVt KTsKLSAgICAgICAgY29uc29sZS5hc3NlcnQoIW5hdmlnYXRpb25TaWRlYmFyUGFuZWwgfHwgbmF2 aWdhdGlvblNpZGViYXJQYW5lbCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lk ZWJhclBhbmVsKTsKKyAgICAgICAgY29uc29sZS5hc3NlcnQoIW5hdmlnYXRpb25TaWRlYmFyUGFu ZWxDb25zdHJ1Y3RvciB8fCB0eXBlb2YgbmF2aWdhdGlvblNpZGViYXJQYW5lbENvbnN0cnVjdG9y ID09PSAiZnVuY3Rpb24iKTsKICAgICAgICAgY29uc29sZS5hc3NlcnQoIWRldGFpbHNTaWRlYmFy UGFuZWxDb25zdHJ1Y3RvcnMgfHwgZGV0YWlsc1NpZGViYXJQYW5lbENvbnN0cnVjdG9ycy5ldmVy eSgoZGV0YWlsc1NpZGViYXJQYW5lbENvbnN0cnVjdG9yKSA9PiB0eXBlb2YgZGV0YWlsc1NpZGVi YXJQYW5lbENvbnN0cnVjdG9yID09PSAiZnVuY3Rpb24iKSk7CiAKICAgICAgICAgc3VwZXIobnVs bCk7CkBAIC00NCw3ICs0NCw3IEBAIFdlYkluc3BlY3Rvci5UYWJDb250ZW50VmlldyA9IGNsYXNz IFRhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV2ViSW5zcGVjdG9yLkNvbnRlbnRWCiAKICAgICAgICAg dGhpcy5faWRlbnRpZmllciA9IGlkZW50aWZpZXI7CiAgICAgICAgIHRoaXMuX3RhYkJhckl0ZW0g PSB0YWJCYXJJdGVtOwotICAgICAgICB0aGlzLl9uYXZpZ2F0aW9uU2lkZWJhclBhbmVsID0gbmF2 aWdhdGlvblNpZGViYXJQYW5lbCB8fCBudWxsOworICAgICAgICB0aGlzLl9uYXZpZ2F0aW9uU2lk ZWJhclBhbmVsQ29uc3RydWN0b3IgPSBuYXZpZ2F0aW9uU2lkZWJhclBhbmVsQ29uc3RydWN0b3Ig fHwgbnVsbDsKICAgICAgICAgdGhpcy5fZGV0YWlsc1NpZGViYXJQYW5lbENvbnN0cnVjdG9ycyA9 IGRldGFpbHNTaWRlYmFyUGFuZWxDb25zdHJ1Y3RvcnMgfHwgW107CiAKICAgICAgICAgY29uc3Qg ZGVmYXVsdFNpZGViYXJXaWR0aCA9IDMwMDsKQEAgLTE3Myw3ICsxNzMsMTMgQEAgV2ViSW5zcGVj dG9yLlRhYkNvbnRlbnRWaWV3ID0gY2xhc3MgVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJbnNw ZWN0b3IuQ29udGVudFYKICAgICAgICAgdGhpcy5fY29va2llU2V0dGluZy52YWx1ZSA9IGNvb2tp ZTsKICAgICB9CiAKLSAgICBnZXQgbmF2aWdhdGlvblNpZGViYXJQYW5lbCgpIHsgcmV0dXJuIHRo aXMuX25hdmlnYXRpb25TaWRlYmFyUGFuZWw7IH0KKyAgICBnZXQgbmF2aWdhdGlvblNpZGViYXJQ YW5lbCgpCisgICAgeworICAgICAgICBpZiAoIXRoaXMuX25hdmlnYXRpb25TaWRlYmFyUGFuZWxD b25zdHJ1Y3RvcikKKyAgICAgICAgICAgIHJldHVybiBudWxsOworICAgICAgICByZXR1cm4gV2Vi SW5zcGVjdG9yLmluc3RhbmNlRm9yQ2xhc3ModGhpcy5fbmF2aWdhdGlvblNpZGViYXJQYW5lbENv bnN0cnVjdG9yKTsKKyAgICB9CisKICAgICBnZXQgbmF2aWdhdGlvblNpZGViYXJDb2xsYXBzZWRT ZXR0aW5nKCkgeyByZXR1cm4gdGhpcy5fbmF2aWdhdGlvblNpZGViYXJDb2xsYXBzZWRTZXR0aW5n OyB9CiAgICAgZ2V0IG5hdmlnYXRpb25TaWRlYmFyV2lkdGhTZXR0aW5nKCkgeyByZXR1cm4gdGhp cy5fbmF2aWdhdGlvblNpZGViYXJXaWR0aFNldHRpbmc7IH0KIApAQCAtMTg0LDYgKzE5MCw3IEBA IFdlYkluc3BlY3Rvci5UYWJDb250ZW50VmlldyA9IGNsYXNzIFRhYkNvbnRlbnRWaWV3IGV4dGVu ZHMgV2ViSW5zcGVjdG9yLkNvbnRlbnRWCiAKICAgICAgICAgcmV0dXJuIHRoaXMuX2RldGFpbHNT aWRlYmFyUGFuZWxzOwogICAgIH0KKwogICAgIGdldCBkZXRhaWxzU2lkZWJhckNvbGxhcHNlZFNl dHRpbmcoKSB7IHJldHVybiB0aGlzLl9kZXRhaWxzU2lkZWJhckNvbGxhcHNlZFNldHRpbmc7IH0K ICAgICBnZXQgZGV0YWlsc1NpZGViYXJTZWxlY3RlZFBhbmVsU2V0dGluZygpIHsgcmV0dXJuIHRo aXMuX2RldGFpbHNTaWRlYmFyU2VsZWN0ZWRQYW5lbFNldHRpbmc7IH0KICAgICBnZXQgZGV0YWls c1NpZGViYXJXaWR0aFNldHRpbmcoKSB7IHJldHVybiB0aGlzLl9kZXRhaWxzU2lkZWJhcldpZHRo U2V0dGluZzsgfQo=