144068 2015-04-22 12:50:42 -0700 Web Inspector: Make debugger keyboard shortcuts global 2015-09-14 10:53:52 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 timothy timothy adam.g.helm graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1087540 0 timothy 2015-04-22 12:50:42 -0700 Move them out of DebuggerSidebarPanel. 1087541 1 251358 timothy 2015-04-22 12:54:16 -0700 Created attachment 251358 Patch 1087553 2 251358 joepeck 2015-04-22 13:15:01 -0700 Comment on attachment 251358 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=251358&action=review > Source/WebInspectorUI/ChangeLog:6 > + We wont always have a DebuggerSidebarPanel to listen for the shortcuts. Typo: "wont" => "won't". Would DebuggerManager be a better place instead of WebInspector / Main.js? The manager will always exist, these are wrapping DebuggerAgent APIs, and DebuggerManager is also sending the "Pause" / "Resume" events. 1087564 3 251358 timothy 2015-04-22 13:38:02 -0700 Comment on attachment 251358 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=251358&action=review >> Source/WebInspectorUI/ChangeLog:6 >> + We wont always have a DebuggerSidebarPanel to listen for the shortcuts. > > Typo: "wont" => "won't". > > Would DebuggerManager be a better place instead of WebInspector / Main.js? > > The manager will always exist, these are wrapping DebuggerAgent APIs, and DebuggerManager is also sending the "Pause" / "Resume" events. Managers should not have UI (keyboard shortcuts). I don't think they will be in Test.html for example. 1087570 4 joepeck 2015-04-22 13:44:28 -0700 > Managers should not have UI (keyboard shortcuts). I don't think they will be > in Test.html for example. Excellent point. 1088647 5 timothy 2015-04-25 18:36:16 -0700 r183322 – r183342 http://trac.webkit.org/log/?revs=183322-183342 1125626 6 251358 ossy 2015-09-14 10:53:52 -0700 Comment on attachment 251358 Patch Cleared review? from attachment 251358 so that this bug does not appear in http://webkit.org/pending-review. If you would like this patch reviewed, please attach it to a new bug (or re-open this bug before marking it for review again). 251358 2015-04-22 12:54:16 -0700 2015-09-14 10:53:52 -0700 Patch bug-144068-20150422125312.patch text/plain 18100 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyNzk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA0 ZDc5NjY3ODUxMzFhZjc0YWUxMGI1OGJmOTQ5MDZjMDM3OWY3MTkzLi5mZjAzZDQ1ZDljZGI1OTk3 N2Q5NjNjOWU4NGU4NzdjMmI4NWJlOGQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwyNyBAQAogMjAxNS0wNC0yMiAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTWFrZSBkZWJ1Z2dlciBrZXlib2FyZCBzaG9y dGN1dHMgZ2xvYmFsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNDQwNjgKKworICAgICAgICBXZSB3b250IGFsd2F5cyBoYXZlIGEgRGVidWdnZXJTaWRl YmFyUGFuZWwgdG8gbGlzdGVuIGZvciB0aGUgc2hvcnRjdXRzLgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL01haW4u anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuY29udGVudExvYWRlZCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3Iuc2hvd1NvdXJjZUNvZGVGb3JGcmFtZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu c2hvd1NvdXJjZUNvZGUpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRGVi dWdnZXJNYW5hZ2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTWFuYWdlci5w cm90b3R5cGUucGF1c2UpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRGVidWdnZXJT aWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJTaWRlYmFyUGFu ZWwucHJvdG90eXBlLnJlc3RvcmVTdGF0ZUZyb21Db29raWUpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkRlYnVnZ2VyU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fZGVidWdnZXJEaWRSZXN1bWUpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyU2lkZWJhclBhbmVsLnByb3RvdHlwZS5faGFu ZGxlSXNzdWVBZGRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJTaWRlYmFyUGFu ZWwucHJvdG90eXBlLl9oYW5kbGVJc3N1ZXNDbGVhcmVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5EZWJ1Z2dlclNpZGViYXJQYW5lbCk6CisKKzIwMTUtMDQtMjIgIFRpbW90aHkgSGF0Y2hlciAg PHRpbW90aHlAYXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJlbW92ZSBSZWxv YWQgYW5kIERvd25sb2FkIFdlYiBBcmNoaXZlIGJ1dHRvbnMgZnJvbSBGcmFtZVRyZWVFbGVtZW50 CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDQwNjQK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9N YWluLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpz CmluZGV4IGE5ZGY4MDZkMjZmMmE4NzZhNjE0YTk0MmNkMWFmMDQ5OTU4NDcwYTguLmUwMjViOTc3 MzdjNTY5NGJjZDI4YjZhMDEyZTA3YTBiZmVkMDc2MjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKQEAgLTI1MSw2ICsyNTEsMTcgQEAg V2ViSW5zcGVjdG9yLmNvbnRlbnRMb2FkZWQgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5fcmVkb0tl eWJvYXJkU2hvcnRjdXQgPSBuZXcgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQoV2ViSW5z cGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuQ29tbWFuZE9yQ29udHJvbCB8IFdlYklu c3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVyLlNoaWZ0LCAiWiIsIHRoaXMuX3JlZG9L ZXlib2FyZFNob3J0Y3V0LmJpbmQodGhpcykpOwogICAgIHRoaXMuX3VuZG9LZXlib2FyZFNob3J0 Y3V0LmltcGxpY2l0bHlQcmV2ZW50c0RlZmF1bHQgPSB0aGlzLl9yZWRvS2V5Ym9hcmRTaG9ydGN1 dC5pbXBsaWNpdGx5UHJldmVudHNEZWZhdWx0ID0gZmFsc2U7CiAKKyAgICB0aGlzLnRvZ2dsZUJy ZWFrcG9pbnRzS2V5Ym9hcmRTaG9ydGN1dCA9IG5ldyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9y dGN1dChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db21tYW5kT3JDb250 cm9sLCAiWSIsIHRoaXMuZGVidWdnZXJUb2dnbGVCcmVha3BvaW50cy5iaW5kKHRoaXMpKTsKKyAg ICB0aGlzLnBhdXNlT3JSZXN1bWVLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdlYkluc3BlY3Rvci5L ZXlib2FyZFNob3J0Y3V0KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVyLkNv bnRyb2wgfCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db21tYW5kT3JD b250cm9sLCAiWSIsIHRoaXMuZGVidWdnZXJQYXVzZVJlc3VtZVRvZ2dsZS5iaW5kKHRoaXMpKTsK KyAgICB0aGlzLnN0ZXBPdmVyS2V5Ym9hcmRTaG9ydGN1dCA9IG5ldyBXZWJJbnNwZWN0b3IuS2V5 Ym9hcmRTaG9ydGN1dChudWxsLCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXkuRjYs IHRoaXMuZGVidWdnZXJTdGVwT3Zlci5iaW5kKHRoaXMpKTsKKyAgICB0aGlzLnN0ZXBJbnRvS2V5 Ym9hcmRTaG9ydGN1dCA9IG5ldyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dChudWxsLCBX ZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXkuRjcsIHRoaXMuZGVidWdnZXJTdGVwSW50 by5iaW5kKHRoaXMpKTsKKyAgICB0aGlzLnN0ZXBPdXRLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdl Ykluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KG51bGwsIFdlYkluc3BlY3Rvci5LZXlib2FyZFNo b3J0Y3V0LktleS5GOCwgdGhpcy5kZWJ1Z2dlclN0ZXBPdXQuYmluZCh0aGlzKSk7CisKKyAgICB0 aGlzLnBhdXNlT3JSZXN1bWVBbHRlcm5hdGVLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdlYkluc3Bl Y3Rvci5LZXlib2FyZFNob3J0Y3V0KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlm aWVyLkNvbW1hbmRPckNvbnRyb2wsIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleS5C YWNrc2xhc2gsIHRoaXMuZGVidWdnZXJQYXVzZVJlc3VtZVRvZ2dsZS5iaW5kKHRoaXMpKTsKKyAg ICB0aGlzLnN0ZXBPdmVyQWx0ZXJuYXRlS2V5Ym9hcmRTaG9ydGN1dCA9IG5ldyBXZWJJbnNwZWN0 b3IuS2V5Ym9hcmRTaG9ydGN1dChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmll ci5Db21tYW5kT3JDb250cm9sLCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXkuU2lu Z2xlUXVvdGUsIHRoaXMuZGVidWdnZXJTdGVwT3Zlci5iaW5kKHRoaXMpKTsKKyAgICB0aGlzLnN0 ZXBJbnRvQWx0ZXJuYXRlS2V5Ym9hcmRTaG9ydGN1dCA9IG5ldyBXZWJJbnNwZWN0b3IuS2V5Ym9h cmRTaG9ydGN1dChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db21tYW5k T3JDb250cm9sLCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXkuU2VtaWNvbG9uLCB0 aGlzLmRlYnVnZ2VyU3RlcEludG8uYmluZCh0aGlzKSk7CisgICAgdGhpcy5zdGVwT3V0QWx0ZXJu YXRlS2V5Ym9hcmRTaG9ydGN1dCA9IG5ldyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dChX ZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5TaGlmdCB8IFdlYkluc3BlY3Rv ci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVyLkNvbW1hbmRPckNvbnRyb2wsIFdlYkluc3BlY3Rv ci5LZXlib2FyZFNob3J0Y3V0LktleS5TZW1pY29sb24sIHRoaXMuZGVidWdnZXJTdGVwT3V0LmJp bmQodGhpcykpOworCiAgICAgdGhpcy51bmRvY2tCdXR0b25OYXZpZ2F0aW9uSXRlbSA9IG5ldyBX ZWJJbnNwZWN0b3IuVG9nZ2xlQ29udHJvbFRvb2xiYXJJdGVtKCJ1bmRvY2siLCBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIkRldGFjaCBpbnRvIHNlcGFyYXRlIHdpbmRvdyIpLCAiIiwgcGxhdGZvcm1J bWFnZVBhdGgoIlVuZG9jay5zdmciKSwgIiIsIDE2LCAxNCk7CiAgICAgdGhpcy51bmRvY2tCdXR0 b25OYXZpZ2F0aW9uSXRlbS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5CdXR0b25OYXZp Z2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCB0aGlzLl91bmRvY2ssIHRoaXMpOwogCkBAIC03MjEs NiArNzMyLDM0IEBAIFdlYkluc3BlY3Rvci50b2dnbGVEZXRhaWxzU2lkZWJhciA9IGZ1bmN0aW9u KGV2ZW50KQogICAgIHRoaXMuZGV0YWlsc1NpZGViYXIuY29sbGFwc2VkID0gZmFsc2U7CiB9Owog CitXZWJJbnNwZWN0b3IuZGVidWdnZXJUb2dnbGVCcmVha3BvaW50cyA9IGZ1bmN0aW9uKGV2ZW50 KQoreworICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1hbmFnZXIuYnJlYWtwb2ludHNFbmFibGVk ID0gIVdlYkluc3BlY3Rvci5kZWJ1Z2dlck1hbmFnZXIuYnJlYWtwb2ludHNFbmFibGVkOworfTsK KworV2ViSW5zcGVjdG9yLmRlYnVnZ2VyUGF1c2VSZXN1bWVUb2dnbGUgPSBmdW5jdGlvbihldmVu dCkKK3sKKyAgICBpZiAoV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTWFuYWdlci5wYXVzZWQpCisgICAg ICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1hbmFnZXIucmVzdW1lKCk7CisgICAgZWxzZQorICAg ICAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJNYW5hZ2VyLnBhdXNlKCk7Cit9OworCitXZWJJbnNw ZWN0b3IuZGVidWdnZXJTdGVwT3ZlciA9IGZ1bmN0aW9uKGV2ZW50KQoreworICAgIFdlYkluc3Bl Y3Rvci5kZWJ1Z2dlck1hbmFnZXIuc3RlcE92ZXIoKTsKK307CisKK1dlYkluc3BlY3Rvci5kZWJ1 Z2dlclN0ZXBJbnRvID0gZnVuY3Rpb24oZXZlbnQpCit7CisgICAgV2ViSW5zcGVjdG9yLmRlYnVn Z2VyTWFuYWdlci5zdGVwSW50bygpOworfTsKKworV2ViSW5zcGVjdG9yLmRlYnVnZ2VyU3RlcE91 dCA9IGZ1bmN0aW9uKGV2ZW50KQoreworICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1hbmFnZXIu c3RlcE91dCgpOworfTsKKwogV2ViSW5zcGVjdG9yLl9mb2N1c0NoYW5nZWQgPSBmdW5jdGlvbihl dmVudCkKIHsKICAgICAvLyBNYWtlIGEgY2FyZXQgc2VsZWN0aW9uIGluc2lkZSB0aGUgZm9jdXNl ZCBlbGVtZW50IGlmIHRoZXJlIGlzbid0IGEgcmFuZ2Ugc2VsZWN0aW9uIGFuZCB0aGVyZSBpc24n dCBhbHJlYWR5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Db250cm9sbGVycy9EZWJ1Z2dlck1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Db250cm9sbGVycy9EZWJ1Z2dlck1hbmFnZXIuanMKaW5kZXggMDg4M2Ez OGUxMzAyNmI4NWUyYTE0YTEwZDQwNDkwMzY5ZDgzODc1Ni4uNThlYzk2YWM3YzE3MGY4OGEzZDU0 YzkyZWE0MzI2Nzg4NjhjZmQzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRGVidWdnZXJNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RlYnVnZ2VyTWFuYWdlci5q cwpAQCAtMTQ1LDYgKzE0NSw4IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1hbmFnZXIgPSBjbGFz cyBEZWJ1Z2dlck1hbmFnZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAgICAgIGlm ICh0aGlzLl9wYXVzZWQpCiAgICAgICAgICAgICByZXR1cm4gUHJvbWlzZS5yZXNvbHZlKCk7CiAK KyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRlYnVn Z2VyTWFuYWdlci5FdmVudC5XYWl0aW5nVG9QYXVzZSk7CisKICAgICAgICAgdmFyIGxpc3RlbmVy ID0gbmV3IFdlYkluc3BlY3Rvci5FdmVudExpc3RlbmVyKHRoaXMsIHRydWUpOwogCiAgICAgICAg IHZhciBtYW5hZ2VyUmVzdWx0ID0gbmV3IFByb21pc2UoZnVuY3Rpb24ocmVzb2x2ZSwgcmVqZWN0 KSB7CkBAIC04NjEsNiArODYzLDcgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTWFuYWdlci5FdmVu dCA9IHsKICAgICBCcmVha3BvaW50QWRkZWQ6ICJkZWJ1Z2dlci1tYW5hZ2VyLWJyZWFrcG9pbnQt YWRkZWQiLAogICAgIEJyZWFrcG9pbnRSZW1vdmVkOiAiZGVidWdnZXItbWFuYWdlci1icmVha3Bv aW50LXJlbW92ZWQiLAogICAgIEJyZWFrcG9pbnRNb3ZlZDogImRlYnVnZ2VyLW1hbmFnZXItYnJl YWtwb2ludC1tb3ZlZCIsCisgICAgV2FpdGluZ1RvUGF1c2U6ICJkZWJ1Z2dlci1tYW5hZ2VyLXdh aXRpbmctdG8tcGF1c2UiLAogICAgIFBhdXNlZDogImRlYnVnZ2VyLW1hbmFnZXItcGF1c2VkIiwK ICAgICBSZXN1bWVkOiAiZGVidWdnZXItbWFuYWdlci1yZXN1bWVkIiwKICAgICBDYWxsRnJhbWVz RGlkQ2hhbmdlOiAiZGVidWdnZXItbWFuYWdlci1jYWxsLWZyYW1lcy1kaWQtY2hhbmdlIiwKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RlYnVn Z2VyU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvRGVidWdnZXJTaWRlYmFyUGFuZWwuanMKaW5kZXggYjlmZjZiZjQyNjc4YWVlODU1ODMz OWQwNGQ0YTA5MjQ5OWM5NzlhZi4uYzliMjFhZDQ5MjY1NDU4MWYyNTk1OWU3MGIxNGIyYzUzZWMy YWNmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvRGVidWdnZXJTaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvRGVidWdnZXJTaWRlYmFyUGFuZWwuanMKQEAgLTQxLDE3ICs0MSw3 IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclNpZGViYXJQYW5lbCA9IGNsYXNzIERlYnVnZ2VyU2lk ZWJhclBhbmVsIGV4dGVuZHMgV2ViSW5zcGVjCiAgICAgICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dl ck1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGVidWdnZXJNYW5hZ2VyLkV2 ZW50LlBhdXNlZCwgdGhpcy5fZGVidWdnZXJEaWRQYXVzZSwgdGhpcyk7CiAgICAgICAgIFdlYklu c3BlY3Rvci5kZWJ1Z2dlck1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGVi dWdnZXJNYW5hZ2VyLkV2ZW50LlJlc3VtZWQsIHRoaXMuX2RlYnVnZ2VyRGlkUmVzdW1lLCB0aGlz KTsKICAgICAgICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTWFuYWdlci5hZGRFdmVudExpc3RlbmVy KFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1hbmFnZXIuRXZlbnQuQWN0aXZlQ2FsbEZyYW1lRGlkQ2hh bmdlLCB0aGlzLl9kZWJ1Z2dlckFjdGl2ZUNhbGxGcmFtZURpZENoYW5nZSwgdGhpcyk7Ci0KLSAg ICAgICAgdGhpcy5fdG9nZ2xlQnJlYWtwb2ludHNLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdlYklu c3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1v ZGlmaWVyLkNvbW1hbmRPckNvbnRyb2wsICJZIiwgdGhpcy5fYnJlYWtwb2ludHNUb2dnbGVCdXR0 b25DbGlja2VkLmJpbmQodGhpcykpOwotICAgICAgICB0aGlzLnBhdXNlT3JSZXN1bWVLZXlib2Fy ZFNob3J0Y3V0ID0gbmV3IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KFdlYkluc3BlY3Rv ci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVyLkNvbnRyb2wgfCBXZWJJbnNwZWN0b3IuS2V5Ym9h cmRTaG9ydGN1dC5Nb2RpZmllci5Db21tYW5kT3JDb250cm9sLCAiWSIsIHRoaXMuX2RlYnVnZ2Vy UGF1c2VSZXN1bWVCdXR0b25DbGlja2VkLmJpbmQodGhpcykpOwotICAgICAgICB0aGlzLl9zdGVw T3ZlcktleWJvYXJkU2hvcnRjdXQgPSBuZXcgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQo bnVsbCwgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5LkY2LCB0aGlzLl9kZWJ1Z2dl clN0ZXBPdmVyQnV0dG9uQ2xpY2tlZC5iaW5kKHRoaXMpKTsKLSAgICAgICAgdGhpcy5fc3RlcElu dG9LZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KG51 bGwsIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleS5GNywgdGhpcy5fZGVidWdnZXJT dGVwSW50b0J1dHRvbkNsaWNrZWQuYmluZCh0aGlzKSk7Ci0gICAgICAgIHRoaXMuX3N0ZXBPdXRL ZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KG51bGws IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleS5GOCwgdGhpcy5fZGVidWdnZXJTdGVw T3V0QnV0dG9uQ2xpY2tlZC5iaW5kKHRoaXMpKTsKLQotICAgICAgICB0aGlzLnBhdXNlT3JSZXN1 bWVBbHRlcm5hdGVLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdlYkluc3BlY3Rvci5LZXlib2FyZFNo b3J0Y3V0KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVyLkNvbW1hbmRPckNv bnRyb2wsIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleS5CYWNrc2xhc2gsIHRoaXMu X2RlYnVnZ2VyUGF1c2VSZXN1bWVCdXR0b25DbGlja2VkLmJpbmQodGhpcykpOwotICAgICAgICB0 aGlzLl9zdGVwT3ZlckFsdGVybmF0ZUtleWJvYXJkU2hvcnRjdXQgPSBuZXcgV2ViSW5zcGVjdG9y LktleWJvYXJkU2hvcnRjdXQoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIu Q29tbWFuZE9yQ29udHJvbCwgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5LlNpbmds ZVF1b3RlLCB0aGlzLl9kZWJ1Z2dlclN0ZXBPdmVyQnV0dG9uQ2xpY2tlZC5iaW5kKHRoaXMpKTsK LSAgICAgICAgdGhpcy5fc3RlcEludG9BbHRlcm5hdGVLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdl Ykluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0 Lk1vZGlmaWVyLkNvbW1hbmRPckNvbnRyb2wsIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0 LktleS5TZW1pY29sb24sIHRoaXMuX2RlYnVnZ2VyU3RlcEludG9CdXR0b25DbGlja2VkLmJpbmQo dGhpcykpOwotICAgICAgICB0aGlzLl9zdGVwT3V0QWx0ZXJuYXRlS2V5Ym9hcmRTaG9ydGN1dCA9 IG5ldyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRT aG9ydGN1dC5Nb2RpZmllci5TaGlmdCB8IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1v ZGlmaWVyLkNvbW1hbmRPckNvbnRyb2wsIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lktl eS5TZW1pY29sb24sIHRoaXMuX2RlYnVnZ2VyU3RlcE91dEJ1dHRvbkNsaWNrZWQuYmluZCh0aGlz KSk7CisgICAgICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5l cihXZWJJbnNwZWN0b3IuRGVidWdnZXJNYW5hZ2VyLkV2ZW50LldhaXRpbmdUb1BhdXNlLCB0aGlz Ll9kZWJ1Z2dlcldhaXRpbmdUb1BhdXNlLCB0aGlzKTsKIAogICAgICAgICB0aGlzLl9uYXZpZ2F0 aW9uQmFyID0gbmV3IFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uQmFyOwogICAgICAgICB0aGlzLmVs ZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fbmF2aWdhdGlvbkJhci5lbGVtZW50KTsKQEAgLTY1LDMz ICs1NSwzMyBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJTaWRlYmFyUGFuZWwgPSBjbGFzcyBEZWJ1 Z2dlclNpZGViYXJQYW5lbCBleHRlbmRzIFdlYkluc3BlYwogICAgICAgICB2YXIgc3RlcEludG9J bWFnZSA9IHtzcmM6IHBsYXRmb3JtSW1hZ2VQYXRoKCJTdGVwSW50by5zdmciKSwgd2lkdGg6IGlt YWdlU2l6ZSwgaGVpZ2h0OiBpbWFnZVNpemV9OwogICAgICAgICB2YXIgc3RlcE91dEltYWdlID0g e3NyYzogcGxhdGZvcm1JbWFnZVBhdGgoIlN0ZXBPdXQuc3ZnIiksIHdpZHRoOiBpbWFnZVNpemUs IGhlaWdodDogaW1hZ2VTaXplfTsKIAotICAgICAgICB2YXIgdG9vbFRpcCA9IFdlYkluc3BlY3Rv ci5VSVN0cmluZygiRW5hYmxlIGFsbCBicmVha3BvaW50cyAoJXMpIikuZm9ybWF0KHRoaXMuX3Rv Z2dsZUJyZWFrcG9pbnRzS2V5Ym9hcmRTaG9ydGN1dC5kaXNwbGF5TmFtZSk7Ci0gICAgICAgIHZh ciBhbHRUb29sVGlwID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJEaXNhYmxlIGFsbCBicmVha3Bv aW50cyAoJXMpIikuZm9ybWF0KHRoaXMuX3RvZ2dsZUJyZWFrcG9pbnRzS2V5Ym9hcmRTaG9ydGN1 dC5kaXNwbGF5TmFtZSk7CisgICAgICAgIHZhciB0b29sVGlwID0gV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJFbmFibGUgYWxsIGJyZWFrcG9pbnRzICglcykiKS5mb3JtYXQoV2ViSW5zcGVjdG9yLnRv Z2dsZUJyZWFrcG9pbnRzS2V5Ym9hcmRTaG9ydGN1dC5kaXNwbGF5TmFtZSk7CisgICAgICAgIHZh ciBhbHRUb29sVGlwID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJEaXNhYmxlIGFsbCBicmVha3Bv aW50cyAoJXMpIikuZm9ybWF0KFdlYkluc3BlY3Rvci50b2dnbGVCcmVha3BvaW50c0tleWJvYXJk U2hvcnRjdXQuZGlzcGxheU5hbWUpOwogCiAgICAgICAgIHRoaXMuX2RlYnVnZ2VyQnJlYWtwb2lu dHNCdXR0b25JdGVtID0gbmV3IFdlYkluc3BlY3Rvci5BY3RpdmF0ZUJ1dHRvbk5hdmlnYXRpb25J dGVtKCJkZWJ1Z2dlci1icmVha3BvaW50cyIsIHRvb2xUaXAsIGFsdFRvb2xUaXAsIGJyZWFrcG9p bnRzSW1hZ2Uuc3JjLCBicmVha3BvaW50c0ltYWdlLndpZHRoLCBicmVha3BvaW50c0ltYWdlLmhl aWdodCk7CiAgICAgICAgIHRoaXMuX2RlYnVnZ2VyQnJlYWtwb2ludHNCdXR0b25JdGVtLmFjdGl2 YXRlZCA9IFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1hbmFnZXIuYnJlYWtwb2ludHNFbmFibGVkOwot ICAgICAgICB0aGlzLl9kZWJ1Z2dlckJyZWFrcG9pbnRzQnV0dG9uSXRlbS5hZGRFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCB0aGlz Ll9icmVha3BvaW50c1RvZ2dsZUJ1dHRvbkNsaWNrZWQsIHRoaXMpOworICAgICAgICB0aGlzLl9k ZWJ1Z2dlckJyZWFrcG9pbnRzQnV0dG9uSXRlbS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rv ci5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCBXZWJJbnNwZWN0b3IuZGVidWdn ZXJUb2dnbGVCcmVha3BvaW50cywgdGhpcyk7CiAgICAgICAgIHRoaXMuX25hdmlnYXRpb25CYXIu YWRkTmF2aWdhdGlvbkl0ZW0odGhpcy5fZGVidWdnZXJCcmVha3BvaW50c0J1dHRvbkl0ZW0pOwog Ci0gICAgICAgIHRvb2xUaXAgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlBhdXNlIHNjcmlwdCBl eGVjdXRpb24gKCVzIG9yICVzKSIpLmZvcm1hdCh0aGlzLnBhdXNlT3JSZXN1bWVLZXlib2FyZFNo b3J0Y3V0LmRpc3BsYXlOYW1lLCB0aGlzLnBhdXNlT3JSZXN1bWVBbHRlcm5hdGVLZXlib2FyZFNo b3J0Y3V0LmRpc3BsYXlOYW1lKTsKLSAgICAgICAgYWx0VG9vbFRpcCA9IFdlYkluc3BlY3Rvci5V SVN0cmluZygiQ29udGludWUgc2NyaXB0IGV4ZWN1dGlvbiAoJXMgb3IgJXMpIikuZm9ybWF0KHRo aXMucGF1c2VPclJlc3VtZUtleWJvYXJkU2hvcnRjdXQuZGlzcGxheU5hbWUsIHRoaXMucGF1c2VP clJlc3VtZUFsdGVybmF0ZUtleWJvYXJkU2hvcnRjdXQuZGlzcGxheU5hbWUpOworICAgICAgICB0 b29sVGlwID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJQYXVzZSBzY3JpcHQgZXhlY3V0aW9uICgl cyBvciAlcykiKS5mb3JtYXQoV2ViSW5zcGVjdG9yLnBhdXNlT3JSZXN1bWVLZXlib2FyZFNob3J0 Y3V0LmRpc3BsYXlOYW1lLCBXZWJJbnNwZWN0b3IucGF1c2VPclJlc3VtZUFsdGVybmF0ZUtleWJv YXJkU2hvcnRjdXQuZGlzcGxheU5hbWUpOworICAgICAgICBhbHRUb29sVGlwID0gV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJDb250aW51ZSBzY3JpcHQgZXhlY3V0aW9uICglcyBvciAlcykiKS5mb3Jt YXQoV2ViSW5zcGVjdG9yLnBhdXNlT3JSZXN1bWVLZXlib2FyZFNob3J0Y3V0LmRpc3BsYXlOYW1l LCBXZWJJbnNwZWN0b3IucGF1c2VPclJlc3VtZUFsdGVybmF0ZUtleWJvYXJkU2hvcnRjdXQuZGlz cGxheU5hbWUpOwogCiAgICAgICAgIHRoaXMuX2RlYnVnZ2VyUGF1c2VSZXN1bWVCdXR0b25JdGVt ID0gbmV3IFdlYkluc3BlY3Rvci5Ub2dnbGVCdXR0b25OYXZpZ2F0aW9uSXRlbSgiZGVidWdnZXIt cGF1c2UtcmVzdW1lIiwgdG9vbFRpcCwgYWx0VG9vbFRpcCwgcGF1c2VJbWFnZS5zcmMsIHJlc3Vt ZUltYWdlLnNyYywgcGF1c2VJbWFnZS53aWR0aCwgcGF1c2VJbWFnZS5oZWlnaHQpOwotICAgICAg ICB0aGlzLl9kZWJ1Z2dlclBhdXNlUmVzdW1lQnV0dG9uSXRlbS5hZGRFdmVudExpc3RlbmVyKFdl Ykluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCB0aGlzLl9kZWJ1 Z2dlclBhdXNlUmVzdW1lQnV0dG9uQ2xpY2tlZCwgdGhpcyk7CisgICAgICAgIHRoaXMuX2RlYnVn Z2VyUGF1c2VSZXN1bWVCdXR0b25JdGVtLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkJ1 dHRvbk5hdmlnYXRpb25JdGVtLkV2ZW50LkNsaWNrZWQsIFdlYkluc3BlY3Rvci5kZWJ1Z2dlclBh dXNlUmVzdW1lVG9nZ2xlLCB0aGlzKTsKICAgICAgICAgdGhpcy5fbmF2aWdhdGlvbkJhci5hZGRO YXZpZ2F0aW9uSXRlbSh0aGlzLl9kZWJ1Z2dlclBhdXNlUmVzdW1lQnV0dG9uSXRlbSk7CiAKLSAg ICAgICAgdGhpcy5fZGVidWdnZXJTdGVwT3ZlckJ1dHRvbkl0ZW0gPSBuZXcgV2ViSW5zcGVjdG9y LkJ1dHRvbk5hdmlnYXRpb25JdGVtKCJkZWJ1Z2dlci1zdGVwLW92ZXIiLCBXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIlN0ZXAgb3ZlciAoJXMgb3IgJXMpIikuZm9ybWF0KHRoaXMuX3N0ZXBPdmVyS2V5 Ym9hcmRTaG9ydGN1dC5kaXNwbGF5TmFtZSwgdGhpcy5fc3RlcE92ZXJBbHRlcm5hdGVLZXlib2Fy ZFNob3J0Y3V0LmRpc3BsYXlOYW1lKSwgc3RlcE92ZXJJbWFnZS5zcmMsIHN0ZXBPdmVySW1hZ2Uu d2lkdGgsIHN0ZXBPdmVySW1hZ2UuaGVpZ2h0KTsKLSAgICAgICAgdGhpcy5fZGVidWdnZXJTdGVw T3ZlckJ1dHRvbkl0ZW0uYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuQnV0dG9uTmF2aWdh dGlvbkl0ZW0uRXZlbnQuQ2xpY2tlZCwgdGhpcy5fZGVidWdnZXJTdGVwT3ZlckJ1dHRvbkNsaWNr ZWQsIHRoaXMpOworICAgICAgICB0aGlzLl9kZWJ1Z2dlclN0ZXBPdmVyQnV0dG9uSXRlbSA9IG5l dyBXZWJJbnNwZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0oImRlYnVnZ2VyLXN0ZXAtb3ZlciIs IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3RlcCBvdmVyICglcyBvciAlcykiKS5mb3JtYXQoV2Vi SW5zcGVjdG9yLnN0ZXBPdmVyS2V5Ym9hcmRTaG9ydGN1dC5kaXNwbGF5TmFtZSwgV2ViSW5zcGVj dG9yLnN0ZXBPdmVyQWx0ZXJuYXRlS2V5Ym9hcmRTaG9ydGN1dC5kaXNwbGF5TmFtZSksIHN0ZXBP dmVySW1hZ2Uuc3JjLCBzdGVwT3ZlckltYWdlLndpZHRoLCBzdGVwT3ZlckltYWdlLmhlaWdodCk7 CisgICAgICAgIHRoaXMuX2RlYnVnZ2VyU3RlcE92ZXJCdXR0b25JdGVtLmFkZEV2ZW50TGlzdGVu ZXIoV2ViSW5zcGVjdG9yLkJ1dHRvbk5hdmlnYXRpb25JdGVtLkV2ZW50LkNsaWNrZWQsIFdlYklu c3BlY3Rvci5kZWJ1Z2dlclN0ZXBPdmVyLCB0aGlzKTsKICAgICAgICAgdGhpcy5fZGVidWdnZXJT dGVwT3ZlckJ1dHRvbkl0ZW0uZW5hYmxlZCA9IGZhbHNlOwogICAgICAgICB0aGlzLl9uYXZpZ2F0 aW9uQmFyLmFkZE5hdmlnYXRpb25JdGVtKHRoaXMuX2RlYnVnZ2VyU3RlcE92ZXJCdXR0b25JdGVt KTsKIAotICAgICAgICB0aGlzLl9kZWJ1Z2dlclN0ZXBJbnRvQnV0dG9uSXRlbSA9IG5ldyBXZWJJ bnNwZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0oImRlYnVnZ2VyLXN0ZXAtaW50byIsIFdlYklu c3BlY3Rvci5VSVN0cmluZygiU3RlcCBpbnRvICglcyBvciAlcykiKS5mb3JtYXQodGhpcy5fc3Rl cEludG9LZXlib2FyZFNob3J0Y3V0LmRpc3BsYXlOYW1lLCB0aGlzLl9zdGVwSW50b0FsdGVybmF0 ZUtleWJvYXJkU2hvcnRjdXQuZGlzcGxheU5hbWUpLCBzdGVwSW50b0ltYWdlLnNyYywgc3RlcElu dG9JbWFnZS53aWR0aCwgc3RlcEludG9JbWFnZS5oZWlnaHQpOwotICAgICAgICB0aGlzLl9kZWJ1 Z2dlclN0ZXBJbnRvQnV0dG9uSXRlbS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5CdXR0 b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCB0aGlzLl9kZWJ1Z2dlclN0ZXBJbnRvQnV0 dG9uQ2xpY2tlZCwgdGhpcyk7CisgICAgICAgIHRoaXMuX2RlYnVnZ2VyU3RlcEludG9CdXR0b25J dGVtID0gbmV3IFdlYkluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbSgiZGVidWdnZXItc3Rl cC1pbnRvIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTdGVwIGludG8gKCVzIG9yICVzKSIpLmZv cm1hdChXZWJJbnNwZWN0b3Iuc3RlcEludG9LZXlib2FyZFNob3J0Y3V0LmRpc3BsYXlOYW1lLCBX ZWJJbnNwZWN0b3Iuc3RlcEludG9BbHRlcm5hdGVLZXlib2FyZFNob3J0Y3V0LmRpc3BsYXlOYW1l KSwgc3RlcEludG9JbWFnZS5zcmMsIHN0ZXBJbnRvSW1hZ2Uud2lkdGgsIHN0ZXBJbnRvSW1hZ2Uu aGVpZ2h0KTsKKyAgICAgICAgdGhpcy5fZGVidWdnZXJTdGVwSW50b0J1dHRvbkl0ZW0uYWRkRXZl bnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tl ZCwgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyU3RlcEludG8sIHRoaXMpOwogICAgICAgICB0aGlzLl9k ZWJ1Z2dlclN0ZXBJbnRvQnV0dG9uSXRlbS5lbmFibGVkID0gZmFsc2U7CiAgICAgICAgIHRoaXMu X25hdmlnYXRpb25CYXIuYWRkTmF2aWdhdGlvbkl0ZW0odGhpcy5fZGVidWdnZXJTdGVwSW50b0J1 dHRvbkl0ZW0pOwogCi0gICAgICAgIHRoaXMuX2RlYnVnZ2VyU3RlcE91dEJ1dHRvbkl0ZW0gPSBu ZXcgV2ViSW5zcGVjdG9yLkJ1dHRvbk5hdmlnYXRpb25JdGVtKCJkZWJ1Z2dlci1zdGVwLW91dCIs IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3RlcCBvdXQgKCVzIG9yICVzKSIpLmZvcm1hdCh0aGlz Ll9zdGVwT3V0S2V5Ym9hcmRTaG9ydGN1dC5kaXNwbGF5TmFtZSwgdGhpcy5fc3RlcE91dEFsdGVy bmF0ZUtleWJvYXJkU2hvcnRjdXQuZGlzcGxheU5hbWUpLCBzdGVwT3V0SW1hZ2Uuc3JjLCBzdGVw T3V0SW1hZ2Uud2lkdGgsIHN0ZXBPdXRJbWFnZS5oZWlnaHQpOwotICAgICAgICB0aGlzLl9kZWJ1 Z2dlclN0ZXBPdXRCdXR0b25JdGVtLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkJ1dHRv bk5hdmlnYXRpb25JdGVtLkV2ZW50LkNsaWNrZWQsIHRoaXMuX2RlYnVnZ2VyU3RlcE91dEJ1dHRv bkNsaWNrZWQsIHRoaXMpOworICAgICAgICB0aGlzLl9kZWJ1Z2dlclN0ZXBPdXRCdXR0b25JdGVt ID0gbmV3IFdlYkluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbSgiZGVidWdnZXItc3RlcC1v dXQiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlN0ZXAgb3V0ICglcyBvciAlcykiKS5mb3JtYXQo V2ViSW5zcGVjdG9yLnN0ZXBPdXRLZXlib2FyZFNob3J0Y3V0LmRpc3BsYXlOYW1lLCBXZWJJbnNw ZWN0b3Iuc3RlcE91dEFsdGVybmF0ZUtleWJvYXJkU2hvcnRjdXQuZGlzcGxheU5hbWUpLCBzdGVw T3V0SW1hZ2Uuc3JjLCBzdGVwT3V0SW1hZ2Uud2lkdGgsIHN0ZXBPdXRJbWFnZS5oZWlnaHQpOwor ICAgICAgICB0aGlzLl9kZWJ1Z2dlclN0ZXBPdXRCdXR0b25JdGVtLmFkZEV2ZW50TGlzdGVuZXIo V2ViSW5zcGVjdG9yLkJ1dHRvbk5hdmlnYXRpb25JdGVtLkV2ZW50LkNsaWNrZWQsIFdlYkluc3Bl Y3Rvci5kZWJ1Z2dlclN0ZXBPdXQsIHRoaXMpOwogICAgICAgICB0aGlzLl9kZWJ1Z2dlclN0ZXBP dXRCdXR0b25JdGVtLmVuYWJsZWQgPSBmYWxzZTsKICAgICAgICAgdGhpcy5fbmF2aWdhdGlvbkJh ci5hZGROYXZpZ2F0aW9uSXRlbSh0aGlzLl9kZWJ1Z2dlclN0ZXBPdXRCdXR0b25JdGVtKTsKIApA QCAtMjM3LDI5ICsyMjcsOSBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJTaWRlYmFyUGFuZWwgPSBj bGFzcyBEZWJ1Z2dlclNpZGViYXJQYW5lbCBleHRlbmRzIFdlYkluc3BlYwogCiAgICAgLy8gUHJp dmF0ZQogCi0gICAgX2RlYnVnZ2VyUGF1c2VSZXN1bWVCdXR0b25DbGlja2VkKGV2ZW50KQotICAg IHsKLSAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1hbmFnZXIucGF1c2VkKQotICAg ICAgICAgICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTWFuYWdlci5yZXN1bWUoKTsKLSAgICAgICAg ZWxzZSB7Ci0gICAgICAgICAgICB0aGlzLl9kZWJ1Z2dlclBhdXNlUmVzdW1lQnV0dG9uSXRlbS5l bmFibGVkID0gZmFsc2U7Ci0gICAgICAgICAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJNYW5hZ2Vy LnBhdXNlKCk7Ci0gICAgICAgIH0KLSAgICB9Ci0KLSAgICBfZGVidWdnZXJTdGVwT3ZlckJ1dHRv bkNsaWNrZWQoZXZlbnQpCi0gICAgewotICAgICAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJNYW5h Z2VyLnN0ZXBPdmVyKCk7Ci0gICAgfQotCi0gICAgX2RlYnVnZ2VyU3RlcEludG9CdXR0b25DbGlj a2VkKGV2ZW50KQorICAgIF9kZWJ1Z2dlcldhaXRpbmdUb1BhdXNlKGV2ZW50KQogICAgIHsKLSAg ICAgICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTWFuYWdlci5zdGVwSW50bygpOwotICAgIH0KLQot ICAgIF9kZWJ1Z2dlclN0ZXBPdXRCdXR0b25DbGlja2VkKGV2ZW50KQotICAgIHsKLSAgICAgICAg V2ViSW5zcGVjdG9yLmRlYnVnZ2VyTWFuYWdlci5zdGVwT3V0KCk7CisgICAgICAgIHRoaXMuX2Rl YnVnZ2VyUGF1c2VSZXN1bWVCdXR0b25JdGVtLmVuYWJsZWQgPSBmYWxzZTsKICAgICB9CiAKICAg ICBfZGVidWdnZXJEaWRQYXVzZShldmVudCkKQEAgLTI5NSwxMSArMjY1LDYgQEAgV2ViSW5zcGVj dG9yLkRlYnVnZ2VyU2lkZWJhclBhbmVsID0gY2xhc3MgRGVidWdnZXJTaWRlYmFyUGFuZWwgZXh0 ZW5kcyBXZWJJbnNwZWMKICAgICAgICAgdGhpcy5fZGVidWdnZXJCcmVha3BvaW50c0J1dHRvbkl0 ZW0uYWN0aXZhdGVkID0gV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTWFuYWdlci5icmVha3BvaW50c0Vu YWJsZWQ7CiAgICAgfQogCi0gICAgX2JyZWFrcG9pbnRzVG9nZ2xlQnV0dG9uQ2xpY2tlZChldmVu dCkKLSAgICB7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1hbmFnZXIuYnJlYWtwb2lu dHNFbmFibGVkID0gIXRoaXMuX2RlYnVnZ2VyQnJlYWtwb2ludHNCdXR0b25JdGVtLmFjdGl2YXRl ZDsKLSAgICB9Ci0KICAgICBfYWRkQnJlYWtwb2ludChicmVha3BvaW50KQogICAgIHsKICAgICAg ICAgdmFyIHNvdXJjZUNvZGUgPSBicmVha3BvaW50LnNvdXJjZUNvZGVMb2NhdGlvbi5kaXNwbGF5 U291cmNlQ29kZTsKQEAgLTgyMiwxNSArNzg3LDEzIEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclNp ZGViYXJQYW5lbCA9IGNsYXNzIERlYnVnZ2VyU2lkZWJhclBhbmVsIGV4dGVuZHMgV2ViSW5zcGVj CiAgICAgICAgIHZhciBpc3N1ZVRyZWVFbGVtZW50cyA9IFtdOwogCiAgICAgICAgIHdoaWxlIChj dXJyZW50VHJlZUVsZW1lbnQgJiYgIWN1cnJlbnRUcmVlRWxlbWVudC5yb290KSB7Ci0gICAgICAg ICAgICBpZiAoY3VycmVudFRyZWVFbGVtZW50IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLklzc3Vl VHJlZUVsZW1lbnQpIHsKKyAgICAgICAgICAgIGlmIChjdXJyZW50VHJlZUVsZW1lbnQgaW5zdGFu Y2VvZiBXZWJJbnNwZWN0b3IuSXNzdWVUcmVlRWxlbWVudCkKICAgICAgICAgICAgICAgICBpc3N1 ZVRyZWVFbGVtZW50cy5wdXNoKGN1cnJlbnRUcmVlRWxlbWVudCk7Ci0gICAgICAgICAgICB9CiAg ICAgICAgICAgICBjdXJyZW50VHJlZUVsZW1lbnQgPSBjdXJyZW50VHJlZUVsZW1lbnQudHJhdmVy c2VOZXh0VHJlZUVsZW1lbnQoZmFsc2UsIG51bGwsIHRydWUpOwogICAgICAgICB9CiAKLSAgICAg ICAgZm9yICh2YXIgaXNzdWVUcmVlRWxlbWVudCBvZiBpc3N1ZVRyZWVFbGVtZW50cykgeworICAg ICAgICBmb3IgKHZhciBpc3N1ZVRyZWVFbGVtZW50IG9mIGlzc3VlVHJlZUVsZW1lbnRzKQogICAg ICAgICAgICAgaXNzdWVUcmVlRWxlbWVudC5wYXJlbnQucmVtb3ZlQ2hpbGQoaXNzdWVUcmVlRWxl bWVudCk7Ci0gICAgICAgIH0KICAgICB9CiB9OwogCg==