61028 2011-05-18 02:03:18 -0700 Web Inspector: make "Id" suffixes use consistent case. 2011-05-18 05:04:55 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 61039 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo ossy pfeldman pmuellr rik timothy yurys oldest_to_newest 405580 0 pfeldman 2011-05-18 02:03:18 -0700 Patch to follow. 405582 1 93886 pfeldman 2011-05-18 02:09:52 -0700 Created attachment 93886 Patch 405600 2 pfeldman 2011-05-18 02:48:52 -0700 Committed r86747: <http://trac.webkit.org/changeset/86747> 405632 3 ossy 2011-05-18 04:17:26 -0700 (In reply to comment #2) > Committed r86747: <http://trac.webkit.org/changeset/86747> It broke many tests on all bot. Are you still working on fixing or should we rollout now? 405635 4 pfeldman 2011-05-18 04:23:20 -0700 (In reply to comment #3) > (In reply to comment #2) > > Committed r86747: <http://trac.webkit.org/changeset/86747> > > It broke many tests on all bot. Are you still working on fixing or should we rollout now? I'm fixing it locally. 405653 5 pfeldman 2011-05-18 05:04:55 -0700 Committed r86752: <http://trac.webkit.org/changeset/86752> 93886 2011-05-18 02:09:52 -0700 2011-05-18 02:46:16 -0700 Patch bug-61028-20110518130949.patch text/plain 34861 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODY3NDEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5MGY0OGYzMzcwMmZlMzM1 NjQyOWEyMDhhYzdmOTc2Y2Q1NTRmNDFkLi45ZWE3NWQxYTA0MWJlNzVjNjhmYzFmNmM3MTA2MWQ1 NDgzMmExNWU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNjAgQEAKKzIwMTEtMDUtMTggIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IG1ha2UgIklkIiBzdWZmaXhl cyB1c2UgY29uc2lzdGVudCBjYXNlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NjEwMjgKKworICAgICAgICAqIGluc3BlY3Rvci9JbmplY3RlZFNjcmlw dFNvdXJjZS5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yLmpzb246CisgICAgICAg ICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JDb25zb2xlQWdlbnQ6OmFkZE1lc3NhZ2VUb0NvbnNvbGUpOgorICAgICAgICAq IGluc3BlY3Rvci9JbnNwZWN0b3JDb25zb2xlQWdlbnQuaDoKKyAgICAgICAgKiBpbnNwZWN0b3Iv SW5zcGVjdG9yQ29uc29sZUluc3RydW1lbnRhdGlvbi5oOgorICAgICAgICAoV2ViQ29yZTo6SW5z cGVjdG9ySW5zdHJ1bWVudGF0aW9uOjphZGRNZXNzYWdlVG9Db25zb2xlKToKKyAgICAgICAgKiBp bnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpw YXJzZUxvY2F0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6 OnJlc29sdmVCcmVha3BvaW50KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRlYnVnZ2Vy QWdlbnQ6OmVkaXRTY3JpcHRTb3VyY2UpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRGVi dWdnZXJBZ2VudDo6Z2V0U2NyaXB0U291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rv ckRlYnVnZ2VyQWdlbnQ6OmRpZFBhcnNlU291cmNlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5z cGVjdG9yRGVidWdnZXJBZ2VudC5oOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JJbnN0 cnVtZW50YXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uOjphZGRNZXNzYWdlVG9Db25zb2xlSW1wbCk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3Bl Y3Rvckluc3RydW1lbnRhdGlvbi5oOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JSZXNv dXJjZUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmJ1aWxkT2JqZWN0Rm9yUmVzb3VyY2VS ZXNwb25zZSk6CisgICAgICAgICogaW5zcGVjdG9yL1NjcmlwdERlYnVnTGlzdGVuZXIuaDoKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9kZWwuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5wcm90b3R5cGUuc2NyaXB0Rm9yU291cmNlSUQpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwucHJvdG90eXBlLnF1ZXJ5U2NyaXB0 cyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5wcm90b3R5cGUuZWRpdFNj cmlwdFNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5wcm90b3R5 cGUuX2RpZEVkaXRTY3JpcHRTb3VyY2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2Vy TW9kZWwucHJvdG90eXBlLl9wYXJzZWRTY3JpcHRTb3VyY2UpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkRlYnVnZ2VyRGlzcGF0Y2hlci5wcm90b3R5cGUuc2NyaXB0UGFyc2VkKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5EZWJ1Z2dlckRpc3BhdGNoZXIucHJvdG90eXBlLmJyZWFrcG9pbnRSZXNv bHZlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlv bk1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9k ZWwucHJvdG90eXBlLmVkaXRTY3JpcHRTb3VyY2UuZGlkUmVjZWl2ZVNvdXJjZSk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuZWRpdFNj cmlwdFNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25N b2RlbC5wcm90b3R5cGUuX3NldEJyZWFrcG9pbnRJbkRlYnVnZ2VyLmRpZFJlcXVlc3RTb3VyY2VN YXBwaW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVs LnByb3RvdHlwZS5fc2V0QnJlYWtwb2ludEluRGVidWdnZXIpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLl9kZWJ1Z2dlclBhdXNlZCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5 cGUuX3NvdXJjZUZpbGVGb3JTY3JpcHQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2Vy UHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLl9zY3JpcHRGb3JTb3VyY2VGaWxlSWQpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLl9j cmVhdGVTb3VyY2VGaWxlSWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByZXNlbmF0aW9uQ2Fs bEZyYW1lKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNwYXRjaGVyLnByb3RvdHlwZS5fdXBk YXRlUmVzb3VyY2VXaXRoUmVzcG9uc2UpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv U2NyaXB0LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU2NyaXB0LnByb3RvdHlwZS5yZXF1ZXN0U291cmNlKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5TY3JpcHQucHJvdG90eXBlLmVkaXRTb3VyY2UpOgorICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvU291cmNlRmlsZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VG aWxlLnByb3RvdHlwZS5mb3JjZUxvYWRDb250ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T b3VyY2VGaWxlLnByb3RvdHlwZS5fY29uY2F0ZW5hdGVTY3JpcHRzQ29udGVudCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU291cmNlTWFwcGluZy5wcm90b3R5cGUuX3NvdXJjZUxvY2F0aW9uVG9T Y3JpcHRMb2NhdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IpOgorCiAyMDExLTA1LTE2ICBK ZXJlbXkgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IERhcmluIEFkbGVyLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVj dGVkU2NyaXB0U291cmNlLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2Ny aXB0U291cmNlLmpzCmluZGV4IDg1ZTE0N2NlZjhkNDNiNGNmZjIzZjU2MjQzMzA4MDFiN2RlNjk2 YWYuLmY4Nzc5MmQ0YTdkMmUyODVkYTRjNDAwMTM0NzIzOTRjNDZiODBlNWQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJjZS5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2UuanMKQEAgLTQ1NCw3 ICs0NTQsNyBAQCBJbmplY3RlZFNjcmlwdC5DYWxsRnJhbWVQcm94eSA9IGZ1bmN0aW9uKG9yZGlu YWwsIGNhbGxGcmFtZSkKIHsKICAgICB0aGlzLmlkID0gIntcIm9yZGluYWxcIjoiICsgb3JkaW5h bCArICIsXCJpbmplY3RlZFNjcmlwdElkXCI6IiArIGluamVjdGVkU2NyaXB0SWQgKyAifSI7CiAg ICAgdGhpcy5mdW5jdGlvbk5hbWUgPSAoY2FsbEZyYW1lLnR5cGUgPT09ICJmdW5jdGlvbiIgPyBj YWxsRnJhbWUuZnVuY3Rpb25OYW1lIDogIiIpOwotICAgIHRoaXMubG9jYXRpb24gPSB7IHNvdXJj ZUlEOiBTdHJpbmcoY2FsbEZyYW1lLnNvdXJjZUlEKSwgbGluZU51bWJlcjogY2FsbEZyYW1lLmxp bmUsIGNvbHVtbk51bWJlcjogY2FsbEZyYW1lLmNvbHVtbiB9OworICAgIHRoaXMubG9jYXRpb24g PSB7IHNvdXJjZUlkOiBTdHJpbmcoY2FsbEZyYW1lLnNvdXJjZUlEKSwgbGluZU51bWJlcjogY2Fs bEZyYW1lLmxpbmUsIGNvbHVtbk51bWJlcjogY2FsbEZyYW1lLmNvbHVtbiB9OwogICAgIHRoaXMu c2NvcGVDaGFpbiA9IHRoaXMuX3dyYXBTY29wZUNoYWluKGNhbGxGcmFtZSk7CiB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbiBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgppbmRleCA4ZTUxZTk3OTc0OWE5NzA1ZDJl YWUwYTlkMmM0MTM4MzkzNDBjZmNlLi5jYmFjNTVmYjhiYWZiNmZiZDU2NDE2MDg2YjBhMGViNzBl ZTFiNjZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpz b24KKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCkBAIC00MzIs NyArNDMyLDcgQEAKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyZXF1ZXN0SGVhZGVy cyIsICJ0eXBlIjogIm9iamVjdCIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJS ZWZpbmVkIEhUVFAgcmVxdWVzdCBoZWFkZXJzIHRoYXQgd2VyZSBhY3R1YWxseSB0cmFuc21pdHRl ZCBvdmVyIHRoZSBuZXR3b3JrLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJy ZXF1ZXN0SGVhZGVyc1RleHQiLCAidHlwZSI6ICJzdHJpbmciLCAib3B0aW9uYWwiOiB0cnVlLCAi ZGVzY3JpcHRpb24iOiAiSFRUUCByZXF1ZXN0IGhlYWRlcnMgdGV4dC4iIH0sCiAgICAgICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAiY29ubmVjdGlvblJldXNlZCIsICJ0eXBlIjogImJvb2xlYW4i LCAiZGVzY3JpcHRpb24iOiAiU3BlY2lmaWVzIHdoZXRoZXIgcGh5c2ljYWwgY29ubmVjdGlvbiB3 YXMgYWN0dWFsbHkgcmV1c2VkIGZvciB0aGlzIHJlcXVlc3QuIiB9LAotICAgICAgICAgICAgICAg ICAgICB7ICJuYW1lIjogImNvbm5lY3Rpb25JRCIsICJ0eXBlIjogIm51bWJlciIsICJkZXNjcmlw dGlvbiI6ICJQaHlzaWNhbCBjb25uZWN0aW9uIGlkIHRoYXQgd2FzIGFjdHVhbGx5IHVzZWQgZm9y IHRoaXMgcmVxdWVzdC4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiY29ubmVj dGlvbklkIiwgInR5cGUiOiAibnVtYmVyIiwgImRlc2NyaXB0aW9uIjogIlBoeXNpY2FsIGNvbm5l Y3Rpb24gaWQgdGhhdCB3YXMgYWN0dWFsbHkgdXNlZCBmb3IgdGhpcyByZXF1ZXN0LiIgfSwKICAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJmcm9tRGlza0NhY2hlIiwgInR5cGUiOiAiYm9v bGVhbiIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJTcGVjaWZpZXMgdGhhdCB0 aGUgcmVzb3VyY2Ugd2FzIGxvYWRlZCBmcm9tIHRoZSBkaXNrIGNhY2hlLiIgfSwKICAgICAgICAg ICAgICAgICAgICAgeyAibmFtZSI6ICJ0aW1pbmciLCAiJHJlZiI6ICJSZXNvdXJjZVRpbWluZyIs ICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJUaW1pbmcgaW5mb3JtYXRpb24gZm9y IHRoZSBnaXZlbiByZXF1ZXN0LiIgfQogICAgICAgICAgICAgICAgIF0KQEAgLTEzNDEsNyArMTM0 MSw3IEBACiAgICAgICAgICAgICAgICAgImlkIjogIkxvY2F0aW9uIiwKICAgICAgICAgICAgICAg ICAidHlwZSI6ICJvYmplY3QiLAogICAgICAgICAgICAgICAgICJwcm9wZXJ0aWVzIjogWwotICAg ICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInNvdXJjZUlEIiwgInR5cGUiOiAic3RyaW5nIiwg ImRlc2NyaXB0aW9uIjogIlNjcmlwdCBpZGVudGlmaWVyIGFzIHJlcG9ydGVkIGJ5IHRoZSA8Y29k ZT5zY3JpcHRQYXJzZWQ8L2NvZGU+IiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjog InNvdXJjZUlkIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIlNjcmlwdCBpZGVu dGlmaWVyIGFzIHJlcG9ydGVkIGJ5IHRoZSA8Y29kZT5zY3JpcHRQYXJzZWQ8L2NvZGU+IiB9LAog ICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImxpbmVOdW1iZXIiLCAidHlwZSI6ICJpbnRl Z2VyIiwgImRlc2NyaXB0aW9uIjogIkxpbmUgbnVtYmVyIGluIHRoZSBzY3JpcHQuIiB9LAogICAg ICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImNvbHVtbk51bWJlciIsICJ0eXBlIjogImludGVn ZXIiLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiQ29sdW1uIG51bWJlciBpbiB0 aGUgc2NyaXB0LiIgfQogICAgICAgICAgICAgICAgIF0sCkBAIC0xNDQ4LDcgKzE0NDgsNyBAQAog ICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICJuYW1lIjogImVkaXRTY3JpcHRTb3VyY2Ui LAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwotICAgICAgICAgICAgICAgICAgICB7 ICJuYW1lIjogInNvdXJjZUlEIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIklk IG9mIHRoZSBzY3JpcHQgdG8gZWRpdC4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAic291cmNlSWQiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiSWQgb2YgdGhl IHNjcmlwdCB0byBlZGl0LiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzY3Jp cHRTb3VyY2UiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiTmV3IGNvbnRlbnQg b2YgdGhlIHNjcmlwdC4iIH0KICAgICAgICAgICAgICAgICBdLAogICAgICAgICAgICAgICAgICJy ZXR1cm5zIjogWwpAQCAtMTQ1OSw3ICsxNDU5LDcgQEAKICAgICAgICAgICAgIHsKICAgICAgICAg ICAgICAgICAibmFtZSI6ICJnZXRTY3JpcHRTb3VyY2UiLAogICAgICAgICAgICAgICAgICJwYXJh bWV0ZXJzIjogWwotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInNvdXJjZUlEIiwgInR5 cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIklkIG9mIHRoZSBzY3JpcHQgdG8gZ2V0IHNv dXJjZSBmb3IuIiB9CisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic291cmNlSWQiLCAi dHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiSWQgb2YgdGhlIHNjcmlwdCB0byBnZXQg c291cmNlIGZvci4iIH0KICAgICAgICAgICAgICAgICBdLAogICAgICAgICAgICAgICAgICJyZXR1 cm5zIjogWwogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInNjcmlwdFNvdXJjZSIsICJ0 eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJTY3JpcHQgc291cmNlLiIgfQpAQCAtMTUw MCw3ICsxNTAwLDcgQEAKICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAibmFtZSI6ICJz Y3JpcHRQYXJzZWQiLAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwotICAgICAgICAg ICAgICAgICAgICB7ICJuYW1lIjogInNvdXJjZUlEIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2Ny aXB0aW9uIjogIklkZW50aWZpZXIgb2YgdGhlIHNjcmlwdCBwYXJzZWQuIiB9LAorICAgICAgICAg ICAgICAgICAgICB7ICJuYW1lIjogInNvdXJjZUlkIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2Ny aXB0aW9uIjogIklkZW50aWZpZXIgb2YgdGhlIHNjcmlwdCBwYXJzZWQuIiB9LAogICAgICAgICAg ICAgICAgICAgICB7ICJuYW1lIjogInVybCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlv biI6ICJVUkwgb2YgdGhlIHNjcmlwdCBwYXJzZWQgKGlmIGFueSkuIiB9LAogICAgICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogInN0YXJ0TGluZSIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3Jp cHRpb24iOiAiTGluZSBvZmZzZXQgb2YgdGhlIHNjcmlwdCB3aXRoaW4gdGhlIHJlc291cmNlIHdp dGggZ2l2ZW4gVVJMIChmb3Igc2NyaXB0IHRhZ3MpLiIgfSwKICAgICAgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJzdGFydENvbHVtbiIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24i OiAiQ29sdW1uIG9mZnNldCBvZiB0aGUgc2NyaXB0IHdpdGhpbiB0aGUgcmVzb3VyY2Ugd2l0aCBn aXZlbiBVUkwuIiB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckNvbnNvbGVBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y Q29uc29sZUFnZW50LmNwcAppbmRleCAwYzI1ZTgxODE3ZWJhNmUzYzNkMTg4NzgzOTUwNjNhYTY3 MGVkMDVmLi43MzgyOTVkMDY5ODhkMjFlODY2ZTU0MzZiN2RjNWZiZmU2YzYzZjNjIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29uc29sZUFnZW50LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29uc29sZUFnZW50LmNwcApA QCAtMTMxLDExICsxMzEsMTEgQEAgdm9pZCBJbnNwZWN0b3JDb25zb2xlQWdlbnQ6OmFkZE1lc3Nh Z2VUb0NvbnNvbGUoTWVzc2FnZVNvdXJjZSBzb3VyY2UsIE1lc3NhZ2VUeXAKICAgICBhZGRDb25z b2xlTWVzc2FnZShhZG9wdFB0cihuZXcgQ29uc29sZU1lc3NhZ2Uoc291cmNlLCB0eXBlLCBsZXZl bCwgbWVzc2FnZSwgYXJndW1lbnRzLCBjYWxsU3RhY2spKSk7CiB9CiAKLXZvaWQgSW5zcGVjdG9y Q29uc29sZUFnZW50OjphZGRNZXNzYWdlVG9Db25zb2xlKE1lc3NhZ2VTb3VyY2Ugc291cmNlLCBN ZXNzYWdlVHlwZSB0eXBlLCBNZXNzYWdlTGV2ZWwgbGV2ZWwsIGNvbnN0IFN0cmluZyYgbWVzc2Fn ZSwgdW5zaWduZWQgbGluZU51bWJlciwgY29uc3QgU3RyaW5nJiBzb3VyY2VJRCkKK3ZvaWQgSW5z cGVjdG9yQ29uc29sZUFnZW50OjphZGRNZXNzYWdlVG9Db25zb2xlKE1lc3NhZ2VTb3VyY2Ugc291 cmNlLCBNZXNzYWdlVHlwZSB0eXBlLCBNZXNzYWdlTGV2ZWwgbGV2ZWwsIGNvbnN0IFN0cmluZyYg bWVzc2FnZSwgdW5zaWduZWQgbGluZU51bWJlciwgY29uc3QgU3RyaW5nJiBzb3VyY2VJZCkKIHsK ICAgICBpZiAoIW1faW5zcGVjdG9yQWdlbnQtPmVuYWJsZWQoKSkKICAgICAgICAgcmV0dXJuOwot ICAgIGFkZENvbnNvbGVNZXNzYWdlKGFkb3B0UHRyKG5ldyBDb25zb2xlTWVzc2FnZShzb3VyY2Us IHR5cGUsIGxldmVsLCBtZXNzYWdlLCBsaW5lTnVtYmVyLCBzb3VyY2VJRCkpKTsKKyAgICBhZGRD b25zb2xlTWVzc2FnZShhZG9wdFB0cihuZXcgQ29uc29sZU1lc3NhZ2Uoc291cmNlLCB0eXBlLCBs ZXZlbCwgbWVzc2FnZSwgbGluZU51bWJlciwgc291cmNlSWQpKSk7CiB9CiAKIHZvaWQgSW5zcGVj dG9yQ29uc29sZUFnZW50OjpzdGFydFRpbWluZyhjb25zdCBTdHJpbmcmIHRpdGxlKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVBZ2VudC5oIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVBZ2VudC5oCmluZGV4IDU1 NzM0ZGI3NTdjMGI4NDZlYWQ5MWZiYjFiMTc1OGI4ODRhMzY3ZjQuLjAwOWYxYTJlNjBmZWIxZjVj ZmJkMTg1NmY4NDIxNmIxYWVjNWU0ZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JDb25zb2xlQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yQ29uc29sZUFnZW50LmgKQEAgLTY2LDcgKzY2LDcgQEAgcHVibGljOgogICAg IHZvaWQgY2xlYXJGcm9udGVuZCgpOwogCiAgICAgdm9pZCBhZGRNZXNzYWdlVG9Db25zb2xlKE1l c3NhZ2VTb3VyY2UsIE1lc3NhZ2VUeXBlLCBNZXNzYWdlTGV2ZWwsIGNvbnN0IFN0cmluZyYgbWVz c2FnZSwgUGFzc1JlZlB0cjxTY3JpcHRBcmd1bWVudHM+LCBQYXNzUmVmUHRyPFNjcmlwdENhbGxT dGFjaz4pOwotICAgIHZvaWQgYWRkTWVzc2FnZVRvQ29uc29sZShNZXNzYWdlU291cmNlLCBNZXNz YWdlVHlwZSwgTWVzc2FnZUxldmVsLCBjb25zdCBTdHJpbmcmIG1lc3NhZ2UsIHVuc2lnbmVkIGxp bmVOdW1iZXIsIGNvbnN0IFN0cmluZyYgc291cmNlSUQpOworICAgIHZvaWQgYWRkTWVzc2FnZVRv Q29uc29sZShNZXNzYWdlU291cmNlLCBNZXNzYWdlVHlwZSwgTWVzc2FnZUxldmVsLCBjb25zdCBT dHJpbmcmIG1lc3NhZ2UsIHVuc2lnbmVkIGxpbmVOdW1iZXIsIGNvbnN0IFN0cmluZyYgc291cmNl SWQpOwogCiAgICAgdm9pZCBzdGFydFRpbWluZyhjb25zdCBTdHJpbmcmIHRpdGxlKTsKICAgICB2 b2lkIHN0b3BUaW1pbmcoY29uc3QgU3RyaW5nJiB0aXRsZSwgUGFzc1JlZlB0cjxTY3JpcHRDYWxs U3RhY2s+KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JD b25zb2xlSW5zdHJ1bWVudGF0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yQ29uc29sZUluc3RydW1lbnRhdGlvbi5oCmluZGV4IDFlNjAxOWVmZjFmNTYyNzdmZjEzZjM4 OTc5NDE2YjFjMTk3MTY0OTQuLmQ0NWU5ZTQ2OTcwMTVmYWM4ZjIyMmE3YjI5MGFjYWRkYTNiYTIx YzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb25zb2xl SW5zdHJ1bWVudGF0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckNvbnNvbGVJbnN0cnVtZW50YXRpb24uaApAQCAtNDYsMTEgKzQ2LDExIEBAIGlubGluZSB2b2lk IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6YWRkTWVzc2FnZVRvQ29uc29sZShQYWdlKiBwYWdl LCBNZXNzYWdlU291CiAjZW5kaWYKIH0KIAotaW5saW5lIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVu dGF0aW9uOjphZGRNZXNzYWdlVG9Db25zb2xlKFBhZ2UqIHBhZ2UsIE1lc3NhZ2VTb3VyY2Ugc291 cmNlLCBNZXNzYWdlVHlwZSB0eXBlLCBNZXNzYWdlTGV2ZWwgbGV2ZWwsIGNvbnN0IFN0cmluZyYg bWVzc2FnZSwgdW5zaWduZWQgbGluZU51bWJlciwgY29uc3QgU3RyaW5nJiBzb3VyY2VJRCkKK2lu bGluZSB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6YWRkTWVzc2FnZVRvQ29uc29sZShQ YWdlKiBwYWdlLCBNZXNzYWdlU291cmNlIHNvdXJjZSwgTWVzc2FnZVR5cGUgdHlwZSwgTWVzc2Fn ZUxldmVsIGxldmVsLCBjb25zdCBTdHJpbmcmIG1lc3NhZ2UsIHVuc2lnbmVkIGxpbmVOdW1iZXIs IGNvbnN0IFN0cmluZyYgc291cmNlSWQpCiB7CiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKICAgICBp ZiAoSW5zdHJ1bWVudGluZ0FnZW50cyogaW5zdHJ1bWVudGluZ0FnZW50cyA9IGluc3RydW1lbnRp bmdBZ2VudHNGb3JQYWdlKHBhZ2UpKQotICAgICAgICBhZGRNZXNzYWdlVG9Db25zb2xlSW1wbChp bnN0cnVtZW50aW5nQWdlbnRzLCBzb3VyY2UsIHR5cGUsIGxldmVsLCBtZXNzYWdlLCBsaW5lTnVt YmVyLCBzb3VyY2VJRCk7CisgICAgICAgIGFkZE1lc3NhZ2VUb0NvbnNvbGVJbXBsKGluc3RydW1l bnRpbmdBZ2VudHMsIHNvdXJjZSwgdHlwZSwgbGV2ZWwsIG1lc3NhZ2UsIGxpbmVOdW1iZXIsIHNv dXJjZUlkKTsKICNlbmRpZgogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAKaW5kZXggMDBhNjY4NDQ3N2Q5MjE3MjhjM2E4MzRi NWY1MDg3ODU4NDhiMWZjMy4uNTI0YjEwYTdiNjQ2NzdhNzNmZTg4ZWE1MmVmZmZhNmQ0NTFkZDQ5 YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2Vy QWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dl ckFnZW50LmNwcApAQCAtMTkzLDcgKzE5Myw3IEBAIHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2Vu dDo6c2V0QnJlYWtwb2ludEJ5VXJsKEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiB1cmwsCiAK IHN0YXRpYyBib29sIHBhcnNlTG9jYXRpb24oRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBSZWZQ dHI8SW5zcGVjdG9yT2JqZWN0PiBsb2NhdGlvbiwgU3RyaW5nKiBzb3VyY2VJZCwgaW50KiBsaW5l TnVtYmVyLCBpbnQqIGNvbHVtbk51bWJlcikKIHsKLSAgICBpZiAoIWxvY2F0aW9uLT5nZXRTdHJp bmcoInNvdXJjZUlEIiwgc291cmNlSWQpIHx8ICFsb2NhdGlvbi0+Z2V0TnVtYmVyKCJsaW5lTnVt YmVyIiwgbGluZU51bWJlcikpIHsKKyAgICBpZiAoIWxvY2F0aW9uLT5nZXRTdHJpbmcoInNvdXJj ZUlkIiwgc291cmNlSWQpIHx8ICFsb2NhdGlvbi0+Z2V0TnVtYmVyKCJsaW5lTnVtYmVyIiwgbGlu ZU51bWJlcikpIHsKICAgICAgICAgLy8gRklYTUU6IHJlcGxhY2Ugd2l0aCBpbnB1dCB2YWxpZGF0 aW9uLgogICAgICAgICAqZXJyb3JTdHJpbmcgPSAic291cmNlSWQgYW5kIGxpbmVOdW1iZXIgYXJl IHJlcXVpcmVkLiI7CiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTI3OSwyMSArMjc5LDIxIEBA IFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpyZXNv bHZlQnJlYWtwb2ludChjb25zdCBTdHJpCiAgICAgZGVidWdTZXJ2ZXJCcmVha3BvaW50SWRzSXRl cmF0b3ItPnNlY29uZC5hcHBlbmQoZGVidWdTZXJ2ZXJCcmVha3BvaW50SWQpOwogCiAgICAgUmVm UHRyPEluc3BlY3Rvck9iamVjdD4gbG9jYXRpb24gPSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgp OwotICAgIGxvY2F0aW9uLT5zZXRTdHJpbmcoInNvdXJjZUlEIiwgc291cmNlSWQpOworICAgIGxv Y2F0aW9uLT5zZXRTdHJpbmcoInNvdXJjZUlkIiwgc291cmNlSWQpOwogICAgIGxvY2F0aW9uLT5z ZXROdW1iZXIoImxpbmVOdW1iZXIiLCBhY3R1YWxMaW5lTnVtYmVyKTsKICAgICBsb2NhdGlvbi0+ c2V0TnVtYmVyKCJjb2x1bW5OdW1iZXIiLCBhY3R1YWxDb2x1bW5OdW1iZXIpOwogICAgIHJldHVy biBsb2NhdGlvbjsKIH0KIAotdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjplZGl0U2NyaXB0 U291cmNlKEVycm9yU3RyaW5nKiBlcnJvciwgY29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgY29uc3Qg U3RyaW5nJiBuZXdDb250ZW50LCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+KiBuZXdDYWxsRnJhbWVz KQordm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjplZGl0U2NyaXB0U291cmNlKEVycm9yU3Ry aW5nKiBlcnJvciwgY29uc3QgU3RyaW5nJiBzb3VyY2VJZCwgY29uc3QgU3RyaW5nJiBuZXdDb250 ZW50LCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+KiBuZXdDYWxsRnJhbWVzKQogewotICAgIGlmIChz Y3JpcHREZWJ1Z1NlcnZlcigpLmVkaXRTY3JpcHRTb3VyY2Uoc291cmNlSUQsIG5ld0NvbnRlbnQs IGVycm9yLCAmbV9jdXJyZW50Q2FsbFN0YWNrKSkKKyAgICBpZiAoc2NyaXB0RGVidWdTZXJ2ZXIo KS5lZGl0U2NyaXB0U291cmNlKHNvdXJjZUlkLCBuZXdDb250ZW50LCBlcnJvciwgJm1fY3VycmVu dENhbGxTdGFjaykpCiAgICAgICAgICpuZXdDYWxsRnJhbWVzID0gY3VycmVudENhbGxGcmFtZXMo KTsKIH0KIAotdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpnZXRTY3JpcHRTb3VyY2UoRXJy b3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHNvdXJjZUlELCBTdHJpbmcqIHNjcmlwdFNvdXJjZSkK K3ZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6Z2V0U2NyaXB0U291cmNlKEVycm9yU3RyaW5n KiwgY29uc3QgU3RyaW5nJiBzb3VyY2VJZCwgU3RyaW5nKiBzY3JpcHRTb3VyY2UpCiB7Ci0gICAg KnNjcmlwdFNvdXJjZSA9IG1fc2NyaXB0cy5nZXQoc291cmNlSUQpLmRhdGE7CisgICAgKnNjcmlw dFNvdXJjZSA9IG1fc2NyaXB0cy5nZXQoc291cmNlSWQpLmRhdGE7CiB9CiAKIHZvaWQgSW5zcGVj dG9yRGVidWdnZXJBZ2VudDo6c2NoZWR1bGVQYXVzZU9uTmV4dFN0YXRlbWVudChEZWJ1Z2dlckV2 ZW50VHlwZSB0eXBlLCBQYXNzUmVmUHRyPEluc3BlY3RvclZhbHVlPiBkYXRhKQpAQCAtMzgzLDEy ICszODMsMTIgQEAgUGFzc1JlZlB0cjxJbnNwZWN0b3JBcnJheT4gSW5zcGVjdG9yRGVidWdnZXJB Z2VudDo6Y3VycmVudENhbGxGcmFtZXMoKQogCiAvLyBKYXZhU2NyaXB0RGVidWdMaXN0ZW5lciBm dW5jdGlvbnMKIAotdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpkaWRQYXJzZVNvdXJjZShj b25zdCBTdHJpbmcmIHNvdXJjZUlELCBjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBk YXRhLCBpbnQgc3RhcnRMaW5lLCBpbnQgc3RhcnRDb2x1bW4sIGludCBlbmRMaW5lLCBpbnQgZW5k Q29sdW1uLCBib29sIGlzQ29udGVudFNjcmlwdCkKK3ZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2Vu dDo6ZGlkUGFyc2VTb3VyY2UoY29uc3QgU3RyaW5nJiBzb3VyY2VJZCwgY29uc3QgU3RyaW5nJiB1 cmwsIGNvbnN0IFN0cmluZyYgZGF0YSwgaW50IHN0YXJ0TGluZSwgaW50IHN0YXJ0Q29sdW1uLCBp bnQgZW5kTGluZSwgaW50IGVuZENvbHVtbiwgYm9vbCBpc0NvbnRlbnRTY3JpcHQpCiB7CiAgICAg Ly8gRG9uJ3Qgc2VuZCBzY3JpcHQgY29udGVudCB0byB0aGUgZnJvbnQgZW5kIHVudGlsIGl0J3Mg cmVhbGx5IG5lZWRlZC4KLSAgICBtX2Zyb250ZW5kLT5zY3JpcHRQYXJzZWQoc291cmNlSUQsIHVy bCwgc3RhcnRMaW5lLCBzdGFydENvbHVtbiwgZW5kTGluZSwgZW5kQ29sdW1uLCBpc0NvbnRlbnRT Y3JpcHQpOworICAgIG1fZnJvbnRlbmQtPnNjcmlwdFBhcnNlZChzb3VyY2VJZCwgdXJsLCBzdGFy dExpbmUsIHN0YXJ0Q29sdW1uLCBlbmRMaW5lLCBlbmRDb2x1bW4sIGlzQ29udGVudFNjcmlwdCk7 CiAKLSAgICBtX3NjcmlwdHMuc2V0KHNvdXJjZUlELCBTY3JpcHQodXJsLCBkYXRhLCBzdGFydExp bmUsIHN0YXJ0Q29sdW1uLCBlbmRMaW5lLCBlbmRDb2x1bW4pKTsKKyAgICBtX3NjcmlwdHMuc2V0 KHNvdXJjZUlkLCBTY3JpcHQodXJsLCBkYXRhLCBzdGFydExpbmUsIHN0YXJ0Q29sdW1uLCBlbmRM aW5lLCBlbmRDb2x1bW4pKTsKIAogICAgIGlmICh1cmwuaXNFbXB0eSgpKQogICAgICAgICByZXR1 cm47CkBAIC00MDQsNyArNDA0LDcgQEAgdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpkaWRQ YXJzZVNvdXJjZShjb25zdCBTdHJpbmcmIHNvdXJjZUlELCBjb25zdCBTdHJpbmcKICAgICAgICAg YnJlYWtwb2ludE9iamVjdC0+Z2V0TnVtYmVyKCJsaW5lTnVtYmVyIiwgJmJyZWFrcG9pbnQubGlu ZU51bWJlcik7CiAgICAgICAgIGJyZWFrcG9pbnRPYmplY3QtPmdldE51bWJlcigiY29sdW1uTnVt YmVyIiwgJmJyZWFrcG9pbnQuY29sdW1uTnVtYmVyKTsKICAgICAgICAgYnJlYWtwb2ludE9iamVj dC0+Z2V0U3RyaW5nKCJjb25kaXRpb24iLCAmYnJlYWtwb2ludC5jb25kaXRpb24pOwotICAgICAg ICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBsb2NhdGlvbiA9IHJlc29sdmVCcmVha3BvaW50KGl0 LT5maXJzdCwgc291cmNlSUQsIGJyZWFrcG9pbnQpOworICAgICAgICBSZWZQdHI8SW5zcGVjdG9y T2JqZWN0PiBsb2NhdGlvbiA9IHJlc29sdmVCcmVha3BvaW50KGl0LT5maXJzdCwgc291cmNlSWQs IGJyZWFrcG9pbnQpOwogICAgICAgICBpZiAobG9jYXRpb24pCiAgICAgICAgICAgICBtX2Zyb250 ZW5kLT5icmVha3BvaW50UmVzb2x2ZWQoaXQtPmZpcnN0LCBsb2NhdGlvbik7CiAgICAgfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQu aCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmgKaW5k ZXggMThlMDk3NDBkZDRmN2I2MzA4M2U5ZmM5YTlhMjg3Y2U5ZjViMTU4OS4uM2Q1ZTA4ZGY2ZDMx NDg3YjA2ZjM4OTcwNjY2YjA4ZjViZWRlOGUxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oCkBAIC04NSw4ICs4NSw4IEBAIHB1Ymxp YzoKICAgICB2b2lkIHJlbW92ZUJyZWFrcG9pbnQoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcm IGJyZWFrcG9pbnRJZCk7CiAgICAgdm9pZCBjb250aW51ZVRvTG9jYXRpb24oRXJyb3JTdHJpbmcq LCBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gbG9jYXRpb24pOwogCi0gICAgdm9pZCBlZGl0 U2NyaXB0U291cmNlKEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgY29uc3Qg U3RyaW5nJiBuZXdDb250ZW50LCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+KiBuZXdDYWxsRnJhbWVz KTsKLSAgICB2b2lkIGdldFNjcmlwdFNvdXJjZShFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYg c291cmNlSUQsIFN0cmluZyogc2NyaXB0U291cmNlKTsKKyAgICB2b2lkIGVkaXRTY3JpcHRTb3Vy Y2UoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHNvdXJjZUlkLCBjb25zdCBTdHJpbmcmIG5l d0NvbnRlbnQsIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4qIG5ld0NhbGxGcmFtZXMpOworICAgIHZv aWQgZ2V0U2NyaXB0U291cmNlKEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiBzb3VyY2VJZCwg U3RyaW5nKiBzY3JpcHRTb3VyY2UpOwogICAgIHZvaWQgc2NoZWR1bGVQYXVzZU9uTmV4dFN0YXRl bWVudChEZWJ1Z2dlckV2ZW50VHlwZSB0eXBlLCBQYXNzUmVmUHRyPEluc3BlY3RvclZhbHVlPiBk YXRhKTsKICAgICB2b2lkIGNhbmNlbFBhdXNlT25OZXh0U3RhdGVtZW50KCk7CiAgICAgdm9pZCBi cmVha1Byb2dyYW0oRGVidWdnZXJFdmVudFR5cGUgdHlwZSwgUGFzc1JlZlB0cjxJbnNwZWN0b3JW YWx1ZT4gZGF0YSk7CkBAIC0xMjAsNyArMTIwLDcgQEAgcHJpdmF0ZToKIAogICAgIFBhc3NSZWZQ dHI8SW5zcGVjdG9yQXJyYXk+IGN1cnJlbnRDYWxsRnJhbWVzKCk7CiAKLSAgICB2aXJ0dWFsIHZv aWQgZGlkUGFyc2VTb3VyY2UoY29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgY29uc3QgU3RyaW5nJiB1 cmwsIGNvbnN0IFN0cmluZyYgZGF0YSwgaW50IHN0YXJ0TGluZSwgaW50IHN0YXJ0Q29sdW1uLCBp bnQgZW5kTGluZSwgaW50IGVuZENvbHVtbiwgYm9vbCBpc0NvbnRlbnRTY3JpcHQpOworICAgIHZp cnR1YWwgdm9pZCBkaWRQYXJzZVNvdXJjZShjb25zdCBTdHJpbmcmIHNvdXJjZUlkLCBjb25zdCBT dHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBkYXRhLCBpbnQgc3RhcnRMaW5lLCBpbnQgc3RhcnRD b2x1bW4sIGludCBlbmRMaW5lLCBpbnQgZW5kQ29sdW1uLCBib29sIGlzQ29udGVudFNjcmlwdCk7 CiAgICAgdmlydHVhbCB2b2lkIGZhaWxlZFRvUGFyc2VTb3VyY2UoY29uc3QgU3RyaW5nJiB1cmws IGNvbnN0IFN0cmluZyYgZGF0YSwgaW50IGZpcnN0TGluZSwgaW50IGVycm9yTGluZSwgY29uc3Qg U3RyaW5nJiBlcnJvck1lc3NhZ2UpOwogICAgIHZpcnR1YWwgdm9pZCBkaWRQYXVzZShTY3JpcHRT dGF0ZSosIGNvbnN0IFNjcmlwdFZhbHVlJiBjYWxsRnJhbWVzLCBjb25zdCBTY3JpcHRWYWx1ZSYg ZXhjZXB0aW9uKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkQ29udGludWUoKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHAKaW5k ZXggZDViMGJlMTM4MGRiMDU1NmZjMzliZTAzOGM5Y2MzM2IwYzUzNWVjZi4uOTU5OGVhYWQ3OGFm MjhhM2RlNjhhNzNkNWYyOGQ5MTM3OTk0ZTJhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHAKQEAgLTYzMiwxMCArNjMy LDEwIEBAIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjphZGRNZXNzYWdlVG9Db25zb2xl SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0CiAgICAgICAgIGNvbnNvbGVBZ2VudC0+YWRk TWVzc2FnZVRvQ29uc29sZShzb3VyY2UsIHR5cGUsIGxldmVsLCBtZXNzYWdlLCBhcmd1bWVudHMs IGNhbGxTdGFjayk7CiB9CiAKLXZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjphZGRNZXNz YWdlVG9Db25zb2xlSW1wbChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRz LCBNZXNzYWdlU291cmNlIHNvdXJjZSwgTWVzc2FnZVR5cGUgdHlwZSwgTWVzc2FnZUxldmVsIGxl dmVsLCBjb25zdCBTdHJpbmcmIG1lc3NhZ2UsIHVuc2lnbmVkIGxpbmVOdW1iZXIsIGNvbnN0IFN0 cmluZyYgc291cmNlSUQpCit2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6YWRkTWVzc2Fn ZVRvQ29uc29sZUltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyogaW5zdHJ1bWVudGluZ0FnZW50cywg TWVzc2FnZVNvdXJjZSBzb3VyY2UsIE1lc3NhZ2VUeXBlIHR5cGUsIE1lc3NhZ2VMZXZlbCBsZXZl bCwgY29uc3QgU3RyaW5nJiBtZXNzYWdlLCB1bnNpZ25lZCBsaW5lTnVtYmVyLCBjb25zdCBTdHJp bmcmIHNvdXJjZUlkKQogewogICAgIGlmIChJbnNwZWN0b3JDb25zb2xlQWdlbnQqIGNvbnNvbGVB Z2VudCA9IGluc3RydW1lbnRpbmdBZ2VudHMtPmluc3BlY3RvckNvbnNvbGVBZ2VudCgpKQotICAg ICAgICBjb25zb2xlQWdlbnQtPmFkZE1lc3NhZ2VUb0NvbnNvbGUoc291cmNlLCB0eXBlLCBsZXZl bCwgbWVzc2FnZSwgbGluZU51bWJlciwgc291cmNlSUQpOworICAgICAgICBjb25zb2xlQWdlbnQt PmFkZE1lc3NhZ2VUb0NvbnNvbGUoc291cmNlLCB0eXBlLCBsZXZlbCwgbWVzc2FnZSwgbGluZU51 bWJlciwgc291cmNlSWQpOwogfQogCiB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6Y29u c29sZUNvdW50SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzLCBQ YXNzUmVmUHRyPFNjcmlwdEFyZ3VtZW50cz4gYXJndW1lbnRzLCBQYXNzUmVmUHRyPFNjcmlwdENh bGxTdGFjaz4gc3RhY2spCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9ySW5zdHJ1bWVudGF0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9ySW5zdHJ1bWVudGF0aW9uLmgKaW5kZXggN2RlYWM3YWFhMTExZjJjN2I3MTBjNmE5MzVhNzg1 ZjlmZWFkNjM3OC4uNDQ1NzZiMGY0NWI1MDhkZjIwZWQ5M2JhOWFhZTRiYzExNDIxMTBkMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlv bi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRp b24uaApAQCAtMjYxLDcgKzI2MSw3IEBAIHByaXZhdGU6CiAgICAgc3RhdGljIHZvaWQgZGlkV3Jp dGVIVE1MSW1wbChjb25zdCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUmLCB1bnNpZ25l ZCBpbnQgZW5kTGluZSk7CiAKICAgICBzdGF0aWMgdm9pZCBhZGRNZXNzYWdlVG9Db25zb2xlSW1w bChJbnN0cnVtZW50aW5nQWdlbnRzKiwgTWVzc2FnZVNvdXJjZSwgTWVzc2FnZVR5cGUsIE1lc3Nh Z2VMZXZlbCwgY29uc3QgU3RyaW5nJiBtZXNzYWdlLCBQYXNzUmVmUHRyPFNjcmlwdEFyZ3VtZW50 cz4sIFBhc3NSZWZQdHI8U2NyaXB0Q2FsbFN0YWNrPik7Ci0gICAgc3RhdGljIHZvaWQgYWRkTWVz c2FnZVRvQ29uc29sZUltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyosIE1lc3NhZ2VTb3VyY2UsIE1l c3NhZ2VUeXBlLCBNZXNzYWdlTGV2ZWwsIGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgdW5zaWduZWQg bGluZU51bWJlciwgY29uc3QgU3RyaW5nJiBzb3VyY2VJRCk7CisgICAgc3RhdGljIHZvaWQgYWRk TWVzc2FnZVRvQ29uc29sZUltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyosIE1lc3NhZ2VTb3VyY2Us IE1lc3NhZ2VUeXBlLCBNZXNzYWdlTGV2ZWwsIGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgdW5zaWdu ZWQgbGluZU51bWJlciwgY29uc3QgU3RyaW5nJiBzb3VyY2VJZCk7CiAgICAgc3RhdGljIHZvaWQg Y29uc29sZUNvdW50SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzKiwgUGFzc1JlZlB0cjxTY3JpcHRB cmd1bWVudHM+LCBQYXNzUmVmUHRyPFNjcmlwdENhbGxTdGFjaz4pOwogICAgIHN0YXRpYyB2b2lk IHN0YXJ0Q29uc29sZVRpbWluZ0ltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyosIGNvbnN0IFN0cmlu ZyYgdGl0bGUpOwogICAgIHN0YXRpYyB2b2lkIHN0b3BDb25zb2xlVGltaW5nSW1wbChJbnN0cnVt ZW50aW5nQWdlbnRzKiwgY29uc3QgU3RyaW5nJiB0aXRsZSwgUGFzc1JlZlB0cjxTY3JpcHRDYWxs U3RhY2s+KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JS ZXNvdXJjZUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNv dXJjZUFnZW50LmNwcAppbmRleCAzY2M4ZTQ0ZWVjNDBlOGFiOGFkYjdiZGNmN2NjYWQ2YTQ4ZTdj YmZmLi44OWIzMmNhNzdlODQyNmQ4Y2RmNDIwNTg2MmZmYTA5ZTE3MGI2YjU1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwCkBA IC0xNDksNyArMTQ5LDcgQEAgc3RhdGljIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBidWls ZE9iamVjdEZvclJlc291cmNlUmVzcG9uc2UoY29uc3QgUmVzb3VyY2UKIAogICAgIHJlc3BvbnNl T2JqZWN0LT5zZXRTdHJpbmcoIm1pbWVUeXBlIiwgcmVzcG9uc2UubWltZVR5cGUoKSk7CiAgICAg cmVzcG9uc2VPYmplY3QtPnNldEJvb2xlYW4oImNvbm5lY3Rpb25SZXVzZWQiLCByZXNwb25zZS5j b25uZWN0aW9uUmV1c2VkKCkpOwotICAgIHJlc3BvbnNlT2JqZWN0LT5zZXROdW1iZXIoImNvbm5l Y3Rpb25JRCIsIHJlc3BvbnNlLmNvbm5lY3Rpb25JRCgpKTsKKyAgICByZXNwb25zZU9iamVjdC0+ c2V0TnVtYmVyKCJjb25uZWN0aW9uSWQiLCByZXNwb25zZS5jb25uZWN0aW9uSUQoKSk7CiAgICAg cmVzcG9uc2VPYmplY3QtPnNldEJvb2xlYW4oImZyb21EaXNrQ2FjaGUiLCByZXNwb25zZS53YXND YWNoZWQoKSk7CiAgICAgaWYgKHJlc3BvbnNlLnJlc291cmNlTG9hZFRpbWluZygpKQogICAgICAg ICByZXNwb25zZU9iamVjdC0+c2V0T2JqZWN0KCJ0aW1pbmciLCBidWlsZE9iamVjdEZvclRpbWlu ZygqcmVzcG9uc2UucmVzb3VyY2VMb2FkVGltaW5nKCkpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9TY3JpcHREZWJ1Z0xpc3RlbmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvU2NyaXB0RGVidWdMaXN0ZW5lci5oCmluZGV4IDgwMmY4NWE0MjUyNzM0Mjk3NGNl ZTAwOTI3NDlkMmFlMjgwZDU3MzIuLmU0OTdlMjI2YWRkNzMyNjRiNDQyNWY5OTYwNzFjN2U5NjVi OTZlZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9TY3JpcHREZWJ1Z0xp c3RlbmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1NjcmlwdERlYnVnTGlzdGVu ZXIuaApAQCAtNDIsNyArNDIsNyBAQCBjbGFzcyBTY3JpcHREZWJ1Z0xpc3RlbmVyIHsKIHB1Ymxp YzoKICAgICB2aXJ0dWFsIH5TY3JpcHREZWJ1Z0xpc3RlbmVyKCkgeyB9CiAKLSAgICB2aXJ0dWFs IHZvaWQgZGlkUGFyc2VTb3VyY2UoY29uc3QgU3RyaW5nJiAgc291cmNlSUQsIGNvbnN0IFN0cmlu ZyYgdXJsLCBjb25zdCBTdHJpbmcmIGRhdGEsICBpbnQgc3RhcnRMaW5lLCBpbnQgc3RhcnRDb2x1 bW4sIGludCBlbmRMaW5lLCBpbnQgZW5kQ29sdW1uLCBib29sIGlzQ29udGVudFNjcmlwdCkgPSAw OworICAgIHZpcnR1YWwgdm9pZCBkaWRQYXJzZVNvdXJjZShjb25zdCBTdHJpbmcmICBzb3VyY2VJ ZCwgY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgZGF0YSwgIGludCBzdGFydExpbmUs IGludCBzdGFydENvbHVtbiwgaW50IGVuZExpbmUsIGludCBlbmRDb2x1bW4sIGJvb2wgaXNDb250 ZW50U2NyaXB0KSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGZhaWxlZFRvUGFyc2VTb3VyY2UoY29u c3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgZGF0YSwgaW50IGZpcnN0TGluZSwgaW50IGVy cm9yTGluZSwgY29uc3QgU3RyaW5nJiBlcnJvck1lc3NhZ2UpID0gMDsKICAgICB2aXJ0dWFsIHZv aWQgZGlkUGF1c2UoU2NyaXB0U3RhdGUqLCBjb25zdCBTY3JpcHRWYWx1ZSYgY2FsbEZyYW1lcywg Y29uc3QgU2NyaXB0VmFsdWUmIGV4Y2VwdGlvbikgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBkaWRD b250aW51ZSgpID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRGVidWdnZXJNb2RlbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvRGVidWdnZXJNb2RlbC5qcwppbmRleCAzNWNmOGE1NjA2NzEwYTc3YzE1ZTIyYjdlNmZiYjVh MzQ1NzYwZmQ4Li4zMWFlNmI4ZmFlZjFhYmFhYjUzYzFhMzJlMmRkMDJkN2I5YWQ3Mzg3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9kZWwu anMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlck1vZGVs LmpzCkBAIC0xMjQsOSArMTI0LDkgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwucHJvdG90 eXBlID0gewogICAgICAgICByZXR1cm4gdGhpcy5fc2NyaXB0czsKICAgICB9LAogCi0gICAgc2Ny aXB0Rm9yU291cmNlSUQ6IGZ1bmN0aW9uKHNvdXJjZUlEKQorICAgIHNjcmlwdEZvclNvdXJjZUlE OiBmdW5jdGlvbihzb3VyY2VJZCkKICAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl9zY3JpcHRz W3NvdXJjZUlEXTsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3NjcmlwdHNbc291cmNlSWRdOwogICAg IH0sCiAKICAgICBzY3JpcHRzRm9yVVJMOiBmdW5jdGlvbih1cmwpCkBAIC0xMzcsMjAgKzEzNywy MCBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgcXVlcnlT Y3JpcHRzOiBmdW5jdGlvbihmaWx0ZXIpCiAgICAgewogICAgICAgICB2YXIgc2NyaXB0cyA9IFtd OwotICAgICAgICBmb3IgKHZhciBzb3VyY2VJRCBpbiB0aGlzLl9zY3JpcHRzKSB7Ci0gICAgICAg ICAgICB2YXIgc2NyaXB0ID0gdGhpcy5fc2NyaXB0c1tzb3VyY2VJRF07CisgICAgICAgIGZvciAo dmFyIHNvdXJjZUlkIGluIHRoaXMuX3NjcmlwdHMpIHsKKyAgICAgICAgICAgIHZhciBzY3JpcHQg PSB0aGlzLl9zY3JpcHRzW3NvdXJjZUlkXTsKICAgICAgICAgICAgIGlmIChmaWx0ZXIoc2NyaXB0 KSkKICAgICAgICAgICAgICAgICBzY3JpcHRzLnB1c2goc2NyaXB0KTsKICAgICAgICAgfQogICAg ICAgICByZXR1cm4gc2NyaXB0czsKICAgICB9LAogCi0gICAgZWRpdFNjcmlwdFNvdXJjZTogZnVu Y3Rpb24oc291cmNlSUQsIG5ld1NvdXJjZSwgY2FsbGJhY2spCisgICAgZWRpdFNjcmlwdFNvdXJj ZTogZnVuY3Rpb24oc291cmNlSWQsIG5ld1NvdXJjZSwgY2FsbGJhY2spCiAgICAgewotICAgICAg ICB0aGlzLl9zY3JpcHRzW3NvdXJjZUlEXS5lZGl0U291cmNlKG5ld1NvdXJjZSwgdGhpcy5fZGlk RWRpdFNjcmlwdFNvdXJjZS5iaW5kKHRoaXMsIHNvdXJjZUlELCBuZXdTb3VyY2UsIGNhbGxiYWNr KSk7CisgICAgICAgIHRoaXMuX3NjcmlwdHNbc291cmNlSWRdLmVkaXRTb3VyY2UobmV3U291cmNl LCB0aGlzLl9kaWRFZGl0U2NyaXB0U291cmNlLmJpbmQodGhpcywgc291cmNlSWQsIG5ld1NvdXJj ZSwgY2FsbGJhY2spKTsKICAgICB9LAogCi0gICAgX2RpZEVkaXRTY3JpcHRTb3VyY2U6IGZ1bmN0 aW9uKHNvdXJjZUlELCBuZXdTb3VyY2UsIGNhbGxiYWNrLCBlcnJvciwgY2FsbEZyYW1lcykKKyAg ICBfZGlkRWRpdFNjcmlwdFNvdXJjZTogZnVuY3Rpb24oc291cmNlSWQsIG5ld1NvdXJjZSwgY2Fs bGJhY2ssIGVycm9yLCBjYWxsRnJhbWVzKQogICAgIHsKICAgICAgICAgaWYgKCFlcnJvciAmJiBj YWxsRnJhbWVzICYmIGNhbGxGcmFtZXMubGVuZ3RoKQogICAgICAgICAgICAgdGhpcy5fZGVidWdn ZXJQYXVzZWREZXRhaWxzLmNhbGxGcmFtZXMgPSBjYWxsRnJhbWVzOwpAQCAtMTc5LDEwICsxNzks MTAgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwucHJvdG90eXBlID0gewogICAgICAgICB0 aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5F dmVudHMuRGVidWdnZXJSZXN1bWVkKTsKICAgICB9LAogCi0gICAgX3BhcnNlZFNjcmlwdFNvdXJj ZTogZnVuY3Rpb24oc291cmNlSUQsIHNvdXJjZVVSTCwgc3RhcnRMaW5lLCBzdGFydENvbHVtbiwg ZW5kTGluZSwgZW5kQ29sdW1uLCBpc0NvbnRlbnRTY3JpcHQpCisgICAgX3BhcnNlZFNjcmlwdFNv dXJjZTogZnVuY3Rpb24oc291cmNlSWQsIHNvdXJjZVVSTCwgc3RhcnRMaW5lLCBzdGFydENvbHVt biwgZW5kTGluZSwgZW5kQ29sdW1uLCBpc0NvbnRlbnRTY3JpcHQpCiAgICAgewotICAgICAgICB2 YXIgc2NyaXB0ID0gbmV3IFdlYkluc3BlY3Rvci5TY3JpcHQoc291cmNlSUQsIHNvdXJjZVVSTCwg c3RhcnRMaW5lLCBzdGFydENvbHVtbiwgZW5kTGluZSwgZW5kQ29sdW1uLCB1bmRlZmluZWQsIHVu ZGVmaW5lZCwgaXNDb250ZW50U2NyaXB0KTsKLSAgICAgICAgdGhpcy5fc2NyaXB0c1tzb3VyY2VJ RF0gPSBzY3JpcHQ7CisgICAgICAgIHZhciBzY3JpcHQgPSBuZXcgV2ViSW5zcGVjdG9yLlNjcmlw dChzb3VyY2VJZCwgc291cmNlVVJMLCBzdGFydExpbmUsIHN0YXJ0Q29sdW1uLCBlbmRMaW5lLCBl bmRDb2x1bW4sIHVuZGVmaW5lZCwgdW5kZWZpbmVkLCBpc0NvbnRlbnRTY3JpcHQpOworICAgICAg ICB0aGlzLl9zY3JpcHRzW3NvdXJjZUlkXSA9IHNjcmlwdDsKICAgICAgICAgdGhpcy5kaXNwYXRj aEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwuRXZlbnRzLlBhcnNl ZFNjcmlwdFNvdXJjZSwgc2NyaXB0KTsKICAgICB9LAogCkBAIC0yMjcsOSArMjI3LDkgQEAgV2Vi SW5zcGVjdG9yLkRlYnVnZ2VyRGlzcGF0Y2hlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMu X2RlYnVnZ2VyTW9kZWwuX2RlYnVnZ2VyV2FzRGlzYWJsZWQoKTsKICAgICB9LAogCi0gICAgc2Ny aXB0UGFyc2VkOiBmdW5jdGlvbihzb3VyY2VJRCwgc291cmNlVVJMLCBzdGFydExpbmUsIHN0YXJ0 Q29sdW1uLCBlbmRMaW5lLCBlbmRDb2x1bW4sIGlzQ29udGVudFNjcmlwdCkKKyAgICBzY3JpcHRQ YXJzZWQ6IGZ1bmN0aW9uKHNvdXJjZUlkLCBzb3VyY2VVUkwsIHN0YXJ0TGluZSwgc3RhcnRDb2x1 bW4sIGVuZExpbmUsIGVuZENvbHVtbiwgaXNDb250ZW50U2NyaXB0KQogICAgIHsKLSAgICAgICAg dGhpcy5fZGVidWdnZXJNb2RlbC5fcGFyc2VkU2NyaXB0U291cmNlKHNvdXJjZUlELCBzb3VyY2VV UkwsIHN0YXJ0TGluZSwgc3RhcnRDb2x1bW4sIGVuZExpbmUsIGVuZENvbHVtbiwgaXNDb250ZW50 U2NyaXB0KTsKKyAgICAgICAgdGhpcy5fZGVidWdnZXJNb2RlbC5fcGFyc2VkU2NyaXB0U291cmNl KHNvdXJjZUlkLCBzb3VyY2VVUkwsIHN0YXJ0TGluZSwgc3RhcnRDb2x1bW4sIGVuZExpbmUsIGVu ZENvbHVtbiwgaXNDb250ZW50U2NyaXB0KTsKICAgICB9LAogCiAgICAgc2NyaXB0RmFpbGVkVG9Q YXJzZTogZnVuY3Rpb24oc291cmNlVVJMLCBzb3VyY2UsIHN0YXJ0aW5nTGluZSwgZXJyb3JMaW5l LCBlcnJvck1lc3NhZ2UpCkBAIC0yMzcsOCArMjM3LDggQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2Vy RGlzcGF0Y2hlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2RlYnVnZ2VyTW9kZWwuX2Zh aWxlZFRvUGFyc2VTY3JpcHRTb3VyY2Uoc291cmNlVVJMLCBzb3VyY2UsIHN0YXJ0aW5nTGluZSwg ZXJyb3JMaW5lLCBlcnJvck1lc3NhZ2UpOwogICAgIH0sCiAKLSAgICBicmVha3BvaW50UmVzb2x2 ZWQ6IGZ1bmN0aW9uKGJyZWFrcG9pbnRJZCwgc291cmNlSUQsIGxpbmVOdW1iZXIsIGNvbHVtbk51 bWJlcikKKyAgICBicmVha3BvaW50UmVzb2x2ZWQ6IGZ1bmN0aW9uKGJyZWFrcG9pbnRJZCwgc291 cmNlSWQsIGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlcikKICAgICB7Ci0gICAgICAgIHRoaXMuX2Rl YnVnZ2VyTW9kZWwuX2JyZWFrcG9pbnRSZXNvbHZlZChicmVha3BvaW50SWQsIHNvdXJjZUlELCBs aW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIpOworICAgICAgICB0aGlzLl9kZWJ1Z2dlck1vZGVsLl9i cmVha3BvaW50UmVzb2x2ZWQoYnJlYWtwb2ludElkLCBzb3VyY2VJZCwgbGluZU51bWJlciwgY29s dW1uTnVtYmVyKTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKaW5kZXgg ZTgxMGZjNTgxODc1MWI4MWE0NzU2NmY1ZjJmMTQ2NjhhYzE4NWQ4YS4uN2QxYTgzMTlhM2E3MDk0 Y2M1MjY2ODVlZWU0Y2NhODFkYjkyMTQzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5q cwpAQCAtOTcsNyArOTcsNyBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2Rl bC5wcm90b3R5cGUgPSB7CiAKICAgICBfYWRkU2NyaXB0OiBmdW5jdGlvbihzY3JpcHQpCiAgICAg ewotICAgICAgICB2YXIgc291cmNlRmlsZUlkID0gdGhpcy5fY3JlYXRlU291cmNlRmlsZUlkKHNj cmlwdC5zb3VyY2VVUkwsIHNjcmlwdC5zb3VyY2VJRCk7CisgICAgICAgIHZhciBzb3VyY2VGaWxl SWQgPSB0aGlzLl9jcmVhdGVTb3VyY2VGaWxlSWQoc2NyaXB0LnNvdXJjZVVSTCwgc2NyaXB0LnNv dXJjZUlkKTsKICAgICAgICAgdmFyIHNvdXJjZUZpbGUgPSB0aGlzLl9zb3VyY2VGaWxlc1tzb3Vy Y2VGaWxlSWRdOwogICAgICAgICBpZiAoc291cmNlRmlsZSkgewogICAgICAgICAgICAgc291cmNl RmlsZS5hZGRTY3JpcHQoc2NyaXB0KTsKQEAgLTE2Niw3ICsxNjYsNyBAQCBXZWJJbnNwZWN0b3Iu RGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBvbGRT b3VyY2UgPSBzb3VyY2VGaWxlLnJlcXVlc3RDb250ZW50KGRpZFJlY2VpdmVTb3VyY2UuYmluZCh0 aGlzKSk7CiAgICAgICAgIGZ1bmN0aW9uIGRpZFJlY2VpdmVTb3VyY2Uob2xkU291cmNlKQogICAg ICAgICB7Ci0gICAgICAgICAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5lZGl0U2NyaXB0 U291cmNlKHNjcmlwdC5zb3VyY2VJRCwgbmV3U291cmNlLCBkaWRFZGl0U2NyaXB0U291cmNlLmJp bmQodGhpcywgb2xkU291cmNlKSk7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJN b2RlbC5lZGl0U2NyaXB0U291cmNlKHNjcmlwdC5zb3VyY2VJZCwgbmV3U291cmNlLCBkaWRFZGl0 U2NyaXB0U291cmNlLmJpbmQodGhpcywgb2xkU291cmNlKSk7CiAgICAgICAgIH0KICAgICB9LAog CkBAIC0zMzUsMTEgKzMzNSwxMSBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25N b2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGZ1bmN0aW9uIGRpZFJlcXVlc3RTb3VyY2VNYXBw aW5nKG1hcHBpbmcpCiAgICAgICAgIHsKICAgICAgICAgICAgIHZhciBsb2NhdGlvbiA9IG1hcHBp bmcuc291cmNlTGluZVRvU2NyaXB0TG9jYXRpb24oYnJlYWtwb2ludC5saW5lTnVtYmVyKTsKLSAg ICAgICAgICAgIHZhciBzY3JpcHQgPSBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5zY3JpcHRG b3JTb3VyY2VJRChsb2NhdGlvbi5zb3VyY2VJRCk7CisgICAgICAgICAgICB2YXIgc2NyaXB0ID0g V2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuc2NyaXB0Rm9yU291cmNlSUQobG9jYXRpb24uc291 cmNlSWQpOwogICAgICAgICAgICAgaWYgKHNjcmlwdC5zb3VyY2VVUkwpCiAgICAgICAgICAgICAg ICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuc2V0QnJlYWtwb2ludChzY3JpcHQuc291cmNl VVJMLCBsb2NhdGlvbi5saW5lTnVtYmVyLCBsb2NhdGlvbi5jb2x1bW5OdW1iZXIsIGJyZWFrcG9p bnQuY29uZGl0aW9uLCBkaWRTZXRCcmVha3BvaW50LmJpbmQodGhpcykpOwogICAgICAgICAgICAg ZWxzZSB7Ci0gICAgICAgICAgICAgICAgbG9jYXRpb24uc291cmNlSUQgPSBzY3JpcHQuc291cmNl SUQ7CisgICAgICAgICAgICAgICAgbG9jYXRpb24uc291cmNlSWQgPSBzY3JpcHQuc291cmNlSWQ7 CiAgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuc2V0QnJlYWtwb2lu dEJ5U291cmNlSWQobG9jYXRpb24sIGJyZWFrcG9pbnQuY29uZGl0aW9uLCBkaWRTZXRCcmVha3Bv aW50LmJpbmQodGhpcykpOwogICAgICAgICAgICAgfQogICAgICAgICB9CkBAIC01MjAsOSArNTIw LDkgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0g ewogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGNhbGxGcmFtZXMubGVuZ3RoOyArK2kpIHsK ICAgICAgICAgICAgIHZhciBjYWxsRnJhbWUgPSBjYWxsRnJhbWVzW2ldOwogICAgICAgICAgICAg dmFyIHNvdXJjZUZpbGU7Ci0gICAgICAgICAgICB2YXIgc2NyaXB0ID0gV2ViSW5zcGVjdG9yLmRl YnVnZ2VyTW9kZWwuc2NyaXB0Rm9yU291cmNlSUQoY2FsbEZyYW1lLmxvY2F0aW9uLnNvdXJjZUlE KTsKKyAgICAgICAgICAgIHZhciBzY3JpcHQgPSBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5z Y3JpcHRGb3JTb3VyY2VJRChjYWxsRnJhbWUubG9jYXRpb24uc291cmNlSWQpOwogICAgICAgICAg ICAgaWYgKHNjcmlwdCkKLSAgICAgICAgICAgICAgICBzb3VyY2VGaWxlID0gdGhpcy5fc291cmNl RmlsZUZvclNjcmlwdChzY3JpcHQuc291cmNlVVJMLCBzY3JpcHQuc291cmNlSUQpOworICAgICAg ICAgICAgICAgIHNvdXJjZUZpbGUgPSB0aGlzLl9zb3VyY2VGaWxlRm9yU2NyaXB0KHNjcmlwdC5z b3VyY2VVUkwsIHNjcmlwdC5zb3VyY2VJZCk7CiAgICAgICAgICAgICB0aGlzLl9wcmVzZW50YXRp b25DYWxsRnJhbWVzLnB1c2gobmV3IFdlYkluc3BlY3Rvci5QcmVzZW5hdGlvbkNhbGxGcmFtZShj YWxsRnJhbWUsIGksIHNvdXJjZUZpbGUpKTsKICAgICAgICAgfQogICAgICAgICB2YXIgZGV0YWls cyA9IFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmRlYnVnZ2VyUGF1c2VkRGV0YWlsczsKQEAg LTU1MCwyNCArNTUwLDI0IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVs LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMuX3ByZXNlbnRhdGlvbkNhbGxGcmFt ZXNbdGhpcy5fc2VsZWN0ZWRDYWxsRnJhbWVJbmRleF07CiAgICAgfSwKIAotICAgIF9zb3VyY2VG aWxlRm9yU2NyaXB0OiBmdW5jdGlvbihzb3VyY2VVUkwsIHNvdXJjZUlEKQorICAgIF9zb3VyY2VG aWxlRm9yU2NyaXB0OiBmdW5jdGlvbihzb3VyY2VVUkwsIHNvdXJjZUlkKQogICAgIHsKLSAgICAg ICAgcmV0dXJuIHRoaXMuX3NvdXJjZUZpbGVzW3RoaXMuX2NyZWF0ZVNvdXJjZUZpbGVJZChzb3Vy Y2VVUkwsIHNvdXJjZUlEKV07CisgICAgICAgIHJldHVybiB0aGlzLl9zb3VyY2VGaWxlc1t0aGlz Ll9jcmVhdGVTb3VyY2VGaWxlSWQoc291cmNlVVJMLCBzb3VyY2VJZCldOwogICAgIH0sCiAKICAg ICBfc2NyaXB0Rm9yU291cmNlRmlsZUlkOiBmdW5jdGlvbihzb3VyY2VGaWxlSWQpCiAgICAgewog ICAgICAgICBmdW5jdGlvbiBmaWx0ZXIoc2NyaXB0KQogICAgICAgICB7Ci0gICAgICAgICAgICBy ZXR1cm4gdGhpcy5fY3JlYXRlU291cmNlRmlsZUlkKHNjcmlwdC5zb3VyY2VVUkwsIHNjcmlwdC5z b3VyY2VJRCkgPT09IHNvdXJjZUZpbGVJZDsKKyAgICAgICAgICAgIHJldHVybiB0aGlzLl9jcmVh dGVTb3VyY2VGaWxlSWQoc2NyaXB0LnNvdXJjZVVSTCwgc2NyaXB0LnNvdXJjZUlkKSA9PT0gc291 cmNlRmlsZUlkOwogICAgICAgICB9CiAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuZGVidWdn ZXJNb2RlbC5xdWVyeVNjcmlwdHMoZmlsdGVyLmJpbmQodGhpcykpWzBdOwogICAgIH0sCiAKLSAg ICBfY3JlYXRlU291cmNlRmlsZUlkOiBmdW5jdGlvbihzb3VyY2VVUkwsIHNvdXJjZUlEKQorICAg IF9jcmVhdGVTb3VyY2VGaWxlSWQ6IGZ1bmN0aW9uKHNvdXJjZVVSTCwgc291cmNlSWQpCiAgICAg ewogICAgICAgICB2YXIgcHJlZml4ID0gdGhpcy5fZm9ybWF0U291cmNlRmlsZXMgPyAiZGVvYmZ1 c2NhdGVkOiIgOiAiIjsKLSAgICAgICAgcmV0dXJuIHByZWZpeCArIChzb3VyY2VVUkwgfHwgc291 cmNlSUQpOworICAgICAgICByZXR1cm4gcHJlZml4ICsgKHNvdXJjZVVSTCB8fCBzb3VyY2VJZCk7 CiAgICAgfSwKIAogICAgIF9yZXNldDogZnVuY3Rpb24oKQpAQCAtNjU0LDcgKzY1NCw3IEBAIFdl Ykluc3BlY3Rvci5QcmVzZW5hdGlvbkNhbGxGcmFtZSA9IGZ1bmN0aW9uKGNhbGxGcmFtZSwgaW5k ZXgsIHNvdXJjZUZpbGUpCiAgICAgdGhpcy5fY2FsbEZyYW1lID0gY2FsbEZyYW1lOwogICAgIHRo aXMuX2luZGV4ID0gaW5kZXg7CiAgICAgdGhpcy5fc291cmNlRmlsZSA9IHNvdXJjZUZpbGU7Ci0g ICAgdGhpcy5fc2NyaXB0ID0gV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuc2NyaXB0Rm9yU291 cmNlSUQoY2FsbEZyYW1lLmxvY2F0aW9uLnNvdXJjZUlEKTsKKyAgICB0aGlzLl9zY3JpcHQgPSBX ZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5zY3JpcHRGb3JTb3VyY2VJRChjYWxsRnJhbWUubG9j YXRpb24uc291cmNlSWQpOwogfQogCiBXZWJJbnNwZWN0b3IuUHJlc2VuYXRpb25DYWxsRnJhbWUu cHJvdG90eXBlID0gewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9OZXR3b3JrTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvTmV0d29ya01hbmFnZXIuanMKaW5kZXggNmFhZTY2YWYxMmRjZDM1Y2IzYjRhZjRkNzc1Mzg2 YTQ5NWUyMGJkYy4uMzZiOWVlMDRkMmQzOGIwNmJhNmI5NzZjMWM0ZDMxYmYxMWVjNGY1NSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdl ci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5h Z2VyLmpzCkBAIC05OCw3ICs5OCw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5w cm90b3R5cGUgPSB7CiAgICAgICAgICAgICByZXNvdXJjZS5yZXF1ZXN0SGVhZGVyc1RleHQgPSBy ZXNwb25zZS5yZXF1ZXN0SGVhZGVyc1RleHQ7CiAKICAgICAgICAgcmVzb3VyY2UuY29ubmVjdGlv blJldXNlZCA9IHJlc3BvbnNlLmNvbm5lY3Rpb25SZXVzZWQ7Ci0gICAgICAgIHJlc291cmNlLmNv bm5lY3Rpb25JRCA9IHJlc3BvbnNlLmNvbm5lY3Rpb25JRDsKKyAgICAgICAgcmVzb3VyY2UuY29u bmVjdGlvbklkID0gcmVzcG9uc2UuY29ubmVjdGlvbklkOwogCiAgICAgICAgIGlmIChyZXNwb25z ZS5mcm9tRGlza0NhY2hlKQogICAgICAgICAgICAgcmVzb3VyY2UuY2FjaGVkID0gdHJ1ZTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0LmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHQuanMKaW5kZXggMmNmYTQ4 M2ZlMjZjNjY2OTU1ZTNhMTYwMDM3MGUyMTM0MjAzZTEzNC4uNmVlNjhmY2QyMzA4YzRhZTZkYjE1 ZjBlN2FkMTc3MGQyNzg1MzU3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TY3JpcHQuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9TY3JpcHQuanMKQEAgLTIzLDkgKzIzLDkgQEAKICAqIE9GIFRISVMgU09GVFdBUkUsIEVW RU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAot V2ViSW5zcGVjdG9yLlNjcmlwdCA9IGZ1bmN0aW9uKHNvdXJjZUlELCBzb3VyY2VVUkwsIHN0YXJ0 TGluZSwgc3RhcnRDb2x1bW4sIGVuZExpbmUsIGVuZENvbHVtbiwgZXJyb3JMaW5lLCBlcnJvck1l c3NhZ2UsIGlzQ29udGVudFNjcmlwdCkKK1dlYkluc3BlY3Rvci5TY3JpcHQgPSBmdW5jdGlvbihz b3VyY2VJZCwgc291cmNlVVJMLCBzdGFydExpbmUsIHN0YXJ0Q29sdW1uLCBlbmRMaW5lLCBlbmRD b2x1bW4sIGVycm9yTGluZSwgZXJyb3JNZXNzYWdlLCBpc0NvbnRlbnRTY3JpcHQpCiB7Ci0gICAg dGhpcy5zb3VyY2VJRCA9IHNvdXJjZUlEOworICAgIHRoaXMuc291cmNlSWQgPSBzb3VyY2VJZDsK ICAgICB0aGlzLnNvdXJjZVVSTCA9IHNvdXJjZVVSTDsKICAgICB0aGlzLmxpbmVPZmZzZXQgPSBz dGFydExpbmU7CiAgICAgdGhpcy5jb2x1bW5PZmZzZXQgPSBzdGFydENvbHVtbjsKQEAgLTQ5LDcg KzQ5LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0 aGlzLl9zb3VyY2UgPSBzb3VyY2U7CiAgICAgICAgICAgICBjYWxsYmFjayh0aGlzLl9zb3VyY2Up OwogICAgICAgICB9Ci0gICAgICAgIERlYnVnZ2VyQWdlbnQuZ2V0U2NyaXB0U291cmNlKHRoaXMu c291cmNlSUQsIGRpZEdldFNjcmlwdFNvdXJjZS5iaW5kKHRoaXMpKTsKKyAgICAgICAgRGVidWdn ZXJBZ2VudC5nZXRTY3JpcHRTb3VyY2UodGhpcy5zb3VyY2VJZCwgZGlkR2V0U2NyaXB0U291cmNl LmJpbmQodGhpcykpOwogICAgIH0sCiAKICAgICBlZGl0U291cmNlOiBmdW5jdGlvbihuZXdTb3Vy Y2UsIGNhbGxiYWNrKQpAQCAtNjAsNiArNjAsNiBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0LnByb3Rv dHlwZSA9IHsKICAgICAgICAgICAgICAgICB0aGlzLl9zb3VyY2UgPSBuZXdTb3VyY2U7CiAgICAg ICAgICAgICBjYWxsYmFjayhlcnJvciwgY2FsbEZyYW1lcyk7CiAgICAgICAgIH0KLSAgICAgICAg RGVidWdnZXJBZ2VudC5lZGl0U2NyaXB0U291cmNlKHRoaXMuc291cmNlSUQsIG5ld1NvdXJjZSwg ZGlkRWRpdFNjcmlwdFNvdXJjZS5iaW5kKHRoaXMpKTsKKyAgICAgICAgRGVidWdnZXJBZ2VudC5l ZGl0U2NyaXB0U291cmNlKHRoaXMuc291cmNlSWQsIG5ld1NvdXJjZSwgZGlkRWRpdFNjcmlwdFNv dXJjZS5iaW5kKHRoaXMpKTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZpbGUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NvdXJjZUZpbGUuanMKaW5kZXggYjkzNjk0NjRkNDNkNzNhZjA5ZDI5ZjRm OTc2OTUwMDY2YTk0Yjg0Ny4uZWRlMDM3MDYwZmY0ODNhNTk4NTA1YWM3OTc4OTVjNTE2MTJiYzNi MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VG aWxlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRmls ZS5qcwpAQCAtOTMsMTAgKzkzLDEwIEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGaWxlLnByb3RvdHlw ZSA9IHsKIAogICAgICAgICBpZiAoIXRoaXMuX2NvbmNhdGVuYXRlZFNjcmlwdHMpCiAgICAgICAg ICAgICB0aGlzLl9jb25jYXRlbmF0ZWRTY3JpcHRzID0ge307Ci0gICAgICAgIGlmICh0aGlzLl9j b25jYXRlbmF0ZWRTY3JpcHRzW3NjcmlwdC5zb3VyY2VJRF0pCisgICAgICAgIGlmICh0aGlzLl9j b25jYXRlbmF0ZWRTY3JpcHRzW3NjcmlwdC5zb3VyY2VJZF0pCiAgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5fc2NyaXB0cy5sZW5ndGg7ICsraSkK LSAgICAgICAgICAgIHRoaXMuX2NvbmNhdGVuYXRlZFNjcmlwdHNbdGhpcy5fc2NyaXB0c1tpXS5z b3VyY2VJRF0gPSB0cnVlOworICAgICAgICAgICAgdGhpcy5fY29uY2F0ZW5hdGVkU2NyaXB0c1t0 aGlzLl9zY3JpcHRzW2ldLnNvdXJjZUlkXSA9IHRydWU7CiAKICAgICAgICAgdGhpcy5yZWxvYWQo KTsKIApAQCAtMTkyLDcgKzE5Miw3IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGaWxlLnByb3RvdHlw ZSA9IHsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIHZhciBlbmQgPSB7IGxpbmVOdW1iZXI6 IGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlcjogY29sdW1uTnVtYmVyIH07CiAgICAgICAgICAgICBp ZiAoc2NyaXB0KQotICAgICAgICAgICAgICAgIHNjcmlwdFJhbmdlcy5wdXNoKHsgc3RhcnQ6IHN0 YXJ0LCBlbmQ6IGVuZCwgc291cmNlSUQ6IHNjcmlwdC5zb3VyY2VJRCB9KTsKKyAgICAgICAgICAg ICAgICBzY3JpcHRSYW5nZXMucHVzaCh7IHN0YXJ0OiBzdGFydCwgZW5kOiBlbmQsIHNvdXJjZUlk OiBzY3JpcHQuc291cmNlSWQgfSk7CiAgICAgICAgIH0KIAogICAgICAgICB2YXIgc2NyaXB0T3Bl blRhZyA9ICI8c2NyaXB0PiI7CkBAIC0yODksNyArMjg5LDcgQEAgV2ViSW5zcGVjdG9yLlNvdXJj ZU1hcHBpbmcucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAg ICAgY2xvc2VzdFNjcmlwdCA9IHNjcmlwdDsKICAgICAgICAgfQotICAgICAgICByZXR1cm4geyBz b3VyY2VJRDogY2xvc2VzdFNjcmlwdC5zb3VyY2VJRCwgbGluZU51bWJlcjogbGluZU51bWJlciwg Y29sdW1uTnVtYmVyOiBjb2x1bW5OdW1iZXIgfTsKKyAgICAgICAgcmV0dXJuIHsgc291cmNlSWQ6 IGNsb3Nlc3RTY3JpcHQuc291cmNlSWQsIGxpbmVOdW1iZXI6IGxpbmVOdW1iZXIsIGNvbHVtbk51 bWJlcjogY29sdW1uTnVtYmVyIH07CiAgICAgfQogfQogCg==