57103 2011-03-25 07:40:55 -0700 Web Inspector: refactor Network domain's frame tree API 2011-03-25 12:19:41 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman webkit-unassigned abarth apavlov bweinstein eric joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 373499 0 pfeldman 2011-03-25 07:40:55 -0700 Patch to follow. 373502 1 86937 pfeldman 2011-03-25 07:47:09 -0700 Created attachment 86937 Patch 373561 2 86937 yurys 2011-03-25 09:43:04 -0700 Comment on attachment 86937 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=86937&action=review > Source/WebCore/inspector/front-end/NetworkManager.js:85 > + this._frameURLs = {}; Let's set documentUrl on each resource instead. 373604 3 pfeldman 2011-03-25 10:55:32 -0700 Committed r81971: <http://trac.webkit.org/changeset/81971> 373663 4 webkit.review.bot 2011-03-25 12:19:41 -0700 http://trac.webkit.org/changeset/81971 might have broken SnowLeopard Intel Release (WebKit2 Tests) The following tests are not passing: printing/page-count-layout-overflow.html 86937 2011-03-25 07:47:09 -0700 2011-03-25 09:43:04 -0700 Patch bug-57103-20110325174707.patch text/plain 27795 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODE4NzgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhN2EzNWY0MDBjNWE4NDA3 YzQ1OTBmMzgxNTVkMjMyZDNhZGE4MjhiLi5jMTBmNmEyNmRmZDhiM2UxZGRiYWJhZmIzMTRjN2U1 MWE0ZTcwMzY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDEgQEAKKzIwMTEtMDMtMjUgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogcmVmYWN0b3IgTmV0d29y ayBkb21haW4ncyBmcmFtZSB0cmVlIEFQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NTcxMDMKKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3Iu anNvbjoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpidWlsZE9iamVjdEZvckZyYW1lUmVzb3VyY2UpOgorICAgICAgICAo V2ViQ29yZTo6YnVpbGRPYmplY3RGb3JDYWNoZWRSZXNvdXJjZSk6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JSZXNvdXJjZUFnZW50Ojp3aWxsU2VuZFJlcXVlc3QpOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6ZGlkTG9hZFJlc291cmNlRnJvbU1lbW9yeUNh Y2hlKToKKyAgICAgICAgKFdlYkNvcmU6OmJ1aWxkT2JqZWN0Rm9yRnJhbWUpOgorICAgICAgICAo V2ViQ29yZTo6YnVpbGRPYmplY3RGb3JGcmFtZVRyZWUpOgorICAgICAgICAoV2ViQ29yZTo6SW5z cGVjdG9yUmVzb3VyY2VBZ2VudDo6ZGlkQ29tbWl0TG9hZCk6CisgICAgICAgIChXZWJDb3JlOjpJ bnNwZWN0b3JSZXNvdXJjZUFnZW50OjplbmFibGUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvTmV0d29ya01hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya01h bmFnZXIucHJvdG90eXBlLnJlcXVlc3RDb250ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5O ZXR3b3JrRGlzcGF0Y2hlcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0Rpc3BhdGNo ZXIucHJvdG90eXBlLndpbGxTZW5kUmVxdWVzdCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0 d29ya0Rpc3BhdGNoZXIucHJvdG90eXBlLmRpZFJlY2VpdmVSZXNwb25zZSk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuTmV0d29ya0Rpc3BhdGNoZXIucHJvdG90eXBlLmRpZExvYWRSZXNvdXJjZUZy b21NZW1vcnlDYWNoZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0Rpc3BhdGNoZXIu cHJvdG90eXBlLmZyYW1lRGV0YWNoZWRGcm9tUGFyZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUuZGlkQ29tbWl0TG9hZEZvckZyYW1lKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUuZGlkQ3JlYXRl V2ViU29ja2V0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90 b3R5cGUuX2FwcGVuZFJlZGlyZWN0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrRGlz cGF0Y2hlci5wcm90b3R5cGUuX2FkZEZyYW1lc1JlY3Vyc2l2ZWx5KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUuX2NyZWF0ZVJlc291cmNlKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVHJlZU1vZGVsLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLnByb3RvdHlwZS5hZGRPclVwZGF0ZUZy YW1lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5wcm90b3R5cGUu ZGlkQ29tbWl0TG9hZEZvckZyYW1lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRy ZWVNb2RlbC5wcm90b3R5cGUuX2NsZWFyQ2hpbGRGcmFtZXNBbmRSZXNvdXJjZXMpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLnByb3RvdHlwZS5fY2xlYXJSZXNvdXJj ZXMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlLmFkZE9yVXBkYXRl RnJhbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5h ZGRSZXNvdXJjZVRvRnJhbWUpOgorCiAyMDExLTAzLTI0ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRt YW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFl1cnkgU2VtaWtoYXRza3ku CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24gYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KaW5kZXggNDE5MzkzOWRkZjE0 MGVmMDQ2MjUxNDcxNTBjN2UwNWFiZmE1NTUyZS4uNTRkYjY1ZWVkMDdjYWZjOGVmZWZkMmRiNDk2 OTU4ZTM4ZmYzNzgwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3Rvci5qc29uCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgpA QCAtMjY3LDI0ICsyNjcsMzQgQEAKICAgICAgICAgICAgICAgICAgICAgInR5cGUiOiB7ICJ0eXBl IjogInN0cmluZyIgfSwKICAgICAgICAgICAgICAgICAgICAgInJlc3BvbnNlIjogeyAiJHJlZiI6 ICJSZXNvdXJjZVJlc3BvbnNlIiB9LAogICAgICAgICAgICAgICAgICAgICAiYm9keVNpemUiOiB7 ICJ0eXBlIjogIm51bWJlciIgfSwKLSAgICAgICAgICAgICAgICAgICAgImxvYWRlciI6IHsgIiRy ZWYiOiAiRG9jdW1lbnRMb2FkZXIiIH0KICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9 LAogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICJpZCI6ICJEb2N1bWVudExvYWRlciIs CisgICAgICAgICAgICAgICAgImlkIjogIkZyYW1lIiwKICAgICAgICAgICAgICAgICAidHlwZSI6 ICJvYmplY3QiLAogICAgICAgICAgICAgICAgICJwcm9wZXJ0aWVzIjogewotICAgICAgICAgICAg ICAgICAgICAiZnJhbWVJZCI6IHsgInR5cGUiOiAic3RyaW5nIiB9LAorICAgICAgICAgICAgICAg ICAgICAiaWQiOiB7ICJ0eXBlIjogInN0cmluZyIgfSwKKyAgICAgICAgICAgICAgICAgICAgInBh cmVudElkIjogeyAidHlwZSI6ICJzdHJpbmciIH0sCiAgICAgICAgICAgICAgICAgICAgICJsb2Fk ZXJJZCI6IHsgInR5cGUiOiAic3RyaW5nIiB9LAorICAgICAgICAgICAgICAgICAgICAibmFtZSI6 IHsgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSB9LAogICAgICAgICAgICAgICAg ICAgICAidXJsIjogeyAidHlwZSI6ICJzdHJpbmciIH0KICAgICAgICAgICAgICAgICB9CiAgICAg ICAgICAgICB9LAogICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICJpZCI6ICJGcmFtZVJl c291cmNlVHJlZSIsCisgICAgICAgICAgICAgICAgInR5cGUiOiAib2JqZWN0IiwKKyAgICAgICAg ICAgICAgICAicHJvcGVydGllcyI6IHsKKyAgICAgICAgICAgICAgICAgICAgImZyYW1lIjogeyAi JHJlZiI6ICJGcmFtZSIgfSwKKyAgICAgICAgICAgICAgICAgICAgImNoaWxkRnJhbWVzIjogeyAi dHlwZSI6ICJhcnJheSIsICJvcHRpb25hbCI6IHRydWUsICJpdGVtcyI6IHsgIiRyZWYiOiAiRnJh bWVSZXNvdXJjZVRyZWUiIH0gfSwKKyAgICAgICAgICAgICAgICAgICAgIm1haW5SZXNvdXJjZSI6 IHsgIiRyZWYiOiAiRnJhbWVSZXNvdXJjZSIgfSwKKyAgICAgICAgICAgICAgICAgICAgInN1YnJl c291cmNlcyI6IHsgInR5cGUiOiAiYXJyYXkiLCAiaXRlbXMiOiB7ICIkcmVmIjogIkNhY2hlZFJl c291cmNlIiB9IH0KKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9LAorICAgICAgICAg ICAgewogICAgICAgICAgICAgICAgICJpZCI6ICJGcmFtZVJlc291cmNlIiwKICAgICAgICAgICAg ICAgICAidHlwZSI6ICJvYmplY3QiLAogICAgICAgICAgICAgICAgICJwcm9wZXJ0aWVzIjogewog ICAgICAgICAgICAgICAgICAgICAidXJsIjogeyAidHlwZSI6ICJzdHJpbmciIH0sCi0gICAgICAg ICAgICAgICAgICAgICJsb2FkZXIiOiB7ICIkcmVmIjogIkRvY3VtZW50TG9hZGVyIiB9LAogICAg ICAgICAgICAgICAgICAgICAicmVxdWVzdCI6IHsgIiRyZWYiOiAiUmVzb3VyY2VSZXF1ZXN0IiB9 LAogICAgICAgICAgICAgICAgICAgICAicmVzcG9uc2UiOiB7ICIkcmVmIjogIlJlc291cmNlUmVz cG9uc2UiIH0KICAgICAgICAgICAgICAgICB9CkBAIC0zMTUsNyArMzI1LDcgQEAKICAgICAgICAg ICAgIHsKICAgICAgICAgICAgICAgICAibmFtZSI6ICJzZXRFeHRyYUhlYWRlcnMiLAogICAgICAg ICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjog ImhlYWRlcnMiLCAiJHJlZiI6ICJOZXR3b3JrSGVhZGVycyIgfQorICAgICAgICAgICAgICAgICAg ICB7ICJuYW1lIjogImhlYWRlcnMiLCAidHlwZSI6ICJvYmplY3QiIH0KICAgICAgICAgICAgICAg ICBdCiAgICAgICAgICAgICB9CiAgICAgICAgIF0sCkBAIC0zMzAsNyArMzQwLDggQEAKICAgICAg ICAgICAgICAgICAibmFtZSI6ICJ3aWxsU2VuZFJlcXVlc3QiLAogICAgICAgICAgICAgICAgICJw YXJhbWV0ZXJzIjogWwogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImlkZW50aWZpZXIi LCAidHlwZSI6ICJpbnRlZ2VyIiB9LAotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImxv YWRlciIsICIkcmVmIjogIk5ldHdvcmtMb2FkZXIiIH0sCisgICAgICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAiZnJhbWVJZCIsICJ0eXBlIjogInN0cmluZyIgfSwKKyAgICAgICAgICAgICAgICAg ICAgeyAibmFtZSI6ICJsb2FkZXJJZCIsICJ0eXBlIjogInN0cmluZyIgfSwKICAgICAgICAgICAg ICAgICAgICAgeyAibmFtZSI6ICJyZXF1ZXN0IiwgIiRyZWYiOiAiUmVzb3VyY2VSZXF1ZXN0IiB9 LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInJlZGlyZWN0UmVzcG9uc2UiLCAiJHJl ZiI6ICJSZXNvdXJjZVJlc3BvbnNlIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjog InRpbWUiLCAidHlwZSI6ICJudW1iZXIiIH0sCkBAIC0zNzMsMTQgKzM4NCwxNiBAQAogICAgICAg ICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjog ImlkZW50aWZpZXIiLCAidHlwZSI6ICJpbnRlZ2VyIiB9LAogICAgICAgICAgICAgICAgICAgICB7 ICJuYW1lIjogInRpbWUiLCAidHlwZSI6ICJudW1iZXIiIH0sCi0gICAgICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAibG9jYWxpemVkRGVzY3JpcHRpb24iLCAidHlwZSI6ICJzdHJpbmciIH0KKyAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJlcnJvclRleHQiLCAidHlwZSI6ICJzdHJpbmci IH0KICAgICAgICAgICAgICAgICBdCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgewogICAg ICAgICAgICAgICAgICJuYW1lIjogImRpZExvYWRSZXNvdXJjZUZyb21NZW1vcnlDYWNoZSIsCiAg ICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCisgICAgICAgICAgICAgICAgICAgIHsgIm5h bWUiOiAiZnJhbWVJZCIsICJ0eXBlIjogInN0cmluZyIgfSwKKyAgICAgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJsb2FkZXJJZCIsICJ0eXBlIjogInN0cmluZyIgfSwKICAgICAgICAgICAgICAg ICAgICAgeyAibmFtZSI6ICJ0aW1lIiwgInR5cGUiOiAibnVtYmVyIiB9LAotICAgICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogInJlc291cmNlIiwgIiRyZWYiOiAiTmV0d29ya0NhY2hlZFJlc291 cmNlIiB9CisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicmVzb3VyY2UiLCAiJHJlZiI6 ICJDYWNoZWRSZXNvdXJjZSIgfQogICAgICAgICAgICAgICAgIF0KICAgICAgICAgICAgIH0sCiAg ICAgICAgICAgICB7CkBAIC0zOTUsNyArNDA4LDcgQEAKICAgICAgICAgICAgICAgICAibmFtZSI6 ICJkaWRDb21taXRMb2FkRm9yRnJhbWUiLAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjog WwogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImZyYW1lIiwgIiRyZWYiOiAiRnJhbWUi IH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibG9hZGVyIiwgIiRyZWYiOiAiTmV0 d29ya0xvYWRlciIgfQorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImxvYWRlcklkIiwg InR5cGUiOiAic3RyaW5nIiB9CiAgICAgICAgICAgICAgICAgXQogICAgICAgICAgICAgfSwKICAg ICAgICAgICAgIHsKQEAgLTQxMCw3ICs0MjMsNyBAQAogICAgICAgICAgICAgICAgICJwYXJhbWV0 ZXJzIjogWwogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImlkZW50aWZpZXIiLCAidHlw ZSI6ICJpbnRlZ2VyIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInRpbWUiLCAi dHlwZSI6ICJudW1iZXIiIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicmVxdWVz dCIsICIkcmVmIjogIk5ldHdvcmtXZWJTb2NrZXRSZXF1ZXN0IiB9CisgICAgICAgICAgICAgICAg ICAgIHsgIm5hbWUiOiAicmVxdWVzdCIsICIkcmVmIjogIldlYlNvY2tldFJlcXVlc3QiIH0KICAg ICAgICAgICAgICAgICBdCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgewpAQCAtNDE4LDcg KzQzMSw3IEBACiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCiAgICAgICAgICAgICAg ICAgICAgIHsgIm5hbWUiOiAiaWRlbnRpZmllciIsICJ0eXBlIjogImludGVnZXIiIH0sCiAgICAg ICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidGltZSIsICJ0eXBlIjogIm51bWJlciIgfSwKLSAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyZXNwb25zZSIsICIkcmVmIjogIk5ldHdvcmtX ZWJTb2NrZXRSZXNwb25zZSIgfQorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInJlc3Bv bnNlIiwgIiRyZWYiOiAiV2ViU29ja2V0UmVzcG9uc2UiIH0KICAgICAgICAgICAgICAgICBdCiAg ICAgICAgICAgICB9LAogICAgICAgICAgICAgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwCmluZGV4IDliM2RmNjkyMDMyOGZhNTAy MWNiNWNjYWIzZTY2MTIxMGI4Y2M4NjIuLjhjMGVkN2M5MWIzMWQyYWM3ZThiYzNkMTljOTBhNWRi MmMxYzgxNGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JS ZXNvdXJjZUFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y UmVzb3VyY2VBZ2VudC5jcHAKQEAgLTIzMCwxNSArMjMwLDYgQEAgc3RhdGljIFN0cmluZyBwb2lu dGVyQXNJZCh2b2lkKiBwb2ludGVyKQogICAgIHJldHVybiBTdHJpbmc6OmZvcm1hdCgiJS4wbGxY IiwgYWRkcmVzcyk7CiB9CiAKLXN0YXRpYyBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gYnVp bGRPYmplY3RGb3JEb2N1bWVudExvYWRlcihEb2N1bWVudExvYWRlciogbG9hZGVyKQotewotICAg IFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGRvY3VtZW50TG9hZGVyT2JqZWN0ID0gSW5zcGVjdG9y T2JqZWN0OjpjcmVhdGUoKTsKLSAgICBkb2N1bWVudExvYWRlck9iamVjdC0+c2V0U3RyaW5nKCJm cmFtZUlkIiwgcG9pbnRlckFzSWQobG9hZGVyLT5mcmFtZSgpKSk7Ci0gICAgZG9jdW1lbnRMb2Fk ZXJPYmplY3QtPnNldFN0cmluZygibG9hZGVySWQiLCBwb2ludGVyQXNJZChsb2FkZXIpKTsKLSAg ICBkb2N1bWVudExvYWRlck9iamVjdC0+c2V0U3RyaW5nKCJ1cmwiLCBsb2FkZXItPnJlcXVlc3RV UkwoKS5zdHJpbmcoKSk7Ci0gICAgcmV0dXJuIGRvY3VtZW50TG9hZGVyT2JqZWN0OwotfQotCiBz dGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGJ1aWxkT2JqZWN0Rm9yRnJhbWVSZXNv dXJjZShGcmFtZSogZnJhbWUpCiB7CiAgICAgRnJhbWVMb2FkZXIqIGZyYW1lTG9hZGVyID0gZnJh bWUtPmxvYWRlcigpOwpAQCAtMjQ2LDcgKzIzNyw2IEBAIHN0YXRpYyBQYXNzUmVmUHRyPEluc3Bl Y3Rvck9iamVjdD4gYnVpbGRPYmplY3RGb3JGcmFtZVJlc291cmNlKEZyYW1lKiBmcmFtZSkKIAog ICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHJlc291cmNlT2JqZWN0ID0gSW5zcGVjdG9yT2Jq ZWN0OjpjcmVhdGUoKTsKICAgICByZXNvdXJjZU9iamVjdC0+c2V0U3RyaW5nKCJ1cmwiLCBsb2Fk ZXItPnVybCgpLnN0cmluZygpKTsKLSAgICByZXNvdXJjZU9iamVjdC0+c2V0T2JqZWN0KCJsb2Fk ZXIiLCBidWlsZE9iamVjdEZvckRvY3VtZW50TG9hZGVyKGxvYWRlcikpOwogICAgIHJlc291cmNl T2JqZWN0LT5zZXRPYmplY3QoInJlcXVlc3QiLCBidWlsZE9iamVjdEZvclJlc291cmNlUmVxdWVz dChsb2FkZXItPnJlcXVlc3QoKSkpOwogICAgIHJlc291cmNlT2JqZWN0LT5zZXRPYmplY3QoInJl c3BvbnNlIiwgYnVpbGRPYmplY3RGb3JSZXNvdXJjZVJlc3BvbnNlKGxvYWRlci0+cmVzcG9uc2Uo KSkpOwogICAgIHJldHVybiByZXNvdXJjZU9iamVjdDsKQEAgLTI3MywzMiArMjYzLDE2IEBAIHN0 YXRpYyBTdHJpbmcgY2FjaGVkUmVzb3VyY2VUeXBlU3RyaW5nKGNvbnN0IENhY2hlZFJlc291cmNl JiBjYWNoZWRSZXNvdXJjZSkKICAgICByZXR1cm4gIk90aGVyIjsKIH0KIAotc3RhdGljIFBhc3NS ZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBidWlsZE9iamVjdEZvckNhY2hlZFJlc291cmNlKERvY3Vt ZW50TG9hZGVyKiBsb2FkZXIsIGNvbnN0IENhY2hlZFJlc291cmNlJiBjYWNoZWRSZXNvdXJjZSkK K3N0YXRpYyBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gYnVpbGRPYmplY3RGb3JDYWNoZWRS ZXNvdXJjZShjb25zdCBDYWNoZWRSZXNvdXJjZSYgY2FjaGVkUmVzb3VyY2UpCiB7CiAgICAgUmVm UHRyPEluc3BlY3Rvck9iamVjdD4gcmVzb3VyY2VPYmplY3QgPSBJbnNwZWN0b3JPYmplY3Q6OmNy ZWF0ZSgpOwogICAgIHJlc291cmNlT2JqZWN0LT5zZXRTdHJpbmcoInVybCIsIGNhY2hlZFJlc291 cmNlLnVybCgpKTsKICAgICByZXNvdXJjZU9iamVjdC0+c2V0U3RyaW5nKCJ0eXBlIiwgY2FjaGVk UmVzb3VyY2VUeXBlU3RyaW5nKGNhY2hlZFJlc291cmNlKSk7CiAgICAgcmVzb3VyY2VPYmplY3Qt PnNldE51bWJlcigiYm9keVNpemUiLCBjYWNoZWRSZXNvdXJjZS5lbmNvZGVkU2l6ZSgpKTsKICAg ICByZXNvdXJjZU9iamVjdC0+c2V0T2JqZWN0KCJyZXNwb25zZSIsIGJ1aWxkT2JqZWN0Rm9yUmVz b3VyY2VSZXNwb25zZShjYWNoZWRSZXNvdXJjZS5yZXNwb25zZSgpKSk7Ci0gICAgcmVzb3VyY2VP YmplY3QtPnNldE9iamVjdCgibG9hZGVyIiwgYnVpbGRPYmplY3RGb3JEb2N1bWVudExvYWRlcihs b2FkZXIpKTsKICAgICByZXR1cm4gcmVzb3VyY2VPYmplY3Q7CiB9CiAKLXN0YXRpYyB2b2lkIHBv cHVsYXRlT2JqZWN0V2l0aEZyYW1lUmVzb3VyY2VzKEZyYW1lKiBmcmFtZSwgUGFzc1JlZlB0cjxJ bnNwZWN0b3JPYmplY3Q+IGZyYW1lUmVzb3VyY2VzKQotewotICAgIGZyYW1lUmVzb3VyY2VzLT5z ZXRPYmplY3QoInJlc291cmNlIiwgYnVpbGRPYmplY3RGb3JGcmFtZVJlc291cmNlKGZyYW1lKSk7 Ci0gICAgUmVmUHRyPEluc3BlY3RvckFycmF5PiBzdWJyZXNvdXJjZXMgPSBJbnNwZWN0b3JBcnJh eTo6Y3JlYXRlKCk7Ci0gICAgZnJhbWVSZXNvdXJjZXMtPnNldEFycmF5KCJzdWJyZXNvdXJjZXMi LCBzdWJyZXNvdXJjZXMpOwotCi0gICAgY29uc3QgQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OkRvY3Vt ZW50UmVzb3VyY2VNYXAmIGFsbFJlc291cmNlcyA9IGZyYW1lLT5kb2N1bWVudCgpLT5jYWNoZWRS ZXNvdXJjZUxvYWRlcigpLT5hbGxDYWNoZWRSZXNvdXJjZXMoKTsKLSAgICBDYWNoZWRSZXNvdXJj ZUxvYWRlcjo6RG9jdW1lbnRSZXNvdXJjZU1hcDo6Y29uc3RfaXRlcmF0b3IgZW5kID0gYWxsUmVz b3VyY2VzLmVuZCgpOwotICAgIGZvciAoQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OkRvY3VtZW50UmVz b3VyY2VNYXA6OmNvbnN0X2l0ZXJhdG9yIGl0ID0gYWxsUmVzb3VyY2VzLmJlZ2luKCk7IGl0ICE9 IGVuZDsgKytpdCkgewotICAgICAgICBDYWNoZWRSZXNvdXJjZSogY2FjaGVkUmVzb3VyY2UgPSBp dC0+c2Vjb25kLmdldCgpOwotICAgICAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBjYWNoZWRS ZXNvdXJjZU9iamVjdCA9IGJ1aWxkT2JqZWN0Rm9yQ2FjaGVkUmVzb3VyY2UoZnJhbWUtPmxvYWRl cigpLT5kb2N1bWVudExvYWRlcigpLCAqY2FjaGVkUmVzb3VyY2UpOwotICAgICAgICBzdWJyZXNv dXJjZXMtPnB1c2hWYWx1ZShjYWNoZWRSZXNvdXJjZU9iamVjdCk7Ci0gICAgfQotfQotCiBJbnNw ZWN0b3JSZXNvdXJjZUFnZW50Ojp+SW5zcGVjdG9yUmVzb3VyY2VBZ2VudCgpCiB7CiAgICAgQVNT RVJUKCFtX2luc3RydW1lbnRpbmdBZ2VudHMtPmluc3BlY3RvclJlc291cmNlQWdlbnQoKSk7CkBA IC0zMjAsNyArMjk0LDYgQEAgdm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50Ojp3aWxsU2VuZFJl cXVlc3QodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBEb2N1bWVudEwKICAgICByZXF1ZXN0LnNl dFJlcG9ydExvYWRUaW1pbmcodHJ1ZSk7CiAgICAgcmVxdWVzdC5zZXRSZXBvcnRSYXdIZWFkZXJz KHRydWUpOwogCi0gICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gbG9hZGVyT2JqZWN0ID0gYnVp bGRPYmplY3RGb3JEb2N1bWVudExvYWRlcihsb2FkZXIpOwogICAgIFJlZlB0cjxTY3JpcHRDYWxs U3RhY2s+IGNhbGxTdGFjayA9IGNyZWF0ZVNjcmlwdENhbGxTdGFjayhTY3JpcHRDYWxsU3RhY2s6 Om1heENhbGxTdGFja1NpemVUb0NhcHR1cmUsIHRydWUpOwogICAgIFJlZlB0cjxJbnNwZWN0b3JB cnJheT4gY2FsbFN0YWNrVmFsdWU7CiAgICAgaWYgKGNhbGxTdGFjaykKQEAgLTMyOCw3ICszMDEs NyBAQCB2b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OndpbGxTZW5kUmVxdWVzdCh1bnNpZ25l ZCBsb25nIGlkZW50aWZpZXIsIERvY3VtZW50TAogICAgIGVsc2UKICAgICAgICAgY2FsbFN0YWNr VmFsdWUgPSBJbnNwZWN0b3JBcnJheTo6Y3JlYXRlKCk7CiAKLSAgICBtX2Zyb250ZW5kLT53aWxs U2VuZFJlcXVlc3Qoc3RhdGljX2Nhc3Q8aW50PihpZGVudGlmaWVyKSwgbG9hZGVyT2JqZWN0LCBi dWlsZE9iamVjdEZvclJlc291cmNlUmVxdWVzdChyZXF1ZXN0KSwgYnVpbGRPYmplY3RGb3JSZXNv dXJjZVJlc3BvbnNlKHJlZGlyZWN0UmVzcG9uc2UpLCBjdXJyZW50VGltZSgpLCBjYWxsU3RhY2tW YWx1ZSk7CisgICAgbV9mcm9udGVuZC0+d2lsbFNlbmRSZXF1ZXN0KHN0YXRpY19jYXN0PGludD4o aWRlbnRpZmllciksIHBvaW50ZXJBc0lkKGxvYWRlci0+ZnJhbWUoKSksIHBvaW50ZXJBc0lkKGxv YWRlciksIGJ1aWxkT2JqZWN0Rm9yUmVzb3VyY2VSZXF1ZXN0KHJlcXVlc3QpLCBidWlsZE9iamVj dEZvclJlc291cmNlUmVzcG9uc2UocmVkaXJlY3RSZXNwb25zZSksIGN1cnJlbnRUaW1lKCksIGNh bGxTdGFja1ZhbHVlKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjptYXJrUmVz b3VyY2VBc0NhY2hlZCh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIpCkBAIC0zODMsNyArMzU2LDcg QEAgdm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpkaWRGYWlsTG9hZGluZyh1bnNpZ25lZCBs b25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc28KIAogdm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50 OjpkaWRMb2FkUmVzb3VyY2VGcm9tTWVtb3J5Q2FjaGUoRG9jdW1lbnRMb2FkZXIqIGxvYWRlciwg Y29uc3QgQ2FjaGVkUmVzb3VyY2UqIHJlc291cmNlKQogewotICAgIG1fZnJvbnRlbmQtPmRpZExv YWRSZXNvdXJjZUZyb21NZW1vcnlDYWNoZShjdXJyZW50VGltZSgpLCBidWlsZE9iamVjdEZvckNh Y2hlZFJlc291cmNlKGxvYWRlciwgKnJlc291cmNlKSk7CisgICAgbV9mcm9udGVuZC0+ZGlkTG9h ZFJlc291cmNlRnJvbU1lbW9yeUNhY2hlKHBvaW50ZXJBc0lkKGxvYWRlci0+ZnJhbWUoKSksIHBv aW50ZXJBc0lkKGxvYWRlciksIGN1cnJlbnRUaW1lKCksIGJ1aWxkT2JqZWN0Rm9yQ2FjaGVkUmVz b3VyY2UoKnJlc291cmNlKSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6c2V0 SW5pdGlhbENvbnRlbnQodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmIHNv dXJjZVN0cmluZywgY29uc3QgU3RyaW5nJiB0eXBlKQpAQCAtNDAzLDI5ICszNzYsNDMgQEAgc3Rh dGljIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBidWlsZE9iamVjdEZvckZyYW1lKEZyYW1l KiBmcmFtZSkKICAgICAgICAgZnJhbWVPYmplY3QtPnNldFN0cmluZygibmFtZSIsIG5hbWUpOwog ICAgIH0KICAgICBmcmFtZU9iamVjdC0+c2V0U3RyaW5nKCJ1cmwiLCBmcmFtZS0+ZG9jdW1lbnQo KS0+dXJsKCkuc3RyaW5nKCkpOworICAgIGZyYW1lT2JqZWN0LT5zZXRTdHJpbmcoImxvYWRlcklk IiwgcG9pbnRlckFzSWQoZnJhbWUtPmxvYWRlcigpLT5kb2N1bWVudExvYWRlcigpKSk7CisKICAg ICByZXR1cm4gZnJhbWVPYmplY3Q7CiB9CiAKLXN0YXRpYyBQYXNzUmVmUHRyPEluc3BlY3Rvck9i amVjdD4gYnVpbGRPYmplY3RGb3JGcmFtZVRyZWUoRnJhbWUqIGZyYW1lLCBib29sIGR1bXBSZXNv dXJjZXMpCitzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGJ1aWxkT2JqZWN0Rm9y RnJhbWVUcmVlKEZyYW1lKiBmcmFtZSkKIHsKKyAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBy ZXN1bHQgPSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOwogICAgIFJlZlB0cjxJbnNwZWN0b3JP YmplY3Q+IGZyYW1lT2JqZWN0ID0gYnVpbGRPYmplY3RGb3JGcmFtZShmcmFtZSk7CisgICAgcmVz dWx0LT5zZXRPYmplY3QoImZyYW1lIiwgZnJhbWVPYmplY3QpOworCisgICAgcmVzdWx0LT5zZXRP YmplY3QoIm1haW5SZXNvdXJjZSIsIGJ1aWxkT2JqZWN0Rm9yRnJhbWVSZXNvdXJjZShmcmFtZSkp OworICAgIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4gc3VicmVzb3VyY2VzID0gSW5zcGVjdG9yQXJy YXk6OmNyZWF0ZSgpOworICAgIHJlc3VsdC0+c2V0QXJyYXkoInN1YnJlc291cmNlcyIsIHN1YnJl c291cmNlcyk7CisKKyAgICBjb25zdCBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6RG9jdW1lbnRSZXNv dXJjZU1hcCYgYWxsUmVzb3VyY2VzID0gZnJhbWUtPmRvY3VtZW50KCktPmNhY2hlZFJlc291cmNl TG9hZGVyKCktPmFsbENhY2hlZFJlc291cmNlcygpOworICAgIENhY2hlZFJlc291cmNlTG9hZGVy OjpEb2N1bWVudFJlc291cmNlTWFwOjpjb25zdF9pdGVyYXRvciBlbmQgPSBhbGxSZXNvdXJjZXMu ZW5kKCk7CisgICAgZm9yIChDYWNoZWRSZXNvdXJjZUxvYWRlcjo6RG9jdW1lbnRSZXNvdXJjZU1h cDo6Y29uc3RfaXRlcmF0b3IgaXQgPSBhbGxSZXNvdXJjZXMuYmVnaW4oKTsgaXQgIT0gZW5kOyAr K2l0KSB7CisgICAgICAgIENhY2hlZFJlc291cmNlKiBjYWNoZWRSZXNvdXJjZSA9IGl0LT5zZWNv bmQuZ2V0KCk7CisgICAgICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGNhY2hlZFJlc291cmNl T2JqZWN0ID0gYnVpbGRPYmplY3RGb3JDYWNoZWRSZXNvdXJjZSgqY2FjaGVkUmVzb3VyY2UpOwor ICAgICAgICBzdWJyZXNvdXJjZXMtPnB1c2hWYWx1ZShjYWNoZWRSZXNvdXJjZU9iamVjdCk7Cisg ICAgfQogCi0gICAgaWYgKGR1bXBSZXNvdXJjZXMpCi0gICAgICAgIHBvcHVsYXRlT2JqZWN0V2l0 aEZyYW1lUmVzb3VyY2VzKGZyYW1lLCBmcmFtZU9iamVjdCk7CiAgICAgUmVmUHRyPEluc3BlY3Rv ckFycmF5PiBjaGlsZHJlbkFycmF5OwogICAgIGZvciAoRnJhbWUqIGNoaWxkID0gZnJhbWUtPnRy ZWUoKS0+Zmlyc3RDaGlsZCgpOyBjaGlsZDsgY2hpbGQgPSBjaGlsZC0+dHJlZSgpLT5uZXh0U2li bGluZygpKSB7CiAgICAgICAgIGlmICghY2hpbGRyZW5BcnJheSkgewogICAgICAgICAgICAgY2hp bGRyZW5BcnJheSA9IEluc3BlY3RvckFycmF5OjpjcmVhdGUoKTsKLSAgICAgICAgICAgIGZyYW1l T2JqZWN0LT5zZXRBcnJheSgiY2hpbGRyZW4iLCBjaGlsZHJlbkFycmF5KTsKKyAgICAgICAgICAg IHJlc3VsdC0+c2V0QXJyYXkoImNoaWxkRnJhbWVzIiwgY2hpbGRyZW5BcnJheSk7CiAgICAgICAg IH0KLSAgICAgICAgY2hpbGRyZW5BcnJheS0+cHVzaE9iamVjdChidWlsZE9iamVjdEZvckZyYW1l VHJlZShjaGlsZCwgZHVtcFJlc291cmNlcykpOworICAgICAgICBjaGlsZHJlbkFycmF5LT5wdXNo T2JqZWN0KGJ1aWxkT2JqZWN0Rm9yRnJhbWVUcmVlKGNoaWxkKSk7CiAgICAgfQotICAgIHJldHVy biBmcmFtZU9iamVjdDsKKyAgICByZXR1cm4gcmVzdWx0OwogfQogCiB2b2lkIEluc3BlY3RvclJl c291cmNlQWdlbnQ6OmRpZENvbW1pdExvYWQoRG9jdW1lbnRMb2FkZXIqIGxvYWRlcikKIHsKLSAg ICBtX2Zyb250ZW5kLT5kaWRDb21taXRMb2FkRm9yRnJhbWUoYnVpbGRPYmplY3RGb3JGcmFtZShs b2FkZXItPmZyYW1lKCkpLCBidWlsZE9iamVjdEZvckRvY3VtZW50TG9hZGVyKGxvYWRlcikpOwor ICAgIG1fZnJvbnRlbmQtPmRpZENvbW1pdExvYWRGb3JGcmFtZShidWlsZE9iamVjdEZvckZyYW1l KGxvYWRlci0+ZnJhbWUoKSksIHBvaW50ZXJBc0lkKGxvYWRlcikpOwogfQogCiB2b2lkIEluc3Bl Y3RvclJlc291cmNlQWdlbnQ6OmZyYW1lRGV0YWNoZWRGcm9tUGFyZW50KEZyYW1lKiBmcmFtZSkK QEAgLTQ5Niw3ICs0ODMsNyBAQCBGcmFtZSogSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6ZnJhbWVG b3JJZChjb25zdCBTdHJpbmcmIGZyYW1lSWQpCiB2b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6 OmVuYWJsZShFcnJvclN0cmluZyosIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiBvYmplY3QpCiB7 CiAgICAgZW5hYmxlKCk7Ci0gICAgKm9iamVjdCA9IGJ1aWxkT2JqZWN0Rm9yRnJhbWVUcmVlKG1f cGFnZS0+bWFpbkZyYW1lKCksIHRydWUpOworICAgICpvYmplY3QgPSBidWlsZE9iamVjdEZvckZy YW1lVHJlZShtX3BhZ2UtPm1haW5GcmFtZSgpKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JSZXNvdXJj ZUFnZW50OjplbmFibGUoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9OZXR3b3JrTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvTmV0d29ya01hbmFnZXIuanMKaW5kZXggYTk5N2JkYzNkYjRjM2JmYjk1YTU5NWM0ZTE2 NmUwZTlkNGQwMDg4MC4uNGFiY2FkZDM4OWI5YmZmMWRmZjlhYTZhMTFkZmYyODRjZGZhNzY0OCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFu YWdlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtN YW5hZ2VyLmpzCkBAIC01Nyw3ICs1Nyw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrTWFuYWdlci5w cm90b3R5cGUgPSB7CiAgICAgICAgIHsKICAgICAgICAgICAgIGNhbGxiYWNrKCghZXJyb3IgJiYg c3VjY2VzcykgPyBjb250ZW50IDogbnVsbCk7CiAgICAgICAgIH0KLSAgICAgICAgTmV0d29ya0Fn ZW50LnJlc291cmNlQ29udGVudChyZXNvdXJjZS5sb2FkZXIuZnJhbWVJZCwgcmVzb3VyY2UudXJs LCBiYXNlNjRFbmNvZGUsIGNhbGxiYWNrV3JhcHBlcik7CisgICAgICAgIE5ldHdvcmtBZ2VudC5y ZXNvdXJjZUNvbnRlbnQocmVzb3VyY2UuZnJhbWVJZCwgcmVzb3VyY2UudXJsLCBiYXNlNjRFbmNv ZGUsIGNhbGxiYWNrV3JhcHBlcik7CiAgICAgfSwKIAogICAgIF9wcm9jZXNzQ2FjaGVkUmVzb3Vy Y2VzOiBmdW5jdGlvbihlcnJvciwgbWFpbkZyYW1lUGF5bG9hZCkKQEAgLTgyLDYgKzgyLDcgQEAg V2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNwYXRjaGVyID0gZnVuY3Rpb24ocmVzb3VyY2VUcmVlTW9k ZWwsIG1hbmFnZXIpCiAgICAgdGhpcy5fbWFuYWdlciA9IG1hbmFnZXI7CiAgICAgdGhpcy5faW5m bGlnaHRSZXNvdXJjZXNCeUlkID0ge307CiAgICAgdGhpcy5faW5mbGlnaHRSZXNvdXJjZXNCeVVS TCA9IHt9OworICAgIHRoaXMuX2ZyYW1lVVJMcyA9IHt9OwogICAgIHRoaXMuX3Jlc291cmNlVHJl ZU1vZGVsID0gcmVzb3VyY2VUcmVlTW9kZWw7CiAgICAgdGhpcy5fbGFzdElkZW50aWZpZXJGb3JD YWNoZWRSZXNvdXJjZSA9IDA7CiAgICAgSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckRvbWFpbkRp c3BhdGNoZXIoIk5ldHdvcmsiLCB0aGlzKTsKQEAgLTEyNCwxNCArMTI1LDE0IEBAIFdlYkluc3Bl Y3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX3VwZGF0 ZVJlc291cmNlV2l0aFJlc3BvbnNlKHJlc291cmNlLCBjYWNoZWRSZXNvdXJjZS5yZXNwb25zZSk7 CiAgICAgfSwKIAotICAgIHdpbGxTZW5kUmVxdWVzdDogZnVuY3Rpb24oaWRlbnRpZmllciwgbG9h ZGVyLCByZXF1ZXN0LCByZWRpcmVjdFJlc3BvbnNlLCB0aW1lLCBjYWxsU3RhY2spCisgICAgd2ls bFNlbmRSZXF1ZXN0OiBmdW5jdGlvbihpZGVudGlmaWVyLCBmcmFtZUlkLCBsb2FkZXJJZCwgcmVx dWVzdCwgcmVkaXJlY3RSZXNwb25zZSwgdGltZSwgY2FsbFN0YWNrKQogICAgIHsKICAgICAgICAg dmFyIHJlc291cmNlID0gdGhpcy5faW5mbGlnaHRSZXNvdXJjZXNCeUlkW2lkZW50aWZpZXJdOwog ICAgICAgICBpZiAocmVzb3VyY2UpIHsKICAgICAgICAgICAgIHRoaXMuZGlkUmVjZWl2ZVJlc3Bv bnNlKGlkZW50aWZpZXIsIHRpbWUsICJPdGhlciIsIHJlZGlyZWN0UmVzcG9uc2UpOwogICAgICAg ICAgICAgcmVzb3VyY2UgPSB0aGlzLl9hcHBlbmRSZWRpcmVjdChpZGVudGlmaWVyLCB0aW1lLCBy ZXF1ZXN0LnVybCk7CiAgICAgICAgIH0gZWxzZQotICAgICAgICAgICAgcmVzb3VyY2UgPSB0aGlz Ll9jcmVhdGVSZXNvdXJjZShpZGVudGlmaWVyLCByZXF1ZXN0LnVybCwgbG9hZGVyLCBjYWxsU3Rh Y2spOworICAgICAgICAgICAgcmVzb3VyY2UgPSB0aGlzLl9jcmVhdGVSZXNvdXJjZShpZGVudGlm aWVyLCBmcmFtZUlkLCBsb2FkZXJJZCwgcmVxdWVzdC51cmwsIGNhbGxTdGFjayk7CiAKICAgICAg ICAgdGhpcy5fdXBkYXRlUmVzb3VyY2VXaXRoUmVxdWVzdChyZXNvdXJjZSwgcmVxdWVzdCk7CiAg ICAgICAgIHJlc291cmNlLnN0YXJ0VGltZSA9IHRpbWU7CkBAIC0xNjEsNyArMTYyLDcgQEAgV2Vi SW5zcGVjdG9yLk5ldHdvcmtEaXNwYXRjaGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5f dXBkYXRlUmVzb3VyY2VXaXRoUmVzcG9uc2UocmVzb3VyY2UsIHJlc3BvbnNlKTsKIAogICAgICAg ICB0aGlzLl91cGRhdGVSZXNvdXJjZShyZXNvdXJjZSk7Ci0gICAgICAgIHRoaXMuX3Jlc291cmNl VHJlZU1vZGVsLmFkZFJlc291cmNlVG9GcmFtZShyZXNvdXJjZS5sb2FkZXIuZnJhbWVJZCwgcmVz b3VyY2UpOworICAgICAgICB0aGlzLl9yZXNvdXJjZVRyZWVNb2RlbC5hZGRSZXNvdXJjZVRvRnJh bWUocmVzb3VyY2UuZnJhbWVJZCwgcmVzb3VyY2UpOwogICAgIH0sCiAKICAgICBkaWRSZWNlaXZl Q29udGVudExlbmd0aDogZnVuY3Rpb24oaWRlbnRpZmllciwgdGltZSwgZGF0YUxlbmd0aCwgbGVu Z3RoUmVjZWl2ZWQpCkBAIC0xOTgsMjAgKzE5OSwyMSBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0Rp c3BhdGNoZXIucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9maW5pc2hSZXNvdXJjZShyZXNv dXJjZSwgdGltZSk7CiAgICAgfSwKIAotICAgIGRpZExvYWRSZXNvdXJjZUZyb21NZW1vcnlDYWNo ZTogZnVuY3Rpb24odGltZSwgY2FjaGVkUmVzb3VyY2UpCisgICAgZGlkTG9hZFJlc291cmNlRnJv bU1lbW9yeUNhY2hlOiBmdW5jdGlvbihmcmFtZUlkLCBsb2FkZXJJZCwgdGltZSwgY2FjaGVkUmVz b3VyY2UpCiAgICAgewotICAgICAgICB2YXIgcmVzb3VyY2UgPSB0aGlzLl9jcmVhdGVSZXNvdXJj ZSgiY2FjaGVkOiIgKyArK3RoaXMuX2xhc3RJZGVudGlmaWVyRm9yQ2FjaGVkUmVzb3VyY2UsIGNh Y2hlZFJlc291cmNlLnVybCwgY2FjaGVkUmVzb3VyY2UubG9hZGVyKTsKKyAgICAgICAgdmFyIHJl c291cmNlID0gdGhpcy5fY3JlYXRlUmVzb3VyY2UoImNhY2hlZDoiICsgKyt0aGlzLl9sYXN0SWRl bnRpZmllckZvckNhY2hlZFJlc291cmNlLCBmcmFtZUlkLCBsb2FkZXJJZCwgY2FjaGVkUmVzb3Vy Y2UudXJsKTsKICAgICAgICAgdGhpcy5fdXBkYXRlUmVzb3VyY2VXaXRoQ2FjaGVkUmVzb3VyY2Uo cmVzb3VyY2UsIGNhY2hlZFJlc291cmNlKTsKICAgICAgICAgcmVzb3VyY2UuY2FjaGVkID0gdHJ1 ZTsKICAgICAgICAgcmVzb3VyY2UucmVxdWVzdE1ldGhvZCA9ICJHRVQiOwogICAgICAgICB0aGlz Ll9zdGFydFJlc291cmNlKHJlc291cmNlKTsKICAgICAgICAgcmVzb3VyY2Uuc3RhcnRUaW1lID0g cmVzb3VyY2UucmVzcG9uc2VSZWNlaXZlZFRpbWUgPSB0aW1lOwogICAgICAgICB0aGlzLl9maW5p c2hSZXNvdXJjZShyZXNvdXJjZSwgdGltZSk7Ci0gICAgICAgIHRoaXMuX3Jlc291cmNlVHJlZU1v ZGVsLmFkZFJlc291cmNlVG9GcmFtZShyZXNvdXJjZS5sb2FkZXIuZnJhbWVJZCwgcmVzb3VyY2Up OworICAgICAgICB0aGlzLl9yZXNvdXJjZVRyZWVNb2RlbC5hZGRSZXNvdXJjZVRvRnJhbWUocmVz b3VyY2UuZnJhbWVJZCwgcmVzb3VyY2UpOwogICAgIH0sCiAKICAgICBmcmFtZURldGFjaGVkRnJv bVBhcmVudDogZnVuY3Rpb24oZnJhbWVJZCkKICAgICB7CisgICAgICAgIGRlbGV0ZSB0aGlzLl9m cmFtZVVSTHNbZnJhbWVJZF07CiAgICAgICAgIHRoaXMuX3Jlc291cmNlVHJlZU1vZGVsLmZyYW1l RGV0YWNoZWRGcm9tUGFyZW50KGZyYW1lSWQpOwogICAgIH0sCiAKQEAgLTIyNiwyMiArMjI4LDI0 IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUgPSB7CiAgICAgICAg IHRoaXMuX3VwZGF0ZVJlc291cmNlKHJlc291cmNlKTsKICAgICB9LAogCi0gICAgZGlkQ29tbWl0 TG9hZEZvckZyYW1lOiBmdW5jdGlvbihmcmFtZSwgbG9hZGVyKQorICAgIGRpZENvbW1pdExvYWRG b3JGcmFtZTogZnVuY3Rpb24oZnJhbWUsIGxvYWRlcklkKQogICAgIHsKLSAgICAgICAgdGhpcy5f cmVzb3VyY2VUcmVlTW9kZWwuZGlkQ29tbWl0TG9hZEZvckZyYW1lKGZyYW1lLCBsb2FkZXIpOwor ICAgICAgICB0aGlzLl9yZXNvdXJjZVRyZWVNb2RlbC5kaWRDb21taXRMb2FkRm9yRnJhbWUoZnJh bWUsIGxvYWRlcklkKTsKICAgICAgICAgaWYgKCFmcmFtZS5wYXJlbnRJZCkgewogICAgICAgICAg ICAgdmFyIG1haW5SZXNvdXJjZSA9IHRoaXMuX3Jlc291cmNlVHJlZU1vZGVsLnJlc291cmNlRm9y VVJMKGZyYW1lLnVybCk7CiAgICAgICAgICAgICBpZiAobWFpblJlc291cmNlKSB7CiAgICAgICAg ICAgICAgICAgV2ViSW5zcGVjdG9yLm1haW5SZXNvdXJjZSA9IG1haW5SZXNvdXJjZTsKICAgICAg ICAgICAgICAgICBtYWluUmVzb3VyY2UuaXNNYWluUmVzb3VyY2UgPSB0cnVlOworICAgICAgICAg ICAgICAgIG1haW5SZXNvdXJjZS5kb2N1bWVudFVSTCA9IGZyYW1lLnVybDsKICAgICAgICAgICAg ICAgICB0aGlzLl9kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLk5ldHdvcmtN YW5hZ2VyLkV2ZW50VHlwZXMuTWFpblJlc291cmNlQ29tbWl0TG9hZCwgbWFpblJlc291cmNlKTsK ICAgICAgICAgICAgIH0KICAgICAgICAgfQorICAgICAgICB0aGlzLl9mcmFtZVVSTHNbZnJhbWUu aWRdID0gZnJhbWUudXJsOwogICAgIH0sCiAKICAgICBkaWRDcmVhdGVXZWJTb2NrZXQ6IGZ1bmN0 aW9uKGlkZW50aWZpZXIsIHJlcXVlc3RVUkwpCiAgICAgewotICAgICAgICB2YXIgcmVzb3VyY2Ug PSB0aGlzLl9jcmVhdGVSZXNvdXJjZShpZGVudGlmaWVyLCByZXF1ZXN0VVJMKTsKKyAgICAgICAg dmFyIHJlc291cmNlID0gdGhpcy5fY3JlYXRlUmVzb3VyY2UoaWRlbnRpZmllciwgbnVsbCwgbnVs bCwgcmVxdWVzdFVSTCk7CiAgICAgICAgIHJlc291cmNlLnR5cGUgPSBXZWJJbnNwZWN0b3IuUmVz b3VyY2UuVHlwZS5XZWJTb2NrZXQ7CiAgICAgICAgIHRoaXMuX3N0YXJ0UmVzb3VyY2UocmVzb3Vy Y2UpOwogICAgIH0sCkBAIC0yOTAsNyArMjk0LDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNw YXRjaGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgb3JpZ2luYWxSZXNvdXJjZS5pZGVudGlmaWVy ID0gInJlZGlyZWN0ZWQ6IiArIGlkZW50aWZpZXIgKyAiLiIgKyBwcmV2aW91c1JlZGlyZWN0cy5s ZW5ndGg7CiAgICAgICAgIGRlbGV0ZSBvcmlnaW5hbFJlc291cmNlLnJlZGlyZWN0czsKICAgICAg ICAgdGhpcy5fZmluaXNoUmVzb3VyY2Uob3JpZ2luYWxSZXNvdXJjZSwgdGltZSk7Ci0gICAgICAg IHZhciBuZXdSZXNvdXJjZSA9IHRoaXMuX2NyZWF0ZVJlc291cmNlKGlkZW50aWZpZXIsIHJlZGly ZWN0VVJMLCBvcmlnaW5hbFJlc291cmNlLmxvYWRlciwgb3JpZ2luYWxSZXNvdXJjZS5zdGFja1Ry YWNlKTsKKyAgICAgICAgdmFyIG5ld1Jlc291cmNlID0gdGhpcy5fY3JlYXRlUmVzb3VyY2UoaWRl bnRpZmllciwgb3JpZ2luYWxSZXNvdXJjZS5mcmFtZUlkLCBvcmlnaW5hbFJlc291cmNlLmxvYWRl cklkLCByZWRpcmVjdFVSTCwgb3JpZ2luYWxSZXNvdXJjZS5zdGFja1RyYWNlKTsKICAgICAgICAg bmV3UmVzb3VyY2UucmVkaXJlY3RzID0gcHJldmlvdXNSZWRpcmVjdHMuY29uY2F0KG9yaWdpbmFs UmVzb3VyY2UpOwogICAgICAgICByZXR1cm4gbmV3UmVzb3VyY2U7CiAgICAgfSwKQEAgLTMxNiwy NiArMzIwLDI4IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUgPSB7 CiAgICAgICAgIGRlbGV0ZSB0aGlzLl9pbmZsaWdodFJlc291cmNlc0J5VVJMW3Jlc291cmNlLnVy bF07CiAgICAgfSwKIAotICAgIF9hZGRGcmFtZXNSZWN1cnNpdmVseTogZnVuY3Rpb24oZnJhbWVQ YXlsb2FkKQorICAgIF9hZGRGcmFtZXNSZWN1cnNpdmVseTogZnVuY3Rpb24oZnJhbWVUcmVlUGF5 bG9hZCkKICAgICB7Ci0gICAgICAgIHZhciBmcmFtZVJlc291cmNlID0gdGhpcy5fY3JlYXRlUmVz b3VyY2UobnVsbCwgZnJhbWVQYXlsb2FkLnJlc291cmNlLnVybCwgZnJhbWVQYXlsb2FkLnJlc291 cmNlLmxvYWRlcik7Ci0gICAgICAgIHRoaXMuX3VwZGF0ZVJlc291cmNlV2l0aFJlcXVlc3QoZnJh bWVSZXNvdXJjZSwgZnJhbWVQYXlsb2FkLnJlc291cmNlLnJlcXVlc3QpOwotICAgICAgICB0aGlz Ll91cGRhdGVSZXNvdXJjZVdpdGhSZXNwb25zZShmcmFtZVJlc291cmNlLCBmcmFtZVBheWxvYWQu cmVzb3VyY2UucmVzcG9uc2UpOworICAgICAgICB2YXIgZnJhbWVQYXlsb2FkID0gZnJhbWVUcmVl UGF5bG9hZC5mcmFtZTsKKyAgICAgICAgdmFyIG1haW5SZXNvdXJjZSA9IGZyYW1lVHJlZVBheWxv YWQubWFpblJlc291cmNlOworICAgICAgICB2YXIgZnJhbWVSZXNvdXJjZSA9IHRoaXMuX2NyZWF0 ZVJlc291cmNlKG51bGwsIGZyYW1lUGF5bG9hZC5pZCwgZnJhbWVQYXlsb2FkLmxvYWRlcklkLCBt YWluUmVzb3VyY2UudXJsKTsKKyAgICAgICAgdGhpcy5fdXBkYXRlUmVzb3VyY2VXaXRoUmVxdWVz dChmcmFtZVJlc291cmNlLCBtYWluUmVzb3VyY2UucmVxdWVzdCk7CisgICAgICAgIHRoaXMuX3Vw ZGF0ZVJlc291cmNlV2l0aFJlc3BvbnNlKGZyYW1lUmVzb3VyY2UsIG1haW5SZXNvdXJjZS5yZXNw b25zZSk7CiAgICAgICAgIGZyYW1lUmVzb3VyY2UudHlwZSA9IFdlYkluc3BlY3Rvci5SZXNvdXJj ZS5UeXBlWyJEb2N1bWVudCJdOwogICAgICAgICBmcmFtZVJlc291cmNlLmZpbmlzaGVkID0gdHJ1 ZTsKIAogICAgICAgICB0aGlzLl9yZXNvdXJjZVRyZWVNb2RlbC5hZGRPclVwZGF0ZUZyYW1lKGZy YW1lUGF5bG9hZCk7CiAgICAgICAgIHRoaXMuX3Jlc291cmNlVHJlZU1vZGVsLmFkZFJlc291cmNl VG9GcmFtZShmcmFtZVBheWxvYWQuaWQsIGZyYW1lUmVzb3VyY2UpOwogCi0gICAgICAgIGZvciAo dmFyIGkgPSAwOyBmcmFtZVBheWxvYWQuY2hpbGRyZW4gJiYgaSA8IGZyYW1lUGF5bG9hZC5jaGls ZHJlbi5sZW5ndGg7ICsraSkKLSAgICAgICAgICAgIHRoaXMuX2FkZEZyYW1lc1JlY3Vyc2l2ZWx5 KGZyYW1lUGF5bG9hZC5jaGlsZHJlbltpXSk7CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBmcmFt ZVRyZWVQYXlsb2FkLmNoaWxkRnJhbWVzICYmIGkgPCBmcmFtZVRyZWVQYXlsb2FkLmNoaWxkRnJh bWVzLmxlbmd0aDsgKytpKQorICAgICAgICAgICAgdGhpcy5fYWRkRnJhbWVzUmVjdXJzaXZlbHko ZnJhbWVUcmVlUGF5bG9hZC5jaGlsZEZyYW1lc1tpXSk7CiAKLSAgICAgICAgaWYgKCFmcmFtZVBh eWxvYWQuc3VicmVzb3VyY2VzKQorICAgICAgICBpZiAoIWZyYW1lVHJlZVBheWxvYWQuc3VicmVz b3VyY2VzKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIGZvciAodmFyIGkgPSAwOyBp IDwgZnJhbWVQYXlsb2FkLnN1YnJlc291cmNlcy5sZW5ndGg7ICsraSkgewotICAgICAgICAgICAg dmFyIGNhY2hlZFJlc291cmNlID0gZnJhbWVQYXlsb2FkLnN1YnJlc291cmNlc1tpXTsKLSAgICAg ICAgICAgIHZhciByZXNvdXJjZSA9IHRoaXMuX2NyZWF0ZVJlc291cmNlKG51bGwsIGNhY2hlZFJl c291cmNlLnVybCwgY2FjaGVkUmVzb3VyY2UubG9hZGVyKTsKKyAgICAgICAgZm9yICh2YXIgaSA9 IDA7IGkgPCBmcmFtZVRyZWVQYXlsb2FkLnN1YnJlc291cmNlcy5sZW5ndGg7ICsraSkgeworICAg ICAgICAgICAgdmFyIGNhY2hlZFJlc291cmNlID0gZnJhbWVUcmVlUGF5bG9hZC5zdWJyZXNvdXJj ZXNbaV07CisgICAgICAgICAgICB2YXIgcmVzb3VyY2UgPSB0aGlzLl9jcmVhdGVSZXNvdXJjZShu dWxsLCBmcmFtZVBheWxvYWQuaWQsIGZyYW1lUGF5bG9hZC5sb2FkZXJJZCwgY2FjaGVkUmVzb3Vy Y2UudXJsKTsKICAgICAgICAgICAgIHRoaXMuX3VwZGF0ZVJlc291cmNlV2l0aENhY2hlZFJlc291 cmNlKHJlc291cmNlLCBjYWNoZWRSZXNvdXJjZSk7CiAgICAgICAgICAgICByZXNvdXJjZS5maW5p c2hlZCA9IHRydWU7CiAgICAgICAgICAgICB0aGlzLl9yZXNvdXJjZVRyZWVNb2RlbC5hZGRSZXNv dXJjZVRvRnJhbWUoZnJhbWVQYXlsb2FkLmlkLCByZXNvdXJjZSk7CkBAIC0zNDgsMTMgKzM1NCwx MyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0Rpc3BhdGNoZXIucHJvdG90eXBlID0gewogICAgICAg ICB0aGlzLl9tYW5hZ2VyLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhldmVudFR5cGUsIHJlc291 cmNlKTsKICAgICB9LAogCi0gICAgX2NyZWF0ZVJlc291cmNlOiBmdW5jdGlvbihpZGVudGlmaWVy LCB1cmwsIGxvYWRlciwgc3RhY2tUcmFjZSkKKyAgICBfY3JlYXRlUmVzb3VyY2U6IGZ1bmN0aW9u KGlkZW50aWZpZXIsIGZyYW1lSWQsIGxvYWRlcklkLCB1cmwsIHN0YWNrVHJhY2UpCiAgICAgewog ICAgICAgICB2YXIgcmVzb3VyY2UgPSBuZXcgV2ViSW5zcGVjdG9yLlJlc291cmNlKGlkZW50aWZp ZXIsIHVybCk7Ci0gICAgICAgIHJlc291cmNlLmxvYWRlciA9IGxvYWRlcjsKLSAgICAgICAgaWYg KGxvYWRlcikKLSAgICAgICAgICAgIHJlc291cmNlLmRvY3VtZW50VVJMID0gbG9hZGVyLnVybDsK KyAgICAgICAgcmVzb3VyY2UuZnJhbWVJZCA9IGZyYW1lSWQ7CisgICAgICAgIHJlc291cmNlLmxv YWRlcklkID0gbG9hZGVySWQ7CiAgICAgICAgIHJlc291cmNlLnN0YWNrVHJhY2UgPSBzdGFja1Ry YWNlOworICAgICAgICByZXNvdXJjZS5kb2N1bWVudFVSTCA9IHRoaXMuX2ZyYW1lVVJMc1tmcmFt ZUlkXTsKICAgICAgICAgcmV0dXJuIHJlc291cmNlOwogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VUcmVlTW9kZWwuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVHJlZU1vZGVsLmpzCmlu ZGV4IGRhMmQ0N2E4YzA1YWJhN2M5YTUxMjgzOWU1MzA5M2QwY2Q4MjhhNjAuLjcyMWQ5NWY2NGRl ZGI3MTQyN2E5NjZkNGJmYjYwNTczNzA1N2JiMTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VUcmVlTW9kZWwuanMKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVRyZWVNb2RlbC5qcwpAQCAtNDYsOCAr NDYsNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwucHJvdG90eXBlID0gewogCiAg ICAgYWRkT3JVcGRhdGVGcmFtZTogZnVuY3Rpb24oZnJhbWUpCiAgICAgewotICAgICAgICB2YXIg dG1wUmVzb3VyY2UgPSBuZXcgV2ViSW5zcGVjdG9yLlJlc291cmNlKG51bGwsIGZyYW1lLnVybCk7 Ci0gICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMucmVzb3VyY2VzLmFkZE9yVXBkYXRlRnJhbWUo ZnJhbWUucGFyZW50SWQsIGZyYW1lLmlkLCBmcmFtZS5uYW1lLCB0bXBSZXNvdXJjZS5kaXNwbGF5 TmFtZSk7CisgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMucmVzb3VyY2VzLmFkZE9yVXBkYXRl RnJhbWUoZnJhbWUpOwogICAgICAgICB2YXIgc3ViZnJhbWVzID0gdGhpcy5fc3ViZnJhbWVzW2Zy YW1lLnBhcmVudElkXTsKICAgICAgICAgaWYgKCFzdWJmcmFtZXMpIHsKICAgICAgICAgICAgIHN1 YmZyYW1lcyA9IHt9OwpAQCAtNTYsMTAgKzU1LDEwIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVRy ZWVNb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHN1YmZyYW1lc1tmcmFtZS5pZF0gPSB0cnVl OwogICAgIH0sCiAKLSAgICBkaWRDb21taXRMb2FkRm9yRnJhbWU6IGZ1bmN0aW9uKGZyYW1lLCBs b2FkZXIpCisgICAgZGlkQ29tbWl0TG9hZEZvckZyYW1lOiBmdW5jdGlvbihmcmFtZSwgbG9hZGVy SWQpCiAgICAgewogICAgICAgICAvLyBmcmFtZS5wYXJlbnRJZCA9PT0gMCBpcyB3aGVuIG1haW4g ZnJhbWUgbmF2aWdhdGlvbiBoYXBwZW5zLgotICAgICAgICB0aGlzLl9jbGVhckNoaWxkRnJhbWVz QW5kUmVzb3VyY2VzKGZyYW1lLnBhcmVudElkID8gZnJhbWUuaWQgOiAwLCBsb2FkZXIubG9hZGVy SWQpOworICAgICAgICB0aGlzLl9jbGVhckNoaWxkRnJhbWVzQW5kUmVzb3VyY2VzKGZyYW1lLnBh cmVudElkID8gZnJhbWUuaWQgOiAwLCBsb2FkZXJJZCk7CiAKICAgICAgICAgdGhpcy5hZGRPclVw ZGF0ZUZyYW1lKGZyYW1lKTsKIApAQCAtMTQxLDE4ICsxNDAsMTggQEAgV2ViSW5zcGVjdG9yLlJl c291cmNlVHJlZU1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuX3Jlc291cmNl c0J5VVJMW3Jlc291cmNlLnVybF0gPSBbcmVzb3VyY2VGb3JVUkwsIHJlc291cmNlXTsKICAgICB9 LAogCi0gICAgX2NsZWFyQ2hpbGRGcmFtZXNBbmRSZXNvdXJjZXM6IGZ1bmN0aW9uKGZyYW1lSWQs IGxvYWRlcklkKQorICAgIF9jbGVhckNoaWxkRnJhbWVzQW5kUmVzb3VyY2VzOiBmdW5jdGlvbihm cmFtZUlkLCBsb2FkZXJUb1ByZXNlcnZlSWQpCiAgICAgewogICAgICAgICBXZWJJbnNwZWN0b3Iu cGFuZWxzLnJlc291cmNlcy5yZW1vdmVSZXNvdXJjZXNGcm9tRnJhbWUoZnJhbWVJZCk7CiAKLSAg ICAgICAgdGhpcy5fY2xlYXJSZXNvdXJjZXMoZnJhbWVJZCwgbG9hZGVySWQpOworICAgICAgICB0 aGlzLl9jbGVhclJlc291cmNlcyhmcmFtZUlkLCBsb2FkZXJUb1ByZXNlcnZlSWQpOwogICAgICAg ICB2YXIgc3ViZnJhbWVzID0gdGhpcy5fc3ViZnJhbWVzW2ZyYW1lSWRdOwogICAgICAgICBpZiAo IXN1YmZyYW1lcykKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICBmb3IgKHZhciBjaGls ZEZyYW1lSWQgaW4gc3ViZnJhbWVzKSB7CiAgICAgICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxz LnJlc291cmNlcy5yZW1vdmVGcmFtZShjaGlsZEZyYW1lSWQpOwotICAgICAgICAgICAgdGhpcy5f Y2xlYXJDaGlsZEZyYW1lc0FuZFJlc291cmNlcyhjaGlsZEZyYW1lSWQsIGxvYWRlcklkKTsKKyAg ICAgICAgICAgIHRoaXMuX2NsZWFyQ2hpbGRGcmFtZXNBbmRSZXNvdXJjZXMoY2hpbGRGcmFtZUlk LCAwKTsKICAgICAgICAgfQogICAgICAgICBkZWxldGUgdGhpcy5fc3ViZnJhbWVzW2ZyYW1lSWRd OwogICAgIH0sCkBAIC0xNjYsNyArMTY1LDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1v ZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIHByZXNlcnZlZFJlc291cmNlc0ZvckZyYW1l ID0gW107CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcmVzb3VyY2VzRm9yRnJhbWUubGVu Z3RoOyArK2kpIHsKICAgICAgICAgICAgIHZhciByZXNvdXJjZSA9IHJlc291cmNlc0ZvckZyYW1l W2ldOwotICAgICAgICAgICAgaWYgKHJlc291cmNlLmxvYWRlci5sb2FkZXJJZCA9PT0gbG9hZGVy VG9QcmVzZXJ2ZUlkKSB7CisgICAgICAgICAgICBpZiAocmVzb3VyY2UubG9hZGVySWQgPT09IGxv YWRlclRvUHJlc2VydmVJZCkgewogICAgICAgICAgICAgICAgIHByZXNlcnZlZFJlc291cmNlc0Zv ckZyYW1lLnB1c2gocmVzb3VyY2UpOwogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAg ICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9S ZXNvdXJjZXNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVz b3VyY2VzUGFuZWwuanMKaW5kZXggYTdiYTBjYWM0MDFlMjUxOTQxMjY1Yzk5MDc4MWZjYWEyNWM5 MzAwZS4uNjBkN2Y2NzBmMjU4NmM0ZjkwZmQ2NDFhM2NiZDI4YmYwZDQyOTA0NiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpz CkBAIC0xNzUsOCArMTc1LDE0IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5 cGUgPSB7CiAgICAgICAgIHRoaXMucmVzZXQoKTsKICAgICB9LAogCi0gICAgYWRkT3JVcGRhdGVG cmFtZTogZnVuY3Rpb24ocGFyZW50RnJhbWVJZCwgZnJhbWVJZCwgdGl0bGUsIHN1YnRpdGxlKQor ICAgIGFkZE9yVXBkYXRlRnJhbWU6IGZ1bmN0aW9uKGZyYW1lKQogICAgIHsKKyAgICAgICAgdmFy IGZyYW1lSWQgPSBmcmFtZS5pZDsKKyAgICAgICAgdmFyIHBhcmVudEZyYW1lSWQgPSBmcmFtZS5w YXJlbnRJZDsKKyAgICAgICAgdmFyIHRpdGxlID0gZnJhbWUubmFtZTsKKyAgICAgICAgdmFyIHN1 YnRpdGxlID0gbmV3IFdlYkluc3BlY3Rvci5SZXNvdXJjZShudWxsLCBmcmFtZS51cmwpLmRpc3Bs YXlOYW1lOworICAgICAgICB0aGlzLmFkZERvY3VtZW50VVJMKGZyYW1lLnVybCk7CisgICAgICAg IAogICAgICAgICB2YXIgZnJhbWVUcmVlRWxlbWVudCA9IHRoaXMuX3RyZWVFbGVtZW50Rm9yRnJh bWVJZFtmcmFtZUlkXTsKICAgICAgICAgaWYgKGZyYW1lVHJlZUVsZW1lbnQpIHsKICAgICAgICAg ICAgIGZyYW1lVHJlZUVsZW1lbnQuc2V0VGl0bGVzKHRpdGxlLCBzdWJ0aXRsZSk7CkBAIC0yMjAs OCArMjI2LDYgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZSA9IHsKIAog ICAgIGFkZFJlc291cmNlVG9GcmFtZTogZnVuY3Rpb24oZnJhbWVJZCwgcmVzb3VyY2UpCiAgICAg ewotICAgICAgICB0aGlzLmFkZERvY3VtZW50VVJMKHJlc291cmNlLmRvY3VtZW50VVJMKTsKLQog ICAgICAgICBpZiAocmVzb3VyY2Uuc3RhdHVzQ29kZSA+PSAzMDEgJiYgcmVzb3VyY2Uuc3RhdHVz Q29kZSA8PSAzMDMpCiAgICAgICAgICAgICByZXR1cm47CiAK