100522 2012-10-26 07:44:00 -0700 Web Inspector: Some context menu items are duplicated on Resources and Sources panels. 2012-10-26 08:14:10 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 vsevik vsevik apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 752040 0 vsevik 2012-10-26 07:44:00 -0700 Patch to follow 752042 1 170926 vsevik 2012-10-26 07:47:08 -0700 Created attachment 170926 Patch 752065 2 170926 webkit.review.bot 2012-10-26 08:14:07 -0700 Comment on attachment 170926 Patch Clearing flags on attachment: 170926 Committed r132659: <http://trac.webkit.org/changeset/132659> 752066 3 webkit.review.bot 2012-10-26 08:14:10 -0700 All reviewed patches have been landed. Closing bug. 170926 2012-10-26 07:47:08 -0700 2012-10-26 08:14:07 -0700 Patch bug-100522-20121026184539.patch text/plain 38126 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyNTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2E5MGE1NGE4MTQzMmFk OWZlMWJlMDM1MTM1YWE3YjY5MzQ3ZGEzMC4uNzI0ZWY3Y2M5ZWI2ZjU1NDJiZGEwZWQyYzMyYzY4 NTFkNDA2ZGNhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDc3IEBACisyMDEyLTEwLTI2ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFNvbWUgY29udGV4dCBtZW51IGl0ZW1zIGFyZSBkdXBsaWNhdGVkIG9uIFJlc291cmNlcyBh bmQgU291cmNlcyBwYW5lbHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMDA1MjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBNZXRob2QgYXBwZW5kQXBwbGljYWJsZUl0ZW1zIG5vdyByZWNlaXZlcyBldmVu dCBhcyBhIHBhcmFtZXRlci4KKyAgICAgICAgSGFuZGxlclJlZ2lzdHJ5IG5vdyBtYWtlcyBzdXJl IHRoYXQgaXQgaXMgbm90IGNhbGxlZCBtb3JlIHRoYW4gb25jZSBmb3IgY2VydGFpbiBjb250ZXh0 IG1lbnUgZXZlbnQuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRz U2lkZWJhclBhbmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdEJyZWFrcG9p bnRzU2lkZWJhclBhbmUucHJvdG90eXBlLl9lbXB0eUVsZW1lbnRDb250ZXh0TWVudSk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdEJyZWFrcG9pbnRzU2lkZWJhclBhbmUucHJvdG90 eXBlLl9icmVha3BvaW50Q29udGV4dE1lbnUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlhIUkJy ZWFrcG9pbnRzU2lkZWJhclBhbmUucHJvdG90eXBlLl9lbXB0eUVsZW1lbnRDb250ZXh0TWVudSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuWEhSQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5wcm90b3R5 cGUuX2NvbnRleHRNZW51KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NhbGxTdGFj a1NpZGViYXJQYW5lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNhbGxTdGFja1NpZGViYXJQ YW5lLlBsYWNhcmQucHJvdG90eXBlLl9wbGFjYXJkQ29udGV4dE1lbnUpOgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9Db250ZXh0TWVudS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db250ZXh0TWVu dSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUucHJvdG90eXBlLnNob3cpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51LnByb3RvdHlwZS5hcHBlbmRBcHBsaWNh YmxlSXRlbXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51LlByb3ZpZGVyLnBy b3RvdHlwZS5hcHBlbmRBcHBsaWNhYmxlSXRlbXMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvQ29va2llSXRlbXNWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvb2tpZUl0 ZW1zVmlldy5wcm90b3R5cGUuX2NvbnRleHRNZW51KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL0RPTUJyZWFrcG9pbnRzU2lkZWJhclBhbmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuRE9NQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5wcm90b3R5cGUuX2NvbnRleHRNZW51KToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFHcmlkLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZS5fY29udGV4dE1lbnVJbkRhdGFUYWJsZSk6CisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9EZWZhdWx0VGV4dEVkaXRvci5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5EZWZhdWx0VGV4dEVkaXRvci5wcm90b3R5cGUuX2NvbnRleHRNZW51KToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUuX2NvbnRleHRNZW51RXZlbnRG aXJlZC5zZXQgZ2V0IHZhcik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50 c1BhbmVsRGVzY3JpcHRvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVs RGVzY3JpcHRvci5wcm90b3R5cGUuYXBwZW5kQXBwbGljYWJsZUl0ZW1zKToKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuRWxlbWVudHNUcmVlT3V0bGluZS5wcm90b3R5cGUuX2NvbnRleHRNZW51RXZlbnRG aXJlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9IYW5kbGVyUmVnaXN0cnkuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGFuZGxlclJlZ2lzdHJ5LnByb3RvdHlwZS5hcHBlbmRB cHBsaWNhYmxlSXRlbXMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvSW1hZ2VWaWV3 LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkltYWdlVmlldy5wcm90b3R5cGUuX2NvbnRleHRN ZW51KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL05hdmlnYXRvclZpZXcuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdG9yVmlldy5wcm90b3R5cGUuaGFuZGxlQ29udGV4 dE1lbnUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtMb2dWaWV3LnByb3RvdHlwZS5fY29udGV4dE1l bnUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsRGVzY3JpcHRv ci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrUGFuZWxEZXNjcmlwdG9yLnByb3Rv dHlwZS5hcHBlbmRBcHBsaWNhYmxlSXRlbXMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvT2JqZWN0UHJvcGVydGllc1NlY3Rpb24uanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuT2Jq ZWN0UHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlLl9jb250ZXh0TWVudUV2ZW50RmlyZWQpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLk9iamVjdFByb3BlcnR5VHJlZUVsZW1lbnQucHJvdG90eXBl Ll9jb250ZXh0TWVudUZpcmVkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2Zp bGVzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5 cGUuX2hhbmRsZUNvbnRleHRNZW51RXZlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2Zp bGVTaWRlYmFyVHJlZUVsZW1lbnQucHJvdG90eXBlLmhhbmRsZUNvbnRleHRNZW51RXZlbnQpOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRnJhbWVSZXNvdXJjZVRyZWVFbGVtZW50LnByb3RvdHlwZS5faGFuZGxl Q29udGV4dE1lbnVFdmVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSW5kZXhlZERCVHJlZUVs ZW1lbnQucHJvdG90eXBlLl9oYW5kbGVDb250ZXh0TWVudUV2ZW50KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5GaWxlU3lzdGVtTGlzdFRyZWVFbGVtZW50LnByb3RvdHlwZS5faGFuZGxlQ29udGV4 dE1lbnVFdmVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSURCRGF0YWJhc2VUcmVlRWxlbWVu dC5wcm90b3R5cGUuX2hhbmRsZUNvbnRleHRNZW51RXZlbnQpOgorICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvU2NyaXB0c05hdmlnYXRvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T bmlwcGV0c05hdmlnYXRvclZpZXcucHJvdG90eXBlLmhhbmRsZUNvbnRleHRNZW51KToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLmFwcGVuZEFwcGxpY2FibGVJdGVtcyk6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWxEZXNjcmlwdG9yLmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbERlc2NyaXB0b3IucHJvdG90eXBlLmFw cGVuZEFwcGxpY2FibGVJdGVtcyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TdHls ZXNTaWRlYmFyUGFuZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZXNTaWRlYmFyUGFu ZS5wcm90b3R5cGUuX2NvbnRleHRNZW51RXZlbnRGaXJlZCk6CisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9UYWJiZWRQYW5lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYmJlZFBh bmVUYWIucHJvdG90eXBlLl90YWJDb250ZXh0TWVudSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9UaW1lbGluZVBhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5l UGFuZWwucHJvdG90eXBlLl9jb250ZXh0TWVudSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9XYXRjaEV4cHJlc3Npb25zU2lkZWJhclBhbmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuV2F0Y2hFeHByZXNzaW9uc1NlY3Rpb24ucHJvdG90eXBlLl9lbXB0eUVsZW1lbnRDb250ZXh0 TWVudSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuV2F0Y2hFeHByZXNzaW9uVHJlZUVsZW1lbnQu cHJvdG90eXBlLl9jb250ZXh0TWVudSk6CisKIDIwMTItMTAtMjYgIEV1Z2VuZSBLbHl1Y2huaWtv diAgPGV1c3Rhcy5idWdAZ21haWwuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IERvY3R5 cGUgQXVkaXRzIHBhbmVsIGNvZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5qcwppbmRleCBkNjdhMWRj YjVkZTk0NzY3MmNhMTFjYzJiMjViZDgyNDk4OGFkYmVjLi5hZmE0NTc3OTdkYjYwNzdiYTZkOGJj ZDI1NzZiYzRiNzRlYjhkMGVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0JyZWFrcG9pbnRzU2lkZWJhclBhbmUuanMKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50c1NpZGViYXJQYW5lLmpzCkBAIC01OSwxMSAr NTksMTEgQEAgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRCcmVha3BvaW50c1NpZGViYXJQYW5lID0g ZnVuY3Rpb24oYnJlYWtwb2ludE1hbmFnZXIsIHNob3cKIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0 QnJlYWtwb2ludHNTaWRlYmFyUGFuZS5wcm90b3R5cGUgPSB7CiAgICAgX2VtcHR5RWxlbWVudENv bnRleHRNZW51OiBmdW5jdGlvbihldmVudCkKICAgICB7Ci0gICAgICAgIHZhciBjb250ZXh0TWVu dSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUoKTsKKyAgICAgICAgdmFyIGNvbnRleHRN ZW51ID0gbmV3IFdlYkluc3BlY3Rvci5Db250ZXh0TWVudShldmVudCk7CiAgICAgICAgIHZhciBi cmVha3BvaW50QWN0aXZlID0gV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuYnJlYWtwb2ludHNB Y3RpdmUoKTsKICAgICAgICAgdmFyIGJyZWFrcG9pbnRBY3RpdmVUaXRsZSA9IFdlYkluc3BlY3Rv ci5VSVN0cmluZyhicmVha3BvaW50QWN0aXZlID8gIkRlYWN0aXZhdGUgQnJlYWtwb2ludHMiIDog IkFjdGl2YXRlIEJyZWFrcG9pbnRzIik7CiAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0o YnJlYWtwb2ludEFjdGl2ZVRpdGxlLCBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5zZXRCcmVh a3BvaW50c0FjdGl2ZS5iaW5kKFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLCAhYnJlYWtwb2lu dEFjdGl2ZSkpOwotICAgICAgICBjb250ZXh0TWVudS5zaG93KGV2ZW50KTsKKyAgICAgICAgY29u dGV4dE1lbnUuc2hvdygpOwogICAgIH0sCiAKICAgICAvKioKQEAgLTE4OSw3ICsxODksNyBAQCBX ZWJJbnNwZWN0b3IuSmF2YVNjcmlwdEJyZWFrcG9pbnRzU2lkZWJhclBhbmUucHJvdG90eXBlID0g ewogICAgIF9icmVha3BvaW50Q29udGV4dE1lbnU6IGZ1bmN0aW9uKGJyZWFrcG9pbnQsIGV2ZW50 KQogICAgIHsKICAgICAgICAgdmFyIGJyZWFrcG9pbnRzID0gdGhpcy5faXRlbXMudmFsdWVzKCk7 Ci0gICAgICAgIHZhciBjb250ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUo KTsKKyAgICAgICAgdmFyIGNvbnRleHRNZW51ID0gbmV3IFdlYkluc3BlY3Rvci5Db250ZXh0TWVu dShldmVudCk7CiAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJSZW1vdmUgQnJlYWtwb2ludCIpLCBicmVha3BvaW50LnJlbW92ZS5iaW5kKGJyZWFr cG9pbnQpKTsKICAgICAgICAgaWYgKGJyZWFrcG9pbnRzLmxlbmd0aCA+IDEpIHsKICAgICAgICAg ICAgIHZhciByZW1vdmVBbGxUaXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZyhXZWJJbnNwZWN0 b3IudXNlTG93ZXJDYXNlTWVudVRpdGxlcygpID8gIlJlbW92ZSBhbGwgYnJlYWtwb2ludHMiIDog IlJlbW92ZSBBbGwgQnJlYWtwb2ludHMiKTsKQEAgLTIyMSw3ICsyMjEsNyBAQCBXZWJJbnNwZWN0 b3IuSmF2YVNjcmlwdEJyZWFrcG9pbnRzU2lkZWJhclBhbmUucHJvdG90eXBlID0gewogICAgICAg ICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShkaXNhYmxlVGl0bGUsIHRoaXMuX2JyZWFrcG9p bnRNYW5hZ2VyLnRvZ2dsZUFsbEJyZWFrcG9pbnRzLmJpbmQodGhpcy5fYnJlYWtwb2ludE1hbmFn ZXIsIGZhbHNlKSwgIShlbmFibGVCcmVha3BvaW50Q291bnQgPiAxKSk7CiAgICAgICAgIH0KIAot ICAgICAgICBjb250ZXh0TWVudS5zaG93KGV2ZW50KTsKKyAgICAgICAgY29udGV4dE1lbnUuc2hv dygpOwogICAgIH0sCiAKICAgICBfYWRkTGlzdEVsZW1lbnQ6IGZ1bmN0aW9uKGVsZW1lbnQsIGJl Zm9yZUVsZW1lbnQpCkBAIC0yOTUsOSArMjk1LDkgQEAgV2ViSW5zcGVjdG9yLlhIUkJyZWFrcG9p bnRzU2lkZWJhclBhbmUgPSBmdW5jdGlvbigpCiBXZWJJbnNwZWN0b3IuWEhSQnJlYWtwb2ludHNT aWRlYmFyUGFuZS5wcm90b3R5cGUgPSB7CiAgICAgX2VtcHR5RWxlbWVudENvbnRleHRNZW51OiBm dW5jdGlvbihldmVudCkKICAgICB7Ci0gICAgICAgIHZhciBjb250ZXh0TWVudSA9IG5ldyBXZWJJ bnNwZWN0b3IuQ29udGV4dE1lbnUoKTsKKyAgICAgICAgdmFyIGNvbnRleHRNZW51ID0gbmV3IFdl Ykluc3BlY3Rvci5Db250ZXh0TWVudShldmVudCk7CiAgICAgICAgIGNvbnRleHRNZW51LmFwcGVu ZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJBZGQgQnJlYWtwb2ludCIpLCB0aGlzLl9hZGRC dXR0b25DbGlja2VkLmJpbmQodGhpcykpOwotICAgICAgICBjb250ZXh0TWVudS5zaG93KGV2ZW50 KTsKKyAgICAgICAgY29udGV4dE1lbnUuc2hvdygpOwogICAgIH0sCiAKICAgICBfYWRkQnV0dG9u Q2xpY2tlZDogZnVuY3Rpb24oZXZlbnQpCkBAIC0zODEsNyArMzgxLDcgQEAgV2ViSW5zcGVjdG9y LlhIUkJyZWFrcG9pbnRzU2lkZWJhclBhbmUucHJvdG90eXBlID0gewogCiAgICAgX2NvbnRleHRN ZW51OiBmdW5jdGlvbih1cmwsIGV2ZW50KQogICAgIHsKLSAgICAgICAgdmFyIGNvbnRleHRNZW51 ID0gbmV3IFdlYkluc3BlY3Rvci5Db250ZXh0TWVudSgpOworICAgICAgICB2YXIgY29udGV4dE1l bnUgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51KGV2ZW50KTsKICAgICAgICAgZnVuY3Rp b24gcmVtb3ZlQnJlYWtwb2ludCgpCiAgICAgICAgIHsKICAgICAgICAgICAgIHRoaXMuX3JlbW92 ZUJyZWFrcG9pbnQodXJsKTsKQEAgLTM5OCw3ICszOTgsNyBAQCBXZWJJbnNwZWN0b3IuWEhSQnJl YWtwb2ludHNTaWRlYmFyUGFuZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIGNvbnRleHRNZW51LmFw cGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJBZGQgQnJlYWtwb2ludCIpLCB0aGlzLl9h ZGRCdXR0b25DbGlja2VkLmJpbmQodGhpcykpOwogICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJ dGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVtb3ZlIEJyZWFrcG9pbnQiKSwgcmVtb3ZlQnJl YWtwb2ludC5iaW5kKHRoaXMpKTsKICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShyZW1v dmVBbGxUaXRsZSwgcmVtb3ZlQWxsQnJlYWtwb2ludHMuYmluZCh0aGlzKSk7Ci0gICAgICAgIGNv bnRleHRNZW51LnNob3coZXZlbnQpOworICAgICAgICBjb250ZXh0TWVudS5zaG93KCk7CiAgICAg fSwKIAogICAgIF9jaGVja2JveENsaWNrZWQ6IGZ1bmN0aW9uKHVybCwgZXZlbnQpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NhbGxTdGFja1NpZGViYXJQ YW5lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DYWxsU3RhY2tTaWRl YmFyUGFuZS5qcwppbmRleCA5YzcxZWRiNjk1ZDI2OTEzMjBkOTYyZDQ0YTkxOTY0OGE3MTkxMDQx Li5jMDY1YzkwNjc2OTEwOThiZWE5Y2RlMjY5YzBmMTM3NTNjNTM4MGNjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NhbGxTdGFja1NpZGViYXJQYW5lLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ2FsbFN0YWNrU2lkZWJh clBhbmUuanMKQEAgLTE4Myw3ICsxODMsNyBAQCBXZWJJbnNwZWN0b3IuQ2FsbFN0YWNrU2lkZWJh clBhbmUuUGxhY2FyZC5wcm90b3R5cGUgPSB7CiAKICAgICBfcGxhY2FyZENvbnRleHRNZW51OiBm dW5jdGlvbihldmVudCkKICAgICB7Ci0gICAgICAgIHZhciBjb250ZXh0TWVudSA9IG5ldyBXZWJJ bnNwZWN0b3IuQ29udGV4dE1lbnUoKTsKKyAgICAgICAgdmFyIGNvbnRleHRNZW51ID0gbmV3IFdl Ykluc3BlY3Rvci5Db250ZXh0TWVudShldmVudCk7CiAKICAgICAgICAgaWYgKFdlYkluc3BlY3Rv ci5kZWJ1Z2dlck1vZGVsLmNhblNldFNjcmlwdFNvdXJjZSgpKSB7CiAgICAgICAgICAgICBjb250 ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVzdGFydCBGcmFtZSIp LCB0aGlzLl9yZXN0YXJ0RnJhbWUuYmluZCh0aGlzKSk7CkBAIC0xOTEsNyArMTkxLDcgQEAgV2Vi SW5zcGVjdG9yLkNhbGxTdGFja1NpZGViYXJQYW5lLlBsYWNhcmQucHJvdG90eXBlID0gewogICAg ICAgICB9CiAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJDb3B5IFN0YWNrIFRyYWNlIiksIHRoaXMuX3BhbmUuX2NvcHlTdGFja1RyYWNlLmJpbmQo dGhpcy5fcGFuZSkpOwogCi0gICAgICAgIGNvbnRleHRNZW51LnNob3coZXZlbnQpOworICAgICAg ICBjb250ZXh0TWVudS5zaG93KCk7CiAgICAgfSwKIAogICAgIF9yZXN0YXJ0RnJhbWU6IGZ1bmN0 aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29u c29sZVZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVW aWV3LmpzCmluZGV4IGVlYjVjZjJkZTY2ZWQzMzI5NjRjYzMyYjMzMzhhMTI2NWQ0ODNmYTQuLjU4 NmYxOGUxMWI4MDkyYjg1OWRiYjk0NzYyNDlhMTI4YTY4YWMwY2UgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcwpAQCAtNDQxLDcgKzQ0 MSw3IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlm IChldmVudC50YXJnZXQuZW5jbG9zaW5nTm9kZU9yU2VsZldpdGhOb2RlTmFtZSgiYSIpKQogICAg ICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHZhciBjb250ZXh0TWVudSA9IG5ldyBXZWJJbnNw ZWN0b3IuQ29udGV4dE1lbnUoKTsKKyAgICAgICAgdmFyIGNvbnRleHRNZW51ID0gbmV3IFdlYklu c3BlY3Rvci5Db250ZXh0TWVudShldmVudCk7CiAKICAgICAgICAgZnVuY3Rpb24gbW9uaXRvcmlu Z1hIUkl0ZW1BY3Rpb24oKQogICAgICAgICB7CkBAIC00NTcsNyArNDU3LDcgQEAgV2ViSW5zcGVj dG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgICAgICBjb250ZXh0TWVudS5hcHBl bmRTZXBhcmF0b3IoKTsKICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoV2ViSW5zcGVjdG9yLnVzZUxvd2VyQ2FzZU1lbnVUaXRsZXMoKSA/ICJDbGVh ciBjb25zb2xlIiA6ICJDbGVhciBDb25zb2xlIiksIHRoaXMuX3JlcXVlc3RDbGVhck1lc3NhZ2Vz LmJpbmQodGhpcykpOwotICAgICAgICBjb250ZXh0TWVudS5zaG93KGV2ZW50KTsKKyAgICAgICAg Y29udGV4dE1lbnUuc2hvdygpOwogICAgIH0sCiAKICAgICBfbW9uaXRvcmluZ1hIUkVuYWJsZWRT ZXR0aW5nQ2hhbmdlZDogZnVuY3Rpb24oZXZlbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnRleHRNZW51LmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Db250ZXh0TWVudS5qcwppbmRleCBkZWVjYzI3NGU4ZDcxNDZhMWM5 Y2I4N2Q4YzJmZjhiOTk4MDBjNjU1Li4wNjUzNWI0YjI5Nzg0NjE1ZGMyNWM3ZTczYmFkMjk4YmY4 OTM5ZDIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Nv bnRleHRNZW51LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29u dGV4dE1lbnUuanMKQEAgLTE1Miw4ICsxNTIsOSBAQCBXZWJJbnNwZWN0b3IuQ29udGV4dFN1Yk1l bnVJdGVtLnByb3RvdHlwZSA9IHsKICAqIEBjb25zdHJ1Y3RvcgogICogQGV4dGVuZHMge1dlYklu c3BlY3Rvci5Db250ZXh0U3ViTWVudUl0ZW19CiAgKi8KLVdlYkluc3BlY3Rvci5Db250ZXh0TWVu dSA9IGZ1bmN0aW9uKCkgeworV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51ID0gZnVuY3Rpb24oZXZl bnQpIHsKICAgICBXZWJJbnNwZWN0b3IuQ29udGV4dFN1Yk1lbnVJdGVtLmNhbGwodGhpcywgdGhp cywgIiIpOworICAgIHRoaXMuX2V2ZW50ID0gZXZlbnQ7CiAgICAgdGhpcy5faGFuZGxlcnMgPSB7 fTsKICAgICB0aGlzLl9pZCA9IDA7CiB9CkBAIC0xNjQsMTUgKzE2NSwxNSBAQCBXZWJJbnNwZWN0 b3IuQ29udGV4dE1lbnUucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gdGhpcy5faWQrKzsK ICAgICB9LAogCi0gICAgc2hvdzogZnVuY3Rpb24oZXZlbnQpCisgICAgc2hvdzogZnVuY3Rpb24o KQogICAgIHsKICAgICAgICAgdmFyIG1lbnVPYmplY3QgPSB0aGlzLl9idWlsZERlc2NyaXB0b3Io KTsKIAogICAgICAgICBpZiAobWVudU9iamVjdC5sZW5ndGgpIHsKICAgICAgICAgICAgIFdlYklu c3BlY3Rvci5fY29udGV4dE1lbnUgPSB0aGlzOwotICAgICAgICAgICAgSW5zcGVjdG9yRnJvbnRl bmRIb3N0LnNob3dDb250ZXh0TWVudShldmVudCwgbWVudU9iamVjdCk7CisgICAgICAgICAgICBJ bnNwZWN0b3JGcm9udGVuZEhvc3Quc2hvd0NvbnRleHRNZW51KHRoaXMuX2V2ZW50LCBtZW51T2Jq ZWN0KTsKICAgICAgICAgfQotICAgICAgICBldmVudC5jb25zdW1lKCk7CisgICAgICAgIHRoaXMu X2V2ZW50LmNvbnN1bWUoKTsKICAgICB9LAogCiAgICAgX3NldEhhbmRsZXI6IGZ1bmN0aW9uKGlk LCBoYW5kbGVyKQpAQCAtMjAzLDcgKzIwNCw3IEBAIFdlYkluc3BlY3Rvci5Db250ZXh0TWVudS5w cm90b3R5cGUgPSB7CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgV2ViSW5zcGVjdG9yLkNv bnRleHRNZW51Ll9wcm92aWRlcnMubGVuZ3RoOyArK2kpIHsKICAgICAgICAgICAgIHZhciBwcm92 aWRlciA9IFdlYkluc3BlY3Rvci5Db250ZXh0TWVudS5fcHJvdmlkZXJzW2ldOwogICAgICAgICAg ICAgdGhpcy5hcHBlbmRTZXBhcmF0b3IoKTsKLSAgICAgICAgICAgIHByb3ZpZGVyLmFwcGVuZEFw cGxpY2FibGVJdGVtcyh0aGlzLCB0YXJnZXQpOworICAgICAgICAgICAgcHJvdmlkZXIuYXBwZW5k QXBwbGljYWJsZUl0ZW1zKHRoaXMuX2V2ZW50LCB0aGlzLCB0YXJnZXQpOwogICAgICAgICAgICAg dGhpcy5hcHBlbmRTZXBhcmF0b3IoKTsKICAgICAgICAgfQogICAgIH0sCkBAIC0yMjIsNyArMjIz LDcgQEAgV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51LlByb3ZpZGVyLnByb3RvdHlwZSA9IHsKICAg ICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5Db250ZXh0TWVudX0gY29udGV4dE1lbnUKICAgICAg KiBAcGFyYW0ge09iamVjdH0gdGFyZ2V0CiAgICAgICovCi0gICAgYXBwZW5kQXBwbGljYWJsZUl0 ZW1zOiBmdW5jdGlvbihjb250ZXh0TWVudSwgdGFyZ2V0KSB7IH0KKyAgICBhcHBlbmRBcHBsaWNh YmxlSXRlbXM6IGZ1bmN0aW9uKGV2ZW50LCBjb250ZXh0TWVudSwgdGFyZ2V0KSB7IH0KIH0KIAog LyoqCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Nvb2tp ZUl0ZW1zVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29va2ll SXRlbXNWaWV3LmpzCmluZGV4IDlmYTIzNTQ3YTAzZmRhZDg3MGQ5YjMzNjNiNTU4YmYxOTI2MDZl NzMuLjA5NDE4MjdiNjRhOGM5OGIyYWJiYzEyYTMzOGExNGNlNjhjZTI1NjUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29va2llSXRlbXNWaWV3LmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29va2llSXRlbXNWaWV3Lmpz CkBAIC0xNTEsOSArMTUxLDkgQEAgV2ViSW5zcGVjdG9yLkNvb2tpZUl0ZW1zVmlldy5wcm90b3R5 cGUgPSB7CiAgICAgX2NvbnRleHRNZW51OiBmdW5jdGlvbihldmVudCkKICAgICB7CiAgICAgICAg IGlmICghdGhpcy5fY29va2llcy5sZW5ndGgpIHsKLSAgICAgICAgICAgIHZhciBjb250ZXh0TWVu dSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUoKTsKKyAgICAgICAgICAgIHZhciBjb250 ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUoZXZlbnQpOwogICAgICAgICAg ICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJlZnJlc2gi KSwgdGhpcy5fdXBkYXRlLmJpbmQodGhpcykpOwotICAgICAgICAgICAgY29udGV4dE1lbnUuc2hv dyhldmVudCk7CisgICAgICAgICAgICBjb250ZXh0TWVudS5zaG93KCk7CiAgICAgICAgIH0KICAg ICB9LAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RP TUJyZWFrcG9pbnRzU2lkZWJhclBhbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0RPTUJyZWFrcG9pbnRzU2lkZWJhclBhbmUuanMKaW5kZXggYzFiMzU1ZTkwYWZmZmU2 NDMxMjVkNGJjN2MyODk5YzFiMWYwYWVjZS4uZTk3Nzg5NmQ0NGQxODE1ZjQ0MjUyN2UwYjdmM2Yw NDRjYzVlOTQyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9ET01CcmVha3BvaW50c1NpZGViYXJQYW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvRE9NQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5qcwpAQCAtMjM2LDcgKzIz Niw3IEBAIFdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50c1NpZGViYXJQYW5lLnByb3RvdHlwZSA9 IHsKIAogICAgIF9jb250ZXh0TWVudTogZnVuY3Rpb24obm9kZSwgdHlwZSwgZXZlbnQpCiAgICAg ewotICAgICAgICB2YXIgY29udGV4dE1lbnUgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51 KCk7CisgICAgICAgIHZhciBjb250ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1l bnUoZXZlbnQpOwogICAgICAgICBmdW5jdGlvbiByZW1vdmVCcmVha3BvaW50KCkKICAgICAgICAg ewogICAgICAgICAgICAgdGhpcy5fcmVtb3ZlQnJlYWtwb2ludChub2RlLCB0eXBlKTsKQEAgLTI0 NCw3ICsyNDQsNyBAQCBXZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5wcm90 b3R5cGUgPSB7CiAgICAgICAgIH0KICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIlJlbW92ZSBCcmVha3BvaW50IiksIHJlbW92ZUJyZWFrcG9pbnQu YmluZCh0aGlzKSk7CiAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9y LlVJU3RyaW5nKFdlYkluc3BlY3Rvci51c2VMb3dlckNhc2VNZW51VGl0bGVzKCkgPyAiUmVtb3Zl IGFsbCBET00gYnJlYWtwb2ludHMiIDogIlJlbW92ZSBBbGwgRE9NIEJyZWFrcG9pbnRzIiksIHRo aXMuX3JlbW92ZUFsbEJyZWFrcG9pbnRzLmJpbmQodGhpcykpOwotICAgICAgICBjb250ZXh0TWVu dS5zaG93KGV2ZW50KTsKKyAgICAgICAgY29udGV4dE1lbnUuc2hvdygpOwogICAgIH0sCiAKICAg ICBfY2hlY2tib3hDbGlja2VkOiBmdW5jdGlvbihub2RlLCB0eXBlLCBldmVudCkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGF0YUdyaWQuanMgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFHcmlkLmpzCmluZGV4IDExNGQ4MmQ5 MGU1ODA5MTZlZjk3OTEzZjJiYWM2ZDNkMjlmYmI0ZWEuLjI0YTM0OTc1MmM2ODdjOGM3MzhlODMy MTg2ZWJmMjAwMGUxZjVmOWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvRGF0YUdyaWQuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9EYXRhR3JpZC5qcwpAQCAtODc4LDcgKzg3OCw3IEBAIFdlYkluc3BlY3Rvci5EYXRhR3Jp ZC5wcm90b3R5cGUgPSB7CiAKICAgICBfY29udGV4dE1lbnVJbkRhdGFUYWJsZTogZnVuY3Rpb24o ZXZlbnQpCiAgICAgewotICAgICAgICB2YXIgY29udGV4dE1lbnUgPSBuZXcgV2ViSW5zcGVjdG9y LkNvbnRleHRNZW51KCk7CisgICAgICAgIHZhciBjb250ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0 b3IuQ29udGV4dE1lbnUoZXZlbnQpOwogCiAgICAgICAgIHZhciBncmlkTm9kZSA9IHRoaXMuZGF0 YUdyaWROb2RlRnJvbU5vZGUoZXZlbnQudGFyZ2V0KTsKICAgICAgICAgaWYgKHRoaXMuX3JlZnJl c2hDYWxsYmFjayAmJiAoIWdyaWROb2RlIHx8IGdyaWROb2RlICE9PSB0aGlzLmNyZWF0aW9uTm9k ZSkpCkBAIC04OTYsNyArODk2LDcgQEAgV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZSA9 IHsKICAgICAgICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5V SVN0cmluZygiRGVsZXRlIiksIHRoaXMuX2RlbGV0ZUNhbGxiYWNrLmJpbmQodGhpcywgZ3JpZE5v ZGUpKTsKICAgICAgICAgfQogCi0gICAgICAgIGNvbnRleHRNZW51LnNob3coZXZlbnQpOworICAg ICAgICBjb250ZXh0TWVudS5zaG93KCk7CiAgICAgfSwKIAogICAgIF9jbGlja0luRGF0YVRhYmxl OiBmdW5jdGlvbihldmVudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvRGVmYXVsdFRleHRFZGl0b3IuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0RlZmF1bHRUZXh0RWRpdG9yLmpzCmluZGV4IGE0MWRkODAyODk4MTIwOWEwZDIy YzFkYTRlNzhjODc2NzYxZmM0NjcuLjIwZWRhODM3ZWI5MGZjZmU3ODFjZDlmNTRhN2UyODYyYzkz YjRhMGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVm YXVsdFRleHRFZGl0b3IuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9EZWZhdWx0VGV4dEVkaXRvci5qcwpAQCAtNDE4LDcgKzQxOCw3IEBAIFdlYkluc3BlY3Rvci5E ZWZhdWx0VGV4dEVkaXRvci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBhbmNob3IgPSBldmVu dC50YXJnZXQuZW5jbG9zaW5nTm9kZU9yU2VsZldpdGhOb2RlTmFtZSgiYSIpOwogICAgICAgICBp ZiAoYW5jaG9yKQogICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB2YXIgY29udGV4dE1lbnUg PSBuZXcgV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51KCk7CisgICAgICAgIHZhciBjb250ZXh0TWVu dSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUoZXZlbnQpOwogICAgICAgICB2YXIgdGFy Z2V0ID0gZXZlbnQudGFyZ2V0LmVuY2xvc2luZ05vZGVPclNlbGZXaXRoQ2xhc3MoIndlYmtpdC1s aW5lLW51bWJlciIpOwogICAgICAgICBpZiAodGFyZ2V0KQogICAgICAgICAgICAgdGhpcy5fZGVs ZWdhdGUucG9wdWxhdGVMaW5lR3V0dGVyQ29udGV4dE1lbnUoY29udGV4dE1lbnUsIHRhcmdldC5s aW5lTnVtYmVyKTsKQEAgLTQyNiw3ICs0MjYsNyBAQCBXZWJJbnNwZWN0b3IuRGVmYXVsdFRleHRF ZGl0b3IucHJvdG90eXBlID0gewogICAgICAgICAgICAgdGFyZ2V0ID0gdGhpcy5fbWFpblBhbmVs Ll9lbmNsb3NpbmdMaW5lUm93T3JTZWxmKGV2ZW50LnRhcmdldCk7CiAgICAgICAgICAgICB0aGlz Ll9kZWxlZ2F0ZS5wb3B1bGF0ZVRleHRBcmVhQ29udGV4dE1lbnUoY29udGV4dE1lbnUsIHRhcmdl dCAmJiB0YXJnZXQubGluZU51bWJlcik7CiAgICAgICAgIH0KLSAgICAgICAgY29udGV4dE1lbnUu c2hvdyhldmVudCk7CisgICAgICAgIGNvbnRleHRNZW51LnNob3coKTsKICAgICB9LAogCiAgICAg X2hhbmRsZVNjcm9sbENoYW5nZWQ6IGZ1bmN0aW9uKGV2ZW50KQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzCmluZGV4IGI3YmIyZjZh Y2I2MDlkOTJiNDllMTMxNTg0NmI1NTc2YzQyMmM1YmUuLjM0MjdmYjNmMTI0MGMzMDA2YzMzZjVk Mjk1MThiZDY4M2IxZWY3M2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvRWxlbWVudHNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwuanMKQEAgLTMzOCw3ICszMzgsNyBAQCBXZWJJbnNwZWN0 b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBXZWJJbnNwZWN0b3Iu c2V0dGluZ3MuZG9tV29yZFdyYXAuc2V0KCFXZWJJbnNwZWN0b3Iuc2V0dGluZ3MuZG9tV29yZFdy YXAuZ2V0KCkpOwogICAgICAgICB9CiAKLSAgICAgICAgdmFyIGNvbnRleHRNZW51ID0gbmV3IFdl Ykluc3BlY3Rvci5Db250ZXh0TWVudSgpOworICAgICAgICB2YXIgY29udGV4dE1lbnUgPSBuZXcg V2ViSW5zcGVjdG9yLkNvbnRleHRNZW51KGV2ZW50KTsKICAgICAgICAgdmFyIHBvcHVsYXRlZCA9 IHRoaXMudHJlZU91dGxpbmUucG9wdWxhdGVDb250ZXh0TWVudShjb250ZXh0TWVudSwgZXZlbnQp OwogCiAgICAgICAgIGlmIChXZWJJbnNwZWN0b3IuZXhwZXJpbWVudHNTZXR0aW5ncy5jc3NSZWdp b25zLmlzRW5hYmxlZCgpKSB7CkBAIC0zNDksNyArMzQ5LDcgQEAgV2ViSW5zcGVjdG9yLkVsZW1l bnRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRTZXBhcmF0 b3IoKTsKICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kQ2hlY2tib3hJdGVtKFdlYkluc3BlY3Rv ci5VSVN0cmluZyhXZWJJbnNwZWN0b3IudXNlTG93ZXJDYXNlTWVudVRpdGxlcygpID8gIldvcmQg d3JhcCIgOiAiV29yZCBXcmFwIiksIHRvZ2dsZVdvcmRXcmFwLmJpbmQodGhpcyksIFdlYkluc3Bl Y3Rvci5zZXR0aW5ncy5kb21Xb3JkV3JhcC5nZXQoKSk7CiAKLSAgICAgICAgY29udGV4dE1lbnUu c2hvdyhldmVudCk7CisgICAgICAgIGNvbnRleHRNZW51LnNob3coKTsKICAgICB9LAogCiAgICAg X3Nob3dOYW1lZEZsb3dDb2xsZWN0aW9uczogZnVuY3Rpb24oKQpAQCAtMTExNyw3ICsxMTE3LDcg QEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAqIEBwYXJh bSB7V2ViSW5zcGVjdG9yLkNvbnRleHRNZW51fSBjb250ZXh0TWVudQogICAgICAqIEBwYXJhbSB7 T2JqZWN0fSB0YXJnZXQKICAgICAgKi8KLSAgICBhcHBlbmRBcHBsaWNhYmxlSXRlbXM6IGZ1bmN0 aW9uKGNvbnRleHRNZW51LCB0YXJnZXQpCisgICAgYXBwZW5kQXBwbGljYWJsZUl0ZW1zOiBmdW5j dGlvbihldmVudCwgY29udGV4dE1lbnUsIHRhcmdldCkKICAgICB7CiAgICAgICAgIGlmICghKHRh cmdldCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QpKQogICAgICAgICAgICAg cmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9F bGVtZW50c1BhbmVsRGVzY3JpcHRvci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRWxlbWVudHNQYW5lbERlc2NyaXB0b3IuanMKaW5kZXggYjdjZWQyYWYzM2VjY2U1Y2E1 M2E5NTM1YzgyN2VjNzMyNDk4ZGQ2NC4uNDVhZDNlNDY3NDU5NWM3NmFkYWNhZTEwNTJkNTAxYWQy ZDhkZmY5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9F bGVtZW50c1BhbmVsRGVzY3JpcHRvci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWxEZXNjcmlwdG9yLmpzCkBAIC00MiwxNCArNDIsMTQgQEAg V2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWxEZXNjcmlwdG9yLnByb3RvdHlwZSA9IHsKICAgICAg KiBAcGFyYW0ge1dlYkluc3BlY3Rvci5Db250ZXh0TWVudX0gY29udGV4dE1lbnUKICAgICAgKiBA cGFyYW0ge09iamVjdH0gdGFyZ2V0CiAgICAgICovCi0gICAgYXBwZW5kQXBwbGljYWJsZUl0ZW1z OiBmdW5jdGlvbihjb250ZXh0TWVudSwgdGFyZ2V0KQorICAgIGFwcGVuZEFwcGxpY2FibGVJdGVt czogZnVuY3Rpb24oZXZlbnQsIGNvbnRleHRNZW51LCB0YXJnZXQpCiAgICAgewogICAgICAgICBp ZiAoISh0YXJnZXQgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0KSkKICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgdmFyIHJlbW90ZU9iamVjdCA9IC8qKiBAdHlwZSB7V2Vi SW5zcGVjdG9yLlJlbW90ZU9iamVjdH0gKi8gdGFyZ2V0OwogICAgICAgICBpZiAocmVtb3RlT2Jq ZWN0LnN1YnR5cGUgIT09ICJub2RlIikKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgdGhp cy5wYW5lbCgpLmFwcGVuZEFwcGxpY2FibGVJdGVtcyhjb250ZXh0TWVudSwgdGFyZ2V0KTsKKyAg ICAgICAgdGhpcy5wYW5lbCgpLmFwcGVuZEFwcGxpY2FibGVJdGVtcyhldmVudCwgY29udGV4dE1l bnUsIHRhcmdldCk7CiAgICAgfSwKIAogICAgIF9fcHJvdG9fXzogV2ViSW5zcGVjdG9yLlBhbmVs RGVzY3JpcHRvci5wcm90b3R5cGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qcwppbmRleCA2ZjA0MzllM2ZmNDg1 YTNjOTIwZWQyZGZiOTFkNmJiNDllN2JhZDhjLi4wMTg4NzQwZDRhYTI0MWNjNTg0YmE3Njc2MmUz NDQwMjdkYjJlMGFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzCkBAIC00ODcsOSArNDg3LDkgQEAgV2Vi SW5zcGVjdG9yLkVsZW1lbnRzVHJlZU91dGxpbmUucHJvdG90eXBlID0gewogICAgICAgICB7CiAg ICAgICAgICAgICBXZWJJbnNwZWN0b3IuZG9tQWdlbnQuaW5zcGVjdEVsZW1lbnQodHJlZUVsZW1l bnQucmVwcmVzZW50ZWRPYmplY3QuaWQpOwogICAgICAgICB9Ci0gICAgICAgIHZhciBjb250ZXh0 TWVudSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUoKTsKKyAgICAgICAgdmFyIGNvbnRl eHRNZW51ID0gbmV3IFdlYkluc3BlY3Rvci5Db250ZXh0TWVudShldmVudCk7CiAgICAgICAgIGNv bnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZXZlYWwgaW4gRWxl bWVudHMgUGFuZWwiKSwgZm9jdXNFbGVtZW50LmJpbmQodGhpcykpOwotICAgICAgICBjb250ZXh0 TWVudS5zaG93KGV2ZW50KTsKKyAgICAgICAgY29udGV4dE1lbnUuc2hvdygpOwogICAgIH0sCiAK ICAgICBwb3B1bGF0ZUNvbnRleHRNZW51OiBmdW5jdGlvbihjb250ZXh0TWVudSwgZXZlbnQpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hhbmRsZXJSZWdp c3RyeS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGFuZGxlclJlZ2lz dHJ5LmpzCmluZGV4IDk5ZDFiYmZhN2FlODdhZDYyNDYwNDZhZTYyZjA5ODQxMzFkOWFjODkuLmM4 YTY0OGFjYjg1ZWExZTQ3NDMxNDY2NzRkZDk3MzE2MDhhZWI4MDkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGFuZGxlclJlZ2lzdHJ5LmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGFuZGxlclJlZ2lzdHJ5LmpzCkBAIC05 NCw4ICs5NCwxMSBAQCBXZWJJbnNwZWN0b3IuSGFuZGxlclJlZ2lzdHJ5LnByb3RvdHlwZSA9IHsK ICAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5Db250ZXh0TWVudX0gY29udGV4dE1lbnUKICAg ICAgKiBAcGFyYW0ge09iamVjdH0gdGFyZ2V0CiAgICAgICovCi0gICAgYXBwZW5kQXBwbGljYWJs ZUl0ZW1zOiBmdW5jdGlvbihjb250ZXh0TWVudSwgdGFyZ2V0KQorICAgIGFwcGVuZEFwcGxpY2Fi bGVJdGVtczogZnVuY3Rpb24oZXZlbnQsIGNvbnRleHRNZW51LCB0YXJnZXQpCiAgICAgeworICAg ICAgICBpZiAoZXZlbnQuaGFzQmVlbkhhbmRsZWRCeUhhbmRsZXJSZWdpc3RyeSkKKyAgICAgICAg ICAgIHJldHVybjsKKyAgICAgICAgZXZlbnQuaGFzQmVlbkhhbmRsZWRCeUhhbmRsZXJSZWdpc3Ry eSA9IHRydWU7CiAgICAgICAgIHRoaXMuX2FwcGVuZENvbnRlbnRQcm92aWRlckl0ZW1zKGNvbnRl eHRNZW51LCB0YXJnZXQpOwogICAgICAgICB0aGlzLl9hcHBlbmRIcmVmSXRlbXMoY29udGV4dE1l bnUsIHRhcmdldCk7CiAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvSW1hZ2VWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9JbWFnZVZpZXcuanMKaW5kZXggZDJjNzliMzBiOTZjYjlkODI3MzcwNmRiN2I1NmYxNWUz ZGY2Y2FkZS4uZDFjNDgyMGY5NDczZWM3NmM0NjZhNDA2MWVhMWNkNWNhNzQ4NjAwNCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbWFnZVZpZXcuanMKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbWFnZVZpZXcuanMKQEAgLTEy NiwxMCArMTI2LDEwIEBAIFdlYkluc3BlY3Rvci5JbWFnZVZpZXcucHJvdG90eXBlID0gewogCiAg ICAgX2NvbnRleHRNZW51OiBmdW5jdGlvbihldmVudCkKICAgICB7Ci0gICAgICAgIHZhciBjb250 ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUoKTsKKyAgICAgICAgdmFyIGNv bnRleHRNZW51ID0gbmV3IFdlYkluc3BlY3Rvci5Db250ZXh0TWVudShldmVudCk7CiAgICAgICAg IGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKFdlYkluc3BlY3Rv ci51c2VMb3dlckNhc2VNZW51VGl0bGVzKCkgPyAiQ29weSBpbWFnZSBVUkwiIDogIkNvcHkgSW1h Z2UgVVJMIiksIHRoaXMuX2NvcHlJbWFnZVVSTC5iaW5kKHRoaXMpKTsKICAgICAgICAgY29udGV4 dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoV2ViSW5zcGVjdG9yLnVzZUxv d2VyQ2FzZU1lbnVUaXRsZXMoKSA/ICJPcGVuIGltYWdlIGluIG5ldyB0YWIiIDogIk9wZW4gSW1h Z2UgaW4gTmV3IFRhYiIpLCB0aGlzLl9vcGVuSW5OZXdUYWIuYmluZCh0aGlzKSk7Ci0gICAgICAg IGNvbnRleHRNZW51LnNob3coZXZlbnQpOworICAgICAgICBjb250ZXh0TWVudS5zaG93KCk7CiAg ICAgfSwKIAogICAgIF9jb3B5SW1hZ2VVUkw6IGZ1bmN0aW9uKGV2ZW50KQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OYXZpZ2F0b3JWaWV3LmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OYXZpZ2F0b3JWaWV3LmpzCmluZGV4IDk3 Zjg4ZThlNTgwNTdjMTFlYmQzZGM1YWE5NzQ1ODkyODdmYmIxZDcuLmI0NzFlYmMzY2FlNTFjZTRj NTJlMGQzYjZlYTIxODBmNWE0MGM1YTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvTmF2aWdhdG9yVmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL05hdmlnYXRvclZpZXcuanMKQEAgLTMyOSw5ICszMjksOSBAQCBXZWJJ bnNwZWN0b3IuTmF2aWdhdG9yVmlldy5wcm90b3R5cGUgPSB7CiAKICAgICBoYW5kbGVDb250ZXh0 TWVudTogZnVuY3Rpb24oZXZlbnQsIHVpU291cmNlQ29kZSkKICAgICB7Ci0gICAgICAgIHZhciBj b250ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUoKTsKKyAgICAgICAgdmFy IGNvbnRleHRNZW51ID0gbmV3IFdlYkluc3BlY3Rvci5Db250ZXh0TWVudShldmVudCk7CiAgICAg ICAgIGNvbnRleHRNZW51LmFwcGVuZEFwcGxpY2FibGVJdGVtcyh1aVNvdXJjZUNvZGUpOwotICAg ICAgICBjb250ZXh0TWVudS5zaG93KGV2ZW50KTsKKyAgICAgICAgY29udGV4dE1lbnUuc2hvdygp OwogICAgIH0sCiAKICAgICBfX3Byb3RvX186IFdlYkluc3BlY3Rvci5WaWV3LnByb3RvdHlwZQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFu ZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5q cwppbmRleCA1Mjg0ODYzOWM0YWE0YzFlMzFlMzc5MjVlZGE2YmExNzlhOTQ5ZGZmLi4wNjI5YmY2 M2M2MzNiNWZjMDg5YzNkZTAyOTkyMGEwOTg1ODA3ZjgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcwpAQCAtOTM0LDcgKzkzNCw3 IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrTG9nVmlldy5wcm90b3R5cGUgPSB7CiAKICAgICBfY29u dGV4dE1lbnU6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgdmFyIGNvbnRleHRNZW51 ID0gbmV3IFdlYkluc3BlY3Rvci5Db250ZXh0TWVudSgpOworICAgICAgICB2YXIgY29udGV4dE1l bnUgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51KGV2ZW50KTsKICAgICAgICAgdmFyIGdy aWROb2RlID0gdGhpcy5fZGF0YUdyaWQuZGF0YUdyaWROb2RlRnJvbU5vZGUoZXZlbnQudGFyZ2V0 KTsKICAgICAgICAgdmFyIHJlcXVlc3QgPSBncmlkTm9kZSAmJiBncmlkTm9kZS5fcmVxdWVzdDsK IApAQCAtOTY4LDcgKzk2OCw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrTG9nVmlldy5wcm90b3R5 cGUgPSB7CiAgICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRTZXBhcmF0b3IoKTsKICAgICAg ICAgfQogCi0gICAgICAgIGNvbnRleHRNZW51LnNob3coZXZlbnQpOworICAgICAgICBjb250ZXh0 TWVudS5zaG93KCk7CiAgICAgfSwKICAgICAKICAgICBfcmVwbGF5WEhSOiBmdW5jdGlvbihyZXF1 ZXN0SWQpCkBAIC0xNTA4LDcgKzE1MDgsNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsLnBy b3RvdHlwZSA9IHsKICAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5Db250ZXh0TWVudX0gY29u dGV4dE1lbnUKICAgICAgKiBAcGFyYW0ge09iamVjdH0gdGFyZ2V0CiAgICAgICovCi0gICAgYXBw ZW5kQXBwbGljYWJsZUl0ZW1zOiBmdW5jdGlvbihjb250ZXh0TWVudSwgdGFyZ2V0KQorICAgIGFw cGVuZEFwcGxpY2FibGVJdGVtczogZnVuY3Rpb24oZXZlbnQsIGNvbnRleHRNZW51LCB0YXJnZXQp CiAgICAgewogICAgICAgICBpZiAoISh0YXJnZXQgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuTmV0 d29ya1JlcXVlc3QpKQogICAgICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWxEZXNjcmlwdG9yLmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWxEZXNjcmlwdG9yLmpz CmluZGV4IDE2MjFkNzdkMDYxOWVkMzZiYTJhYzRlZmRhNWY4ZDkyOTJjMDRiMzEuLmE1Njc1ODMw NTllZDM4MjlkOWU4ZDY3OWY2Y2Y2MmFkNWNkNTIxODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsRGVzY3JpcHRvci5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbERlc2NyaXB0b3Iu anMKQEAgLTQzLDExICs0MywxMSBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsRGVzY3JpcHRv ci5wcm90b3R5cGUgPSB7CiAgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnV9 IGNvbnRleHRNZW51CiAgICAgICogQHBhcmFtIHtPYmplY3R9IHRhcmdldAogICAgICAqLwotICAg IGFwcGVuZEFwcGxpY2FibGVJdGVtczogZnVuY3Rpb24oY29udGV4dE1lbnUsIHRhcmdldCkKKyAg ICBhcHBlbmRBcHBsaWNhYmxlSXRlbXM6IGZ1bmN0aW9uKGV2ZW50LCBjb250ZXh0TWVudSwgdGFy Z2V0KQogICAgIHsKICAgICAgICAgaWYgKCEodGFyZ2V0IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9y Lk5ldHdvcmtSZXF1ZXN0KSkKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgdGhpcy5wYW5l bCgpLmFwcGVuZEFwcGxpY2FibGVJdGVtcyhjb250ZXh0TWVudSwgdGFyZ2V0KTsKKyAgICAgICAg dGhpcy5wYW5lbCgpLmFwcGVuZEFwcGxpY2FibGVJdGVtcyhldmVudCwgY29udGV4dE1lbnUsIHRh cmdldCk7CiAgICAgfSwKIAogICAgIF9fcHJvdG9fXzogV2ViSW5zcGVjdG9yLlBhbmVsRGVzY3Jp cHRvci5wcm90b3R5cGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvT2JqZWN0UHJvcGVydGllc1NlY3Rpb24uanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL09iamVjdFByb3BlcnRpZXNTZWN0aW9uLmpzCmluZGV4IDhiMjY2NTE1MzNi MTMwN2U1ZTgwMGE4NGU5NjhkZjFmZWE3MTlkOTYuLjEyMTA2YzRmYjJkYjc1YTg0ZDY4OGYzNTQ2 NjU0MzM3NTVkMTJiNmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvT2JqZWN0UHJvcGVydGllc1NlY3Rpb24uanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbi5qcwpAQCAtNTgsOSArNTgs OSBAQCBXZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlID0gewog CiAgICAgX2NvbnRleHRNZW51RXZlbnRGaXJlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewotICAg ICAgICB2YXIgY29udGV4dE1lbnUgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51KCk7Cisg ICAgICAgIHZhciBjb250ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUoZXZl bnQpOwogICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRBcHBsaWNhYmxlSXRlbXModGhpcy5vYmpl Y3QpOwotICAgICAgICBjb250ZXh0TWVudS5zaG93KGV2ZW50KTsKKyAgICAgICAgY29udGV4dE1l bnUuc2hvdygpOwogICAgIH0sCiAKICAgICBvbnBvcHVsYXRlOiBmdW5jdGlvbigpCkBAIC0yNTMs MTAgKzI1MywxMCBAQCBXZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydHlUcmVlRWxlbWVudC5wcm90 b3R5cGUgPSB7CiAKICAgICBfY29udGV4dE1lbnVGaXJlZDogZnVuY3Rpb24odmFsdWUsIGV2ZW50 KQogICAgIHsKLSAgICAgICAgdmFyIGNvbnRleHRNZW51ID0gbmV3IFdlYkluc3BlY3Rvci5Db250 ZXh0TWVudSgpOworICAgICAgICB2YXIgY29udGV4dE1lbnUgPSBuZXcgV2ViSW5zcGVjdG9yLkNv bnRleHRNZW51KGV2ZW50KTsKICAgICAgICAgdGhpcy5wb3B1bGF0ZUNvbnRleHRNZW51KGNvbnRl eHRNZW51KTsKICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kQXBwbGljYWJsZUl0ZW1zKHZhbHVl KTsKLSAgICAgICAgY29udGV4dE1lbnUuc2hvdyhldmVudCk7CisgICAgICAgIGNvbnRleHRNZW51 LnNob3coKTsKICAgICB9LAogCiAgICAgLyoqCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwuanMKaW5kZXggMWU1OTRlMmYwZDNhMjUyZWZj MjNlZTM2NzgwY2M5OWU4MDBjYTBhNi4uNWI2YTI0ZGQyYzM3NWRmNGU0ODM2ZTViMDFjY2Y3YjRh NDBmZjhmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Q cm9maWxlc1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv UHJvZmlsZXNQYW5lbC5qcwpAQCAtNDI5LDExICs0MjksMTEgQEAgV2ViSW5zcGVjdG9yLlByb2Zp bGVzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAg ICAgICAgIGlmIChlbGVtZW50ICE9PSB0aGlzLmVsZW1lbnQgfHwgZXZlbnQuc3JjRWxlbWVudCA9 PT0gdGhpcy5zaWRlYmFyRWxlbWVudCkgewotICAgICAgICAgICAgdmFyIGNvbnRleHRNZW51ID0g bmV3IFdlYkluc3BlY3Rvci5Db250ZXh0TWVudSgpOworICAgICAgICAgICAgdmFyIGNvbnRleHRN ZW51ID0gbmV3IFdlYkluc3BlY3Rvci5Db250ZXh0TWVudShldmVudCk7CiAgICAgICAgICAgICBp ZiAodGhpcy52aXNpYmxlVmlldyBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RW aWV3KQogICAgICAgICAgICAgICAgIHRoaXMudmlzaWJsZVZpZXcucG9wdWxhdGVDb250ZXh0TWVu dShjb250ZXh0TWVudSwgZXZlbnQpOwogICAgICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRl bShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkxvYWQgSGVhcCBTbmFwc2hvdFx1MjAyNiIpLCB0aGlz Ll9maWxlU2VsZWN0b3JFbGVtZW50LmNsaWNrLmJpbmQodGhpcy5fZmlsZVNlbGVjdG9yRWxlbWVu dCkpOwotICAgICAgICAgICAgY29udGV4dE1lbnUuc2hvdyhldmVudCk7CisgICAgICAgICAgICBj b250ZXh0TWVudS5zaG93KCk7CiAgICAgICAgIH0KIAogICAgIH0sCkBAIC0xMDg2LDcgKzEwODYs NyBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICogQHBh cmFtIHtXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnV9IGNvbnRleHRNZW51CiAgICAgICogQHBhcmFt IHtPYmplY3R9IHRhcmdldAogICAgICAqLwotICAgIGFwcGVuZEFwcGxpY2FibGVJdGVtczogZnVu Y3Rpb24oY29udGV4dE1lbnUsIHRhcmdldCkKKyAgICBhcHBlbmRBcHBsaWNhYmxlSXRlbXM6IGZ1 bmN0aW9uKGV2ZW50LCBjb250ZXh0TWVudSwgdGFyZ2V0KQogICAgIHsKICAgICAgICAgaWYgKFdl Ykluc3BlY3Rvci5pbnNwZWN0b3JWaWV3LmN1cnJlbnRQYW5lbCgpICE9PSB0aGlzKQogICAgICAg ICAgICAgcmV0dXJuOwpAQCAtMTI0OCw3ICsxMjQ4LDcgQEAgV2ViSW5zcGVjdG9yLlByb2ZpbGVT aWRlYmFyVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgIGhhbmRsZUNvbnRleHRNZW51RXZl bnQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAgICAgdmFyIHByb2ZpbGUgPSB0aGlzLnBy b2ZpbGU7Ci0gICAgICAgIHZhciBjb250ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4 dE1lbnUoKTsKKyAgICAgICAgdmFyIGNvbnRleHRNZW51ID0gbmV3IFdlYkluc3BlY3Rvci5Db250 ZXh0TWVudShldmVudCk7CiAgICAgICAgIHZhciBwcm9maWxlc1BhbmVsID0gV2ViSW5zcGVjdG9y LlByb2ZpbGVzUGFuZWwuX2luc3RhbmNlOwogICAgICAgICAvLyBGSVhNRTogdXNlIGNvbnRleHQg bWVudSBwcm92aWRlcgogICAgICAgICBpZiAocHJvZmlsZS5jYW5TYXZlVG9GaWxlKCkpIHsKQEAg LTEyNTksNyArMTI1OSw3IEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlU2lkZWJhclRyZWVFbGVtZW50 LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJMb2FkIEhlYXAgU25hcHNob3RcdTIwMjYiKSwgcHJvZmlsZXNQYW5l bC5fZmlsZVNlbGVjdG9yRWxlbWVudC5jbGljay5iaW5kKHByb2ZpbGVzUGFuZWwuX2ZpbGVTZWxl Y3RvckVsZW1lbnQpKTsKICAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJEZWxldGUgcHJvZmlsZSIpLCB0aGlzLm9uZGVsZXRlLmJpbmQodGhp cykpOwogICAgICAgICB9Ci0gICAgICAgIGNvbnRleHRNZW51LnNob3coZXZlbnQpOworICAgICAg ICBjb250ZXh0TWVudS5zaG93KCk7CiAgICAgfSwKIAogICAgIF9fcHJvdG9fXzogV2ViSW5zcGVj dG9yLlNpZGViYXJUcmVlRWxlbWVudC5wcm90b3R5cGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCmluZGV4IGM1MDVjOTdlMGZk NThhMDkzMzAwYTU5OGY0MWMwN2FkMzdkNGNlNzguLjQzMGVhOGE1ZDg3M2NmNmI4M2NkODhhMTJi NzBlZWU4NTk1NGVkYTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwpAQCAtMTIxNywxMSArMTIxNywxMSBAQCBXZWJJbnNw ZWN0b3IuRnJhbWVSZXNvdXJjZVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKIAogICAgIF9oYW5k bGVDb250ZXh0TWVudUV2ZW50OiBmdW5jdGlvbihldmVudCkKICAgICB7Ci0gICAgICAgIHZhciBj b250ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUoKTsKKyAgICAgICAgdmFy IGNvbnRleHRNZW51ID0gbmV3IFdlYkluc3BlY3Rvci5Db250ZXh0TWVudShldmVudCk7CiAgICAg ICAgIGNvbnRleHRNZW51LmFwcGVuZEFwcGxpY2FibGVJdGVtcyh0aGlzLl9yZXNvdXJjZSk7CiAg ICAgICAgIGlmICh0aGlzLl9yZXNvdXJjZS5yZXF1ZXN0KQogICAgICAgICAgICAgY29udGV4dE1l bnUuYXBwZW5kQXBwbGljYWJsZUl0ZW1zKHRoaXMuX3Jlc291cmNlLnJlcXVlc3QpOwotICAgICAg ICBjb250ZXh0TWVudS5zaG93KGV2ZW50KTsKKyAgICAgICAgY29udGV4dE1lbnUuc2hvdygpOwog ICAgIH0sCiAKICAgICBfc2V0QnViYmxlVGV4dDogZnVuY3Rpb24oeCkKQEAgLTE0MTcsOSArMTQx Nyw5IEBAIFdlYkluc3BlY3Rvci5JbmRleGVkREJUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAK ICAgICBfaGFuZGxlQ29udGV4dE1lbnVFdmVudDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewotICAg ICAgICB2YXIgY29udGV4dE1lbnUgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51KCk7Cisg ICAgICAgIHZhciBjb250ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUoZXZl bnQpOwogICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiUmVmcmVzaCBJbmRleGVkREIiKSwgdGhpcy5yZWZyZXNoSW5kZXhlZERCLmJpbmQodGhpcykp OwotICAgICAgICBjb250ZXh0TWVudS5zaG93KGV2ZW50KTsKKyAgICAgICAgY29udGV4dE1lbnUu c2hvdygpOwogICAgIH0sCiAKICAgICBfY3JlYXRlSW5kZXhlZERCTW9kZWw6IGZ1bmN0aW9uKCkK QEAgLTE1MzEsOSArMTUzMSw5IEBAIFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtTGlzdFRyZWVFbGVt ZW50LnByb3RvdHlwZSA9IHsKIAogICAgIF9oYW5kbGVDb250ZXh0TWVudUV2ZW50OiBmdW5jdGlv bihldmVudCkKICAgICB7Ci0gICAgICAgIHZhciBjb250ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0 b3IuQ29udGV4dE1lbnUoKTsKKyAgICAgICAgdmFyIGNvbnRleHRNZW51ID0gbmV3IFdlYkluc3Bl Y3Rvci5Db250ZXh0TWVudShldmVudCk7CiAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0o V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZWZyZXNoIEZpbGVTeXN0ZW0gTGlzdCIpLCB0aGlzLl9y ZWZyZXNoRmlsZVN5c3RlbS5iaW5kKHRoaXMpKTsKLSAgICAgICAgY29udGV4dE1lbnUuc2hvdyhl dmVudCk7CisgICAgICAgIGNvbnRleHRNZW51LnNob3coKTsKICAgICB9LAogCiAgICAgX2ZpbGVT eXN0ZW1BZGRlZDogZnVuY3Rpb24oZXZlbnQpCkBAIC0xNjA2LDkgKzE2MDYsOSBAQCBXZWJJbnNw ZWN0b3IuSURCRGF0YWJhc2VUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAKICAgICBfaGFuZGxl Q29udGV4dE1lbnVFdmVudDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewotICAgICAgICB2YXIgY29u dGV4dE1lbnUgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51KCk7CisgICAgICAgIHZhciBj b250ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUoZXZlbnQpOwogICAgICAg ICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVmcmVzaCBJ bmRleGVkREIiKSwgdGhpcy5fcmVmcmVzaEluZGV4ZWREQi5iaW5kKHRoaXMpKTsKLSAgICAgICAg Y29udGV4dE1lbnUuc2hvdyhldmVudCk7CisgICAgICAgIGNvbnRleHRNZW51LnNob3coKTsKICAg ICB9LAogCiAgICAgX3JlZnJlc2hJbmRleGVkREI6IGZ1bmN0aW9uKGV2ZW50KQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzTmF2aWdhdG9yLmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzTmF2aWdhdG9yLmpz CmluZGV4IDg0NzcyMzBkZDFiYzA1YzZhYzQyYzU3MTY5YmEyNDM0NGM2N2I3NGUuLjZlNDg2MDky MGY4ZDNmNjQxM2Q3ODY5NTg2MjNiMjcyYjMwOGY1MTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c05hdmlnYXRvci5qcworKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNOYXZpZ2F0b3IuanMKQEAgLTIxMCw3 ICsyMTAsNyBAQCBXZWJJbnNwZWN0b3IuU25pcHBldHNOYXZpZ2F0b3JWaWV3LnByb3RvdHlwZSA9 IHsKICAgICAgKi8KICAgICBoYW5kbGVDb250ZXh0TWVudTogZnVuY3Rpb24oZXZlbnQsIHVpU291 cmNlQ29kZSkKICAgICB7Ci0gICAgICAgIHZhciBjb250ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0 b3IuQ29udGV4dE1lbnUoKTsKKyAgICAgICAgdmFyIGNvbnRleHRNZW51ID0gbmV3IFdlYkluc3Bl Y3Rvci5Db250ZXh0TWVudShldmVudCk7CiAgICAgICAgIGlmICh1aVNvdXJjZUNvZGUpIHsKICAg ICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJS dW4iKSwgdGhpcy5faGFuZGxlRXZhbHVhdGVTbmlwcGV0LmJpbmQodGhpcywgdWlTb3VyY2VDb2Rl KSk7CiAgICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0 cmluZygiUmVuYW1lIiksIHRoaXMuX2hhbmRsZVJlbmFtZVNuaXBwZXQuYmluZCh0aGlzLCB1aVNv dXJjZUNvZGUpKTsKQEAgLTIxOCw3ICsyMTgsNyBAQCBXZWJJbnNwZWN0b3IuU25pcHBldHNOYXZp Z2F0b3JWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZFNl cGFyYXRvcigpOwogICAgICAgICB9CiAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJOZXciKSwgdGhpcy5faGFuZGxlQ3JlYXRlU25pcHBldC5iaW5k KHRoaXMpKTsKLSAgICAgICAgY29udGV4dE1lbnUuc2hvdyhldmVudCk7CisgICAgICAgIGNvbnRl eHRNZW51LnNob3coKTsKICAgICB9LAogCiAgICAgLyoqCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCmluZGV4IDE3MmFlNjlhYjhiOWUx NDQ1ZjA3YmQ1NTIzM2ZmY2FjYzc2YWExNzEuLjhjMzViMjczNzQzYjIxYzY2NDU1NDhkNTEzNzMx YjMwZjU2NTA4YjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2NyaXB0c1BhbmVsLmpzCkBAIC0xMTA1LDcgKzExMDUsNyBAQCBXZWJJbnNwZWN0b3IuU2Ny aXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5Db250 ZXh0TWVudX0gY29udGV4dE1lbnUKICAgICAgKiBAcGFyYW0ge09iamVjdH0gdGFyZ2V0CiAgICAg ICovCi0gICAgYXBwZW5kQXBwbGljYWJsZUl0ZW1zOiBmdW5jdGlvbihjb250ZXh0TWVudSwgdGFy Z2V0KQorICAgIGFwcGVuZEFwcGxpY2FibGVJdGVtczogZnVuY3Rpb24oZXZlbnQsIGNvbnRleHRN ZW51LCB0YXJnZXQpCiAgICAgewogICAgICAgICB0aGlzLl9hcHBlbmRVSVNvdXJjZUNvZGVJdGVt cyhjb250ZXh0TWVudSwgdGFyZ2V0KTsKICAgICAgICAgdGhpcy5fYXBwZW5kRnVuY3Rpb25JdGVt cyhjb250ZXh0TWVudSwgdGFyZ2V0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsRGVzY3JpcHRvci5qcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsRGVzY3JpcHRvci5qcwppbmRleCA5OWVk ZmFmZWZkZGFlYzhiZTIwMWNhZjMwZWMyOWRjMTJlZThkM2YwLi5hMzIzMGFhMmI2YTlkZDY2NmU0 YWRmMzFmYmIyZDczOGZhMWZiZmRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbERlc2NyaXB0b3IuanMKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWxEZXNjcmlwdG9yLmpzCkBAIC00Miw3 ICs0Miw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWxEZXNjcmlwdG9yLnByb3RvdHlwZSA9 IHsKICAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5Db250ZXh0TWVudX0gY29udGV4dE1lbnUK ICAgICAgKiBAcGFyYW0ge09iamVjdH0gdGFyZ2V0CiAgICAgICovCi0gICAgYXBwZW5kQXBwbGlj YWJsZUl0ZW1zOiBmdW5jdGlvbihjb250ZXh0TWVudSwgdGFyZ2V0KQorICAgIGFwcGVuZEFwcGxp Y2FibGVJdGVtczogZnVuY3Rpb24oZXZlbnQsIGNvbnRleHRNZW51LCB0YXJnZXQpCiAgICAgewog ICAgICAgICB2YXIgaGFzQXBwbGljYWJsZUl0ZW1zID0gdGFyZ2V0IGluc3RhbmNlb2YgV2ViSW5z cGVjdG9yLlVJU291cmNlQ29kZTsKIApAQCAtNTIsNyArNTIsNyBAQCBXZWJJbnNwZWN0b3IuU2Ny aXB0c1BhbmVsRGVzY3JpcHRvci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICB9CiAKLSAgICAgICAgdGhpcy5wYW5lbCgpLmFwcGVuZEFwcGxpY2FibGVJdGVt cyhjb250ZXh0TWVudSwgdGFyZ2V0KTsKKyAgICAgICAgdGhpcy5wYW5lbCgpLmFwcGVuZEFwcGxp Y2FibGVJdGVtcyhldmVudCwgY29udGV4dE1lbnUsIHRhcmdldCk7CiAgICAgfSwKIAogICAgIF9f cHJvdG9fXzogV2ViSW5zcGVjdG9yLlBhbmVsRGVzY3JpcHRvci5wcm90b3R5cGUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUu anMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5l LmpzCmluZGV4IDc4M2ZhMzUyOTc5OWVmMmU5ZmVjNDEyOTUxMjZlYzI3MzQ3M2ZiODUuLmJmZDVh MTNjNzcxMzNiMDc5OGVhYjVjZGRlNDc4MGI0YjI4YmRlYjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcwpAQCAt MTM2LDkgKzEzNiw5IEBAIFdlYkluc3BlY3Rvci5TdHlsZXNTaWRlYmFyUGFuZS5wcm90b3R5cGUg PSB7CiAgICAgewogICAgICAgICAvLyBXZSBzdGFydCBlZGl0aW5nIHVwb24gY2xpY2sgLT4gZGVm YXVsdCBuYXZpZ2F0aW9uIHRvIHJlc291cmNlcyBwYW5lbCBpcyBub3QgYXZhaWxhYmxlCiAgICAg ICAgIC8vIEhlbmNlIHdlIGFkZCBhIHNvZnQgY29udGV4dCBtZW51IGZvciBocmVmcy4KLSAgICAg ICAgdmFyIGNvbnRleHRNZW51ID0gbmV3IFdlYkluc3BlY3Rvci5Db250ZXh0TWVudSgpOworICAg ICAgICB2YXIgY29udGV4dE1lbnUgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51KGV2ZW50 KTsKICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kQXBwbGljYWJsZUl0ZW1zKGV2ZW50LnRhcmdl dCk7Ci0gICAgICAgIGNvbnRleHRNZW51LnNob3coZXZlbnQpOworICAgICAgICBjb250ZXh0TWVu dS5zaG93KCk7CiAgICAgfSwKIAogICAgIGdldCBfZm9yY2VkUHNldWRvQ2xhc3NlcygpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RhYmJlZFBhbmUuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RhYmJlZFBhbmUuanMKaW5kZXgg MTliNzg3ZmE5YjJmMjNmY2FiYjBhNzA0ZDEwZDg4YjNiN2VlMDkxNC4uZTgzNTI4NzA4NDFjYjFk ZDlhZGRhZTI0NTc3YzljYzVlNzRjMzI2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9UYWJiZWRQYW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvVGFiYmVkUGFuZS5qcwpAQCAtNzEzLDExICs3MTMsMTEgQEAgV2ViSW5z cGVjdG9yLlRhYmJlZFBhbmVUYWIucHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5fdGFi YmVkUGFuZS5jbG9zZUFsbFRhYnModHJ1ZSk7CiAgICAgICAgIH0KICAgCi0gICAgICAgIHZhciBj b250ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUoKTsKKyAgICAgICAgdmFy IGNvbnRleHRNZW51ID0gbmV3IFdlYkluc3BlY3Rvci5Db250ZXh0TWVudShldmVudCk7CiAgICAg ICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDbG9zZSIp LCBjbG9zZS5iaW5kKHRoaXMpKTsKICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIkNsb3NlIE90aGVycyIpLCBjbG9zZU90aGVycy5iaW5kKHRoaXMp KTsKICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmco IkNsb3NlIEFsbCIpLCBjbG9zZUFsbC5iaW5kKHRoaXMpKTsKLSAgICAgICAgY29udGV4dE1lbnUu c2hvdyhldmVudCk7CisgICAgICAgIGNvbnRleHRNZW51LnNob3coKTsKICAgICB9LAogCiAgICAg LyoqCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVs aW5lUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5l UGFuZWwuanMKaW5kZXggNTBmNGI2YWRhNGQ4ZTU3MDk3NjFjYzU2MDczMWJlOGUzYTU0ZDJhMS4u NzNmZTBjMmRhNjg3MzQ5MGY3MWNjYjY4NDJlNTMwNjExNDE1ZDdlOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qcwpAQCAtMzM0 LDExICszMzQsMTEgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlID0gewog CiAgICAgX2NvbnRleHRNZW51OiBmdW5jdGlvbihldmVudCkKICAgICB7Ci0gICAgICAgIHZhciBj b250ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUoKTsKKyAgICAgICAgdmFy IGNvbnRleHRNZW51ID0gbmV3IFdlYkluc3BlY3Rvci5Db250ZXh0TWVudShldmVudCk7CiAgICAg ICAgIGlmIChJbnNwZWN0b3JGcm9udGVuZEhvc3QuY2FuU2F2ZSgpKQogICAgICAgICAgICAgY29u dGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNhdmUgVGltZWxpbmUg ZGF0YVx1MjAyNiIpLCB0aGlzLl9zYXZlVG9GaWxlLmJpbmQodGhpcyksIHRoaXMuX29wZXJhdGlv bkluUHJvZ3Jlc3MpOwogICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rv ci5VSVN0cmluZygiTG9hZCBUaW1lbGluZSBkYXRhXHUyMDI2IiksIHRoaXMuX2ZpbGVTZWxlY3Rv ckVsZW1lbnQuY2xpY2suYmluZCh0aGlzLl9maWxlU2VsZWN0b3JFbGVtZW50KSwgdGhpcy5fb3Bl cmF0aW9uSW5Qcm9ncmVzcyk7Ci0gICAgICAgIGNvbnRleHRNZW51LnNob3coZXZlbnQpOworICAg ICAgICBjb250ZXh0TWVudS5zaG93KCk7CiAgICAgfSwKIAogICAgIF9zYXZlVG9GaWxlOiBmdW5j dGlvbigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dh dGNoRXhwcmVzc2lvbnNTaWRlYmFyUGFuZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvV2F0Y2hFeHByZXNzaW9uc1NpZGViYXJQYW5lLmpzCmluZGV4IDA5ODdlMDI2NDIx NjdjNGRjZjdhMjgyNzhhOTBkNDI1MDgxYzU3NmQuLjBlOGQ5NzljYTE0NWZiMzA1MjY1ZjgyZjdi NTI3NzZmZDJhZGMzODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvV2F0Y2hFeHByZXNzaW9uc1NpZGViYXJQYW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvV2F0Y2hFeHByZXNzaW9uc1NpZGViYXJQYW5lLmpzCkBAIC0z MzEsOSArMzMxLDkgQEAgV2ViSW5zcGVjdG9yLldhdGNoRXhwcmVzc2lvbnNTZWN0aW9uLnByb3Rv dHlwZSA9IHsKIAogICAgIF9lbXB0eUVsZW1lbnRDb250ZXh0TWVudTogZnVuY3Rpb24oZXZlbnQp CiAgICAgewotICAgICAgICB2YXIgY29udGV4dE1lbnUgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnRl eHRNZW51KCk7CisgICAgICAgIHZhciBjb250ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29u dGV4dE1lbnUoZXZlbnQpOwogICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiQWRkIHdhdGNoIGV4cHJlc3Npb24iKSwgdGhpcy5hZGROZXdFeHByZXNz aW9uQW5kRWRpdC5iaW5kKHRoaXMpKTsKLSAgICAgICAgY29udGV4dE1lbnUuc2hvdyhldmVudCk7 CisgICAgICAgIGNvbnRleHRNZW51LnNob3coKTsKICAgICB9LAogCiAgICAgX19wcm90b19fOiBX ZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlCkBAIC00MTcsOSAr NDE3LDkgQEAgV2ViSW5zcGVjdG9yLldhdGNoRXhwcmVzc2lvblRyZWVFbGVtZW50LnByb3RvdHlw ZSA9IHsKIAogICAgIF9jb250ZXh0TWVudTogZnVuY3Rpb24oZXZlbnQpCiAgICAgewotICAgICAg ICB2YXIgY29udGV4dE1lbnUgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51KCk7CisgICAg ICAgIHZhciBjb250ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUoZXZlbnQp OwogICAgICAgICB0aGlzLnBvcHVsYXRlQ29udGV4dE1lbnUoY29udGV4dE1lbnUpOwotICAgICAg ICBjb250ZXh0TWVudS5zaG93KGV2ZW50KTsKKyAgICAgICAgY29udGV4dE1lbnUuc2hvdygpOwog ICAgIH0sCiAKICAgICBfZGVsZXRlQWxsQnV0dG9uQ2xpY2tlZDogZnVuY3Rpb24oKQo=