200488 2019-08-06 16:33:33 -0700 REGRESSION(r248289): Broke internal builds (Requested by drousso on #webkit). 2019-08-06 16:39:47 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 200419 1 commit-queue commit-queue hi joepeck webkit-bug-importer oldest_to_newest 1558981 0 commit-queue 2019-08-06 16:33:33 -0700 https://trac.webkit.org/changeset/248289 broke the build: Broke internal builds (Requested by drousso on #webkit). This is an automatic bug report generated by webkitbot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests fail. 1558983 1 375664 commit-queue 2019-08-06 16:33:40 -0700 Created attachment 375664 ROLLOUT of r248289 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the rollout will be successful. This process takes approximately 15 minutes. If you would like to land the rollout faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 1558985 2 375664 commit-queue 2019-08-06 16:38:10 -0700 Comment on attachment 375664 ROLLOUT of r248289 Clearing flags on attachment: 375664 Committed r248327: <https://trac.webkit.org/changeset/248327> 1558986 3 commit-queue 2019-08-06 16:38:11 -0700 All reviewed patches have been landed. Closing bug. 1558989 4 webkit-bug-importer 2019-08-06 16:39:47 -0700 <rdar://problem/54010116> 375664 2019-08-06 16:33:40 -0700 2019-08-06 16:38:10 -0700 ROLLOUT of r248289 bug-200488-20190806163340.patch text/plain 55070 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4MzI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAw Yzg5YzE3ZWQwZDM0MGI4ZjU4MDJkYzFmYmQ5NjMzMjk5ZGNmYWNlLi5mMTZhZTczMjZkNWFkNjVj MGIxMDNhOTM3YzI0NDk0MzZhNmQ1YzQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNiBAQAorMjAxOS0wOC0wNiAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtp dC5vcmc+CisKKyAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjI0ODI4OS4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMDQ4OAorCisgICAg ICAgIEJyb2tlIGludGVybmFsIGJ1aWxkcyAoUmVxdWVzdGVkIGJ5IGRyb3Vzc28gb24gI3dlYmtp dCkuCisKKyAgICAgICAgUmV2ZXJ0ZWQgY2hhbmdlc2V0OgorCisgICAgICAgICJXZWIgSW5zcGVj dG9yOiBTdHlsZXM6IHNob3cgQHN1cHBvcnRzIENTUyBncm91cGluZ3MiCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDA0MTkKKyAgICAgICAgaHR0cHM6 Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzI0ODI4OQorCiAyMDE5LTA4LTA2ICBEZXZpbiBS b3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBhbGxv dyBjb21tZW50cyBpbiBwcm90b2NvbCBKU09OCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDc3MjZhNjdkMGJjN2U1 MjMyMWJhYjAzYjJmZTM5NTk2NWEzMDFlOC4uZDA3Zjc0MjU0Njk1NjI4NGU5NDc2MTdhYzYwYWI3 OWUyMDRkMzE0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE5LTA4LTA2ICBDb21t aXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KKworICAgICAgICBVbnJldmlld2Vk LCByb2xsaW5nIG91dCByMjQ4Mjg5LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjAwNDg4CisKKyAgICAgICAgQnJva2UgaW50ZXJuYWwgYnVpbGRzIChS ZXF1ZXN0ZWQgYnkgZHJvdXNzbyBvbiAjd2Via2l0KS4KKworICAgICAgICBSZXZlcnRlZCBjaGFu Z2VzZXQ6CisKKyAgICAgICAgIldlYiBJbnNwZWN0b3I6IFN0eWxlczogc2hvdyBAc3VwcG9ydHMg Q1NTIGdyb3VwaW5ncyIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIwMDQxOQorICAgICAgICBodHRwczovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQv MjQ4Mjg5CisKIDIwMTktMDgtMDYgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAog ICAgICAgICBGaXggaW5lZmZpY2llbmN5IGluIEhUVFBIZWFkZXJNYXA6OnNldChDRlN0cmluZ1Jl ZiwgY29uc3QgU3RyaW5nJikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFu Z2VMb2cgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDk0NmU2NDQ5MGJi OTE2YzRkOThkOTExNjI5OTM3YjIxNzgyYWZlMWEuLjgxMzE4MDM0ODBmZDM0OWYwZDJkMTBjYWM3 ZTA0NTI2MzZkNzI2NjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBA CisyMDE5LTA4LTA2ICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KKwor ICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMjQ4Mjg5LgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAwNDg4CisKKyAgICAgICAgQnJva2Ug aW50ZXJuYWwgYnVpbGRzIChSZXF1ZXN0ZWQgYnkgZHJvdXNzbyBvbiAjd2Via2l0KS4KKworICAg ICAgICBSZXZlcnRlZCBjaGFuZ2VzZXQ6CisKKyAgICAgICAgIldlYiBJbnNwZWN0b3I6IFN0eWxl czogc2hvdyBAc3VwcG9ydHMgQ1NTIGdyb3VwaW5ncyIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMDQxOQorICAgICAgICBodHRwczovL3RyYWMud2Vi a2l0Lm9yZy9jaGFuZ2VzZXQvMjQ4Mjg5CisKIDIwMTktMDgtMDYgIE5pa2l0YSBWYXNpbHlldiAg PG52YXNpbHlldkBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogUlRMOiBnby10 byBhcnJvd3MgYW5kIGV4cGFuZCB0cmlhbmdsZXMgaW4gQ29tcHV0ZWQgcGFuZWwgc2hvdWxkIG1h dGNoIHRoZWlyIGNvbnRleHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNw ZWN0b3IvcHJvdG9jb2wvQ1NTLmpzb24gYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9y L3Byb3RvY29sL0NTUy5qc29uCmluZGV4IGNkYTMxNzVjNDY5YjBkMjA0Y2I4NmE3YmM4ODE1OTFk MDM5N2UyZmQuLmU0OGYzYmIwYTYzNjMzMzQ1ZWI5Njc0MTgxYmRkMzVkZDRmMDllYzAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcHJvdG9jb2wvQ1NTLmpzb24K KysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9wcm90b2NvbC9DU1MuanNvbgpA QCAtMTQ0LDcgKzE0NCw3IEBACiAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzb3VyY2VMaW5l IiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJMaW5lIG9yZGluYWwgb2YgdGhl IHJ1bGUgc2VsZWN0b3Igc3RhcnQgY2hhcmFjdGVyIGluIHRoZSByZXNvdXJjZS4ifSwKICAgICAg ICAgICAgICAgICB7ICJuYW1lIjogIm9yaWdpbiIsICIkcmVmIjogIlN0eWxlU2hlZXRPcmlnaW4i LCAiZGVzY3JpcHRpb24iOiAiUGFyZW50IHN0eWxlc2hlZXQncyBvcmlnaW4uIn0sCiAgICAgICAg ICAgICAgICAgeyAibmFtZSI6ICJzdHlsZSIsICIkcmVmIjogIkNTU1N0eWxlIiwgImRlc2NyaXB0 aW9uIjogIkFzc29jaWF0ZWQgc3R5bGUgZGVjbGFyYXRpb24uIiB9LAotICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAiZ3JvdXBpbmdzIiwgInR5cGUiOiAiYXJyYXkiLCAiaXRlbXMiOiB7ICIkcmVm IjogIkdyb3VwaW5nIiB9LCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiR3JvdXBp bmcgbGlzdCBhcnJheSAoZm9yIHJ1bGVzIGludm9sdmluZyBAbWVkaWEvQHN1cHBvcnRzKS4gVGhl IGFycmF5IGVudW1lcmF0ZXMgQ1NTIGdyb3VwaW5ncyBzdGFydGluZyB3aXRoIHRoZSBpbm5lcm1v c3Qgb25lLCBnb2luZyBvdXR3YXJkcy4iIH0KKyAgICAgICAgICAgICAgICB7ICJuYW1lIjogIm1l ZGlhIiwgInR5cGUiOiAiYXJyYXkiLCAiaXRlbXMiOiB7ICIkcmVmIjogIkNTU01lZGlhIiB9LCAi b3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiTWVkaWEgbGlzdCBhcnJheSAoZm9yIHJ1 bGVzIGludm9sdmluZyBtZWRpYSBxdWVyaWVzKS4gVGhlIGFycmF5IGVudW1lcmF0ZXMgbWVkaWEg cXVlcmllcyBzdGFydGluZyB3aXRoIHRoZSBpbm5lcm1vc3Qgb25lLCBnb2luZyBvdXR3YXJkcy4i IH0KICAgICAgICAgICAgIF0KICAgICAgICAgfSwKICAgICAgICAgewpAQCAtMjIxLDEzICsyMjEs MTQgQEAKICAgICAgICAgICAgIF0KICAgICAgICAgfSwKICAgICAgICAgewotICAgICAgICAgICAg ImlkIjogIkdyb3VwaW5nIiwKKyAgICAgICAgICAgICJpZCI6ICJDU1NNZWRpYSIsCiAgICAgICAg ICAgICAidHlwZSI6ICJvYmplY3QiLAotICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkNTUyBA bWVkaWEgKGFzIHdlbGwgYXMgb3RoZXIgdXNlcnMgb2YgbWVkaWEgcXVlcmllcywgbGlrZSBAaW1w b3J0LCA8c3R5bGU+LCA8bGluaz4sIGV0Yy4pIGFuZCBAc3VwcG9ydHMgZGVzY3JpcHRvci4iLAor ICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkNTUyBtZWRpYSBxdWVyeSBkZXNjcmlwdG9yLiIs CiAgICAgICAgICAgICAicHJvcGVydGllcyI6IFsKICAgICAgICAgICAgICAgICB7ICJuYW1lIjog InRleHQiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiTWVkaWEgcXVlcnkgdGV4 dC4iIH0sCi0gICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ0eXBlIiwgInR5cGUiOiAic3RyaW5n IiwgImVudW0iOiBbIm1lZGlhLXJ1bGUiLCAibWVkaWEtaW1wb3J0LXJ1bGUiLCAibWVkaWEtbGlu ay1ub2RlIiwgIm1lZGlhLXN0eWxlLW5vZGUiLCAic3VwcG9ydHMtcnVsZSJdLCAiZGVzY3JpcHRp b24iOiAiU291cmNlIG9mIHRoZSBtZWRpYSBxdWVyeTogXCJtZWRpYS1ydWxlXCIgaWYgc3BlY2lm aWVkIGJ5IGEgQG1lZGlhIHJ1bGUsIFwibWVkaWEtaW1wb3J0LXJ1bGVcIiBpZiBzcGVjaWZpZWQg YnkgYW4gQGltcG9ydCBydWxlLCBcIm1lZGlhLWxpbmstbm9kZVwiIGlmIHNwZWNpZmllZCBieSBh IFwibWVkaWFcIiBhdHRyaWJ1dGUgaW4gYSBsaW5rZWQgc3R5bGUgc2hlZXQncyBMSU5LIHRhZywg XCJtZWRpYS1zdHlsZS1ub2RlXCIgaWYgc3BlY2lmaWVkIGJ5IGEgXCJtZWRpYVwiIGF0dHJpYnV0 ZSBpbiBhbiBpbmxpbmUgc3R5bGUgc2hlZXQncyBTVFlMRSB0YWcsIFwic3VwcG9ydHMtcnVsZVwi IGlmIHNwZWNpZmllZCBieSBhbiBAc3VwcG9ydHMgcnVsZSwgLiIgfSwKLSAgICAgICAgICAgICAg ICB7ICJuYW1lIjogInNvdXJjZVVSTCIsICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6IHRy dWUsICJkZXNjcmlwdGlvbiI6ICJVUkwgb2YgdGhlIGRvY3VtZW50IGNvbnRhaW5pbmcgdGhlIENT UyBncm91cGluZy4iIH0KKyAgICAgICAgICAgICAgICB7ICJuYW1lIjogInNvdXJjZSIsICJ0eXBl IjogInN0cmluZyIsICJlbnVtIjogWyJtZWRpYVJ1bGUiLCAiaW1wb3J0UnVsZSIsICJsaW5rZWRT aGVldCIsICJpbmxpbmVTaGVldCJdLCAiZGVzY3JpcHRpb24iOiAiU291cmNlIG9mIHRoZSBtZWRp YSBxdWVyeTogXCJtZWRpYVJ1bGVcIiBpZiBzcGVjaWZpZWQgYnkgYSBAbWVkaWEgcnVsZSwgXCJp bXBvcnRSdWxlXCIgaWYgc3BlY2lmaWVkIGJ5IGFuIEBpbXBvcnQgcnVsZSwgXCJsaW5rZWRTaGVl dFwiIGlmIHNwZWNpZmllZCBieSBhIFwibWVkaWFcIiBhdHRyaWJ1dGUgaW4gYSBsaW5rZWQgc3R5 bGVzaGVldCdzIExJTksgdGFnLCBcImlubGluZVNoZWV0XCIgaWYgc3BlY2lmaWVkIGJ5IGEgXCJt ZWRpYVwiIGF0dHJpYnV0ZSBpbiBhbiBpbmxpbmUgc3R5bGVzaGVldCdzIFNUWUxFIHRhZy4iIH0s CisgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzb3VyY2VVUkwiLCAidHlwZSI6ICJzdHJpbmci LCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiVVJMIG9mIHRoZSBkb2N1bWVudCBj b250YWluaW5nIHRoZSBtZWRpYSBxdWVyeSBkZXNjcmlwdGlvbi4iIH0sCisgICAgICAgICAgICAg ICAgeyAibmFtZSI6ICJzb3VyY2VMaW5lIiwgInR5cGUiOiAiaW50ZWdlciIsICJvcHRpb25hbCI6 IHRydWUsICJkZXNjcmlwdGlvbiI6ICJMaW5lIGluIHRoZSBkb2N1bWVudCBjb250YWluaW5nIHRo ZSBtZWRpYSBxdWVyeSAobm90IGRlZmluZWQgZm9yIHRoZSBcInN0eWxlc2hlZXRcIiBzb3VyY2Up LiIgfQogICAgICAgICAgICAgXQogICAgICAgICB9CiAgICAgXSwKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2Nzcy9NZWRpYUxpc3QuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL01lZGlhTGlz dC5jcHAKaW5kZXggMjExMmY0MGM0YzcyMDgwYmE4MGU1ZDJkMjkyOTI0Yjc2ZjE3YTFiNi4uMWFk OTY0NDMyMTA5NGNhODIyMmZmNmRmMjNiZTlhNDdlYzVmODQxNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvY3NzL01lZGlhTGlzdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL01lZGlh TGlzdC5jcHAKQEAgLTczLDYgKzczLDcgQEAgTWVkaWFRdWVyeVNldDo6TWVkaWFRdWVyeVNldCgp ID0gZGVmYXVsdDsKIAogTWVkaWFRdWVyeVNldDo6TWVkaWFRdWVyeVNldChjb25zdCBNZWRpYVF1 ZXJ5U2V0JiBvKQogICAgIDogUmVmQ291bnRlZCgpCisgICAgLCBtX2xhc3RMaW5lKG8ubV9sYXN0 TGluZSkKICAgICAsIG1fcXVlcmllcyhvLm1fcXVlcmllcykKIHsKIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9NZWRpYUxpc3QuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9NZWRpYUxp c3QuaAppbmRleCAyYjZkOTg3OTMxZjg3ZGZkZTliM2JlYjMyZDMxY2JjNzY2NjU2MDQ5Li40Y2Jk NDAxMTIzOTI0ZjM0ZTMyMGIwZDdkNzkxM2YwN2ExYzMyNWIyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvTWVkaWFMaXN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL01lZGlhTGlz dC5oCkBAIC01Niw2ICs1Niw5IEBAIHB1YmxpYzoKIAogICAgIGNvbnN0IFZlY3RvcjxNZWRpYVF1 ZXJ5PiYgcXVlcnlWZWN0b3IoKSBjb25zdCB7IHJldHVybiBtX3F1ZXJpZXM7IH0KIAorICAgIGlu dCBsYXN0TGluZSgpIGNvbnN0IHsgcmV0dXJuIG1fbGFzdExpbmU7IH0KKyAgICB2b2lkIHNldExh c3RMaW5lKGludCBsYXN0TGluZSkgeyBtX2xhc3RMaW5lID0gbGFzdExpbmU7IH0KKwogICAgIFdF QkNPUkVfRVhQT1JUIFN0cmluZyBtZWRpYVRleHQoKSBjb25zdDsKIAogICAgIFJlZjxNZWRpYVF1 ZXJ5U2V0PiBjb3B5KCkgY29uc3QgeyByZXR1cm4gYWRvcHRSZWYoKm5ldyBNZWRpYVF1ZXJ5U2V0 KCp0aGlzKSk7IH0KQEAgLTY3LDYgKzcwLDcgQEAgcHJpdmF0ZToKICAgICBXRUJDT1JFX0VYUE9S VCBNZWRpYVF1ZXJ5U2V0KGNvbnN0IFN0cmluZyYgbWVkaWFRdWVyeSk7CiAgICAgTWVkaWFRdWVy eVNldChjb25zdCBNZWRpYVF1ZXJ5U2V0Jik7CiAKKyAgICBpbnQgbV9sYXN0TGluZSB7IDAgfTsK ICAgICBWZWN0b3I8TWVkaWFRdWVyeT4gbV9xdWVyaWVzOwogfTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwCmluZGV4IDE0OTVmMzllMmE0 NWUzYzcyYTk2MTRhZmY1NzllNjRkZGY1NWMwYjUuLmNhMzBlMWEyN2JmNDA2MTg1YTQ4MzIwYTI2 MzE4M2VhN2U2ZTQ3ZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JTdHlsZVNoZWV0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yU3R5bGVTaGVldC5jcHAKQEAgLTM3OSw2ICszNzksMTMgQEAgdm9pZCBTdHlsZVNoZWV0SGFu ZGxlcjo6b2JzZXJ2ZUNvbW1lbnQodW5zaWduZWQgc3RhcnRPZmZzZXQsIHVuc2lnbmVkIGVuZE9m ZnNldCkKICAgICBtX2N1cnJlbnRSdWxlRGF0YVN0YWNrLmxhc3QoKS0+c3R5bGVTb3VyY2VEYXRh LT5wcm9wZXJ0eURhdGEuYXBwZW5kKENTU1Byb3BlcnR5U291cmNlRGF0YShwcm9wZXJ0eURhdGEu bmFtZSwgcHJvcGVydHlEYXRhLnZhbHVlLCBmYWxzZSwgdHJ1ZSwgdHJ1ZSwgU291cmNlUmFuZ2Uo c3RhcnRPZmZzZXQgLSB0b3BSdWxlQm9keVJhbmdlLnN0YXJ0LCBlbmRPZmZzZXQgLSB0b3BSdWxl Qm9keVJhbmdlLnN0YXJ0KSkpOwogfQogCitlbnVtIE1lZGlhTGlzdFNvdXJjZSB7CisgICAgTWVk aWFMaXN0U291cmNlTGlua2VkU2hlZXQsCisgICAgTWVkaWFMaXN0U291cmNlSW5saW5lU2hlZXQs CisgICAgTWVkaWFMaXN0U291cmNlTWVkaWFSdWxlLAorICAgIE1lZGlhTGlzdFNvdXJjZUltcG9y dFJ1bGUKK307CisKIHN0YXRpYyBSZWZQdHI8SW5zcGVjdG9yOjpQcm90b2NvbDo6Q1NTOjpTb3Vy Y2VSYW5nZT4gYnVpbGRTb3VyY2VSYW5nZU9iamVjdChjb25zdCBTb3VyY2VSYW5nZSYgcmFuZ2Us IGNvbnN0IFZlY3RvcjxzaXplX3Q+JiBsaW5lRW5kaW5ncywgaW50KiBlbmRpbmdMaW5lID0gbnVs bHB0cikKIHsKICAgICBpZiAobGluZUVuZGluZ3MuaXNFbXB0eSgpKQpAQCAtMzk4LDYgKzQwNSwz NyBAQCBzdGF0aWMgUmVmUHRyPEluc3BlY3Rvcjo6UHJvdG9jb2w6OkNTUzo6U291cmNlUmFuZ2U+ IGJ1aWxkU291cmNlUmFuZ2VPYmplY3QoY29ucwogICAgICAgICAucmVsZWFzZSgpOwogfQogCitz dGF0aWMgUmVmPEluc3BlY3Rvcjo6UHJvdG9jb2w6OkNTUzo6Q1NTTWVkaWE+IGJ1aWxkTWVkaWFP YmplY3QoY29uc3QgTWVkaWFMaXN0KiBtZWRpYSwgTWVkaWFMaXN0U291cmNlIG1lZGlhTGlzdFNv dXJjZSwgY29uc3QgU3RyaW5nJiBzb3VyY2VVUkwpCit7CisgICAgLy8gTWFrZSBjZXJ0YWluIGNv bXBpbGVycyBoYXBweSBieSBpbml0aWFsaXppbmcgfHNvdXJjZXwgdXAtZnJvbnQuCisgICAgSW5z cGVjdG9yOjpQcm90b2NvbDo6Q1NTOjpDU1NNZWRpYTo6U291cmNlIHNvdXJjZSA9IEluc3BlY3Rv cjo6UHJvdG9jb2w6OkNTUzo6Q1NTTWVkaWE6OlNvdXJjZTo6SW5saW5lU2hlZXQ7CisgICAgc3dp dGNoIChtZWRpYUxpc3RTb3VyY2UpIHsKKyAgICBjYXNlIE1lZGlhTGlzdFNvdXJjZU1lZGlhUnVs ZToKKyAgICAgICAgc291cmNlID0gSW5zcGVjdG9yOjpQcm90b2NvbDo6Q1NTOjpDU1NNZWRpYTo6 U291cmNlOjpNZWRpYVJ1bGU7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgTWVkaWFMaXN0U291 cmNlSW1wb3J0UnVsZToKKyAgICAgICAgc291cmNlID0gSW5zcGVjdG9yOjpQcm90b2NvbDo6Q1NT OjpDU1NNZWRpYTo6U291cmNlOjpJbXBvcnRSdWxlOworICAgICAgICBicmVhazsKKyAgICBjYXNl IE1lZGlhTGlzdFNvdXJjZUxpbmtlZFNoZWV0OgorICAgICAgICBzb3VyY2UgPSBJbnNwZWN0b3I6 OlByb3RvY29sOjpDU1M6OkNTU01lZGlhOjpTb3VyY2U6OkxpbmtlZFNoZWV0OworICAgICAgICBi cmVhazsKKyAgICBjYXNlIE1lZGlhTGlzdFNvdXJjZUlubGluZVNoZWV0OgorICAgICAgICBzb3Vy Y2UgPSBJbnNwZWN0b3I6OlByb3RvY29sOjpDU1M6OkNTU01lZGlhOjpTb3VyY2U6OklubGluZVNo ZWV0OworICAgICAgICBicmVhazsKKyAgICB9CisKKyAgICBhdXRvIG1lZGlhT2JqZWN0ID0gSW5z cGVjdG9yOjpQcm90b2NvbDo6Q1NTOjpDU1NNZWRpYTo6Y3JlYXRlKCkKKyAgICAgICAgLnNldFRl eHQobWVkaWEtPm1lZGlhVGV4dCgpKQorICAgICAgICAuc2V0U291cmNlKHNvdXJjZSkKKyAgICAg ICAgLnJlbGVhc2UoKTsKKworICAgIGlmICghc291cmNlVVJMLmlzRW1wdHkoKSkgeworICAgICAg ICBtZWRpYU9iamVjdC0+c2V0U291cmNlVVJMKHNvdXJjZVVSTCk7CisgICAgICAgIG1lZGlhT2Jq ZWN0LT5zZXRTb3VyY2VMaW5lKG1lZGlhLT5xdWVyaWVzKCktPmxhc3RMaW5lKCkpOworICAgIH0K KyAgICByZXR1cm4gbWVkaWFPYmplY3Q7Cit9CisKIHN0YXRpYyBSZWZQdHI8Q1NTUnVsZUxpc3Q+ IGFzQ1NTUnVsZUxpc3QoQ1NTU3R5bGVTaGVldCogc3R5bGVTaGVldCkKIHsKICAgICBpZiAoIXN0 eWxlU2hlZXQpCkBAIC00MjcsODUgKzQ2NSw1OSBAQCBzdGF0aWMgUmVmUHRyPENTU1J1bGVMaXN0 PiBhc0NTU1J1bGVMaXN0KENTU1J1bGUqIHJ1bGUpCiAgICAgcmV0dXJuIG51bGxwdHI7CiB9CiAK LXN0YXRpYyBSZWY8SlNPTjo6QXJyYXlPZjxJbnNwZWN0b3I6OlByb3RvY29sOjpDU1M6Okdyb3Vw aW5nPj4gYnVpbGRBcnJheUZvckdyb3VwaW5ncyhDU1NSdWxlJiBydWxlKQorc3RhdGljIHZvaWQg ZmlsbE1lZGlhTGlzdENoYWluKENTU1J1bGUqIHJ1bGUsIEpTT046OkFycmF5T2Y8SW5zcGVjdG9y OjpQcm90b2NvbDo6Q1NTOjpDU1NNZWRpYT4mIG1lZGlhQXJyYXkpCiB7Ci0gICAgYXV0byBncm91 cGluZ3NQYXlsb2FkID0gSlNPTjo6QXJyYXlPZjxJbnNwZWN0b3I6OlByb3RvY29sOjpDU1M6Okdy b3VwaW5nPjo6Y3JlYXRlKCk7Ci0KLSAgICBhdXRvKiBwYXJlbnRSdWxlID0gJnJ1bGU7CisgICAg TWVkaWFMaXN0KiBtZWRpYUxpc3Q7CisgICAgQ1NTUnVsZSogcGFyZW50UnVsZSA9IHJ1bGU7Cisg ICAgU3RyaW5nIHNvdXJjZVVSTDsKICAgICB3aGlsZSAocGFyZW50UnVsZSkgewotICAgICAgICBS ZWZQdHI8SW5zcGVjdG9yOjpQcm90b2NvbDo6Q1NTOjpHcm91cGluZz4gcnVsZUdyb3VwaW5nUGF5 bG9hZDsKLQotICAgICAgICBpZiAoaXM8Q1NTTWVkaWFSdWxlPihwYXJlbnRSdWxlKSkgewotICAg ICAgICAgICAgYXV0byogbWVkaWEgPSBkb3duY2FzdDxDU1NNZWRpYVJ1bGU+KHBhcmVudFJ1bGUp LT5tZWRpYSgpOwotICAgICAgICAgICAgaWYgKG1lZGlhICYmIG1lZGlhLT5sZW5ndGgoKSAmJiBt ZWRpYS0+bWVkaWFUZXh0KCkgIT0gImFsbCIpIHsKLSAgICAgICAgICAgICAgICBydWxlR3JvdXBp bmdQYXlsb2FkID0gSW5zcGVjdG9yOjpQcm90b2NvbDo6Q1NTOjpHcm91cGluZzo6Y3JlYXRlKCkK LSAgICAgICAgICAgICAgICAgICAgLnNldFRleHQobWVkaWEtPm1lZGlhVGV4dCgpKQotICAgICAg ICAgICAgICAgICAgICAuc2V0VHlwZShJbnNwZWN0b3I6OlByb3RvY29sOjpDU1M6Okdyb3VwaW5n OjpUeXBlOjpNZWRpYVJ1bGUpCi0gICAgICAgICAgICAgICAgICAgIC5yZWxlYXNlKCk7Ci0gICAg ICAgICAgICB9Ci0gICAgICAgIH0gZWxzZSBpZiAoaXM8Q1NTSW1wb3J0UnVsZT4ocGFyZW50UnVs ZSkpIHsKLSAgICAgICAgICAgIGF1dG8mIG1lZGlhID0gZG93bmNhc3Q8Q1NTSW1wb3J0UnVsZT4o cGFyZW50UnVsZSktPm1lZGlhKCk7Ci0gICAgICAgICAgICBpZiAobWVkaWEubGVuZ3RoKCkgJiYg bWVkaWEubWVkaWFUZXh0KCkgIT0gImFsbCIpIHsKLSAgICAgICAgICAgICAgICBydWxlR3JvdXBp bmdQYXlsb2FkID0gSW5zcGVjdG9yOjpQcm90b2NvbDo6Q1NTOjpHcm91cGluZzo6Y3JlYXRlKCkK LSAgICAgICAgICAgICAgICAgICAgLnNldFRleHQobWVkaWEubWVkaWFUZXh0KCkpCi0gICAgICAg ICAgICAgICAgICAgIC5zZXRUeXBlKEluc3BlY3Rvcjo6UHJvdG9jb2w6OkNTUzo6R3JvdXBpbmc6 OlR5cGU6Ok1lZGlhSW1wb3J0UnVsZSkKLSAgICAgICAgICAgICAgICAgICAgLnJlbGVhc2UoKTsK LSAgICAgICAgICAgIH0KLSAgICAgICAgfSBlbHNlIGlmIChpczxDU1NTdXBwb3J0c1J1bGU+KHBh cmVudFJ1bGUpKSB7Ci0gICAgICAgICAgICBydWxlR3JvdXBpbmdQYXlsb2FkID0gSW5zcGVjdG9y OjpQcm90b2NvbDo6Q1NTOjpHcm91cGluZzo6Y3JlYXRlKCkKLSAgICAgICAgICAgICAgICAuc2V0 VGV4dChkb3duY2FzdDxDU1NTdXBwb3J0c1J1bGU+KHBhcmVudFJ1bGUpLT5jb25kaXRpb25UZXh0 KCkpCi0gICAgICAgICAgICAgICAgLnNldFR5cGUoSW5zcGVjdG9yOjpQcm90b2NvbDo6Q1NTOjpH cm91cGluZzo6VHlwZTo6U3VwcG9ydHNSdWxlKQotICAgICAgICAgICAgICAgIC5yZWxlYXNlKCk7 Ci0gICAgICAgIH0KLQotICAgICAgICBpZiAocnVsZUdyb3VwaW5nUGF5bG9hZCkgewotICAgICAg ICAgICAgaWYgKGF1dG8qIHBhcmVudFN0eWxlU2hlZXQgPSBwYXJlbnRSdWxlLT5wYXJlbnRTdHls ZVNoZWV0KCkpIHsKLSAgICAgICAgICAgICAgICBTdHJpbmcgc291cmNlVVJMID0gcGFyZW50U3R5 bGVTaGVldC0+Y29udGVudHMoKS5iYXNlVVJMKCk7Ci0gICAgICAgICAgICAgICAgaWYgKHNvdXJj ZVVSTC5pc0VtcHR5KCkpIHsKLSAgICAgICAgICAgICAgICAgICAgaWYgKGF1dG8qIG93bmVyRG9j dW1lbnQgPSBwYXJlbnRTdHlsZVNoZWV0LT5vd25lckRvY3VtZW50KCkpCi0gICAgICAgICAgICAg ICAgICAgICAgICBzb3VyY2VVUkwgPSBJbnNwZWN0b3JET01BZ2VudDo6ZG9jdW1lbnRVUkxTdHJp bmcob3duZXJEb2N1bWVudCk7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIGlm ICghc291cmNlVVJMLmlzRW1wdHkoKSkKLSAgICAgICAgICAgICAgICAgICAgcnVsZUdyb3VwaW5n UGF5bG9hZC0+c2V0U291cmNlVVJMKHNvdXJjZVVSTCk7Ci0gICAgICAgICAgICB9Ci0KLSAgICAg ICAgICAgIGdyb3VwaW5nc1BheWxvYWQtPmFkZEl0ZW0oV1RGTW92ZShydWxlR3JvdXBpbmdQYXls b2FkKSk7Ci0gICAgICAgIH0KLQotICAgICAgICBpZiAocGFyZW50UnVsZS0+cGFyZW50UnVsZSgp KSB7CisgICAgICAgIENTU1N0eWxlU2hlZXQqIHBhcmVudFN0eWxlU2hlZXQgPSBudWxscHRyOwor ICAgICAgICBib29sIGlzTWVkaWFSdWxlID0gdHJ1ZTsKKyAgICAgICAgaWYgKGlzPENTU01lZGlh UnVsZT4oKnBhcmVudFJ1bGUpKSB7CisgICAgICAgICAgICBDU1NNZWRpYVJ1bGUmIG1lZGlhUnVs ZSA9IGRvd25jYXN0PENTU01lZGlhUnVsZT4oKnBhcmVudFJ1bGUpOworICAgICAgICAgICAgbWVk aWFMaXN0ID0gbWVkaWFSdWxlLm1lZGlhKCk7CisgICAgICAgICAgICBwYXJlbnRTdHlsZVNoZWV0 ID0gbWVkaWFSdWxlLnBhcmVudFN0eWxlU2hlZXQoKTsKKyAgICAgICAgfSBlbHNlIGlmIChpczxD U1NJbXBvcnRSdWxlPigqcGFyZW50UnVsZSkpIHsKKyAgICAgICAgICAgIENTU0ltcG9ydFJ1bGUm IGltcG9ydFJ1bGUgPSBkb3duY2FzdDxDU1NJbXBvcnRSdWxlPigqcGFyZW50UnVsZSk7CisgICAg ICAgICAgICBtZWRpYUxpc3QgPSAmaW1wb3J0UnVsZS5tZWRpYSgpOworICAgICAgICAgICAgcGFy ZW50U3R5bGVTaGVldCA9IGltcG9ydFJ1bGUucGFyZW50U3R5bGVTaGVldCgpOworICAgICAgICAg ICAgaXNNZWRpYVJ1bGUgPSBmYWxzZTsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICBtZWRp YUxpc3QgPSBudWxscHRyOworCisgICAgICAgIGlmIChwYXJlbnRTdHlsZVNoZWV0KSB7CisgICAg ICAgICAgICBzb3VyY2VVUkwgPSBwYXJlbnRTdHlsZVNoZWV0LT5jb250ZW50cygpLmJhc2VVUkwo KTsKKyAgICAgICAgICAgIGlmIChzb3VyY2VVUkwuaXNFbXB0eSgpKQorICAgICAgICAgICAgICAg IHNvdXJjZVVSTCA9IEluc3BlY3RvckRPTUFnZW50Ojpkb2N1bWVudFVSTFN0cmluZyhwYXJlbnRT dHlsZVNoZWV0LT5vd25lckRvY3VtZW50KCkpOworICAgICAgICB9IGVsc2UKKyAgICAgICAgICAg IHNvdXJjZVVSTCA9IGVtcHR5U3RyaW5nKCk7CisKKyAgICAgICAgaWYgKG1lZGlhTGlzdCAmJiBt ZWRpYUxpc3QtPmxlbmd0aCgpKQorICAgICAgICAgICAgbWVkaWFBcnJheS5hZGRJdGVtKGJ1aWxk TWVkaWFPYmplY3QobWVkaWFMaXN0LCBpc01lZGlhUnVsZSA/IE1lZGlhTGlzdFNvdXJjZU1lZGlh UnVsZSA6IE1lZGlhTGlzdFNvdXJjZUltcG9ydFJ1bGUsIHNvdXJjZVVSTCkpOworCisgICAgICAg IGlmIChwYXJlbnRSdWxlLT5wYXJlbnRSdWxlKCkpCiAgICAgICAgICAgICBwYXJlbnRSdWxlID0g cGFyZW50UnVsZS0+cGFyZW50UnVsZSgpOwotICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAg IH0KLQotICAgICAgICBhdXRvKiBzdHlsZVNoZWV0ID0gcGFyZW50UnVsZS0+cGFyZW50U3R5bGVT aGVldCgpOwotICAgICAgICB3aGlsZSAoc3R5bGVTaGVldCkgewotICAgICAgICAgICAgYXV0byog bWVkaWEgPSBzdHlsZVNoZWV0LT5tZWRpYSgpOwotICAgICAgICAgICAgaWYgKG1lZGlhICYmIG1l ZGlhLT5sZW5ndGgoKSAmJiBtZWRpYS0+bWVkaWFUZXh0KCkgIT0gImFsbCIpIHsKLSAgICAgICAg ICAgICAgICBhdXRvIHNoZWV0R3JvdXBpbmdQYXlsb2FkID0gSW5zcGVjdG9yOjpQcm90b2NvbDo6 Q1NTOjpHcm91cGluZzo6Y3JlYXRlKCkKLSAgICAgICAgICAgICAgICAgICAgLnNldFRleHQobWVk aWEtPm1lZGlhVGV4dCgpKQotICAgICAgICAgICAgICAgICAgICAuc2V0VHlwZShpczxIVE1MU3R5 bGVFbGVtZW50PihzdHlsZVNoZWV0LT5vd25lck5vZGUoKSkgPyBJbnNwZWN0b3I6OlByb3RvY29s OjpDU1M6Okdyb3VwaW5nOjpUeXBlOjpNZWRpYVN0eWxlTm9kZTogSW5zcGVjdG9yOjpQcm90b2Nv bDo6Q1NTOjpHcm91cGluZzo6VHlwZTo6TWVkaWFMaW5rTm9kZSkKLSAgICAgICAgICAgICAgICAg ICAgLnJlbGVhc2UoKTsKLQotICAgICAgICAgICAgICAgIFN0cmluZyBzb3VyY2VVUkw7Ci0gICAg ICAgICAgICAgICAgaWYgKGF1dG8qIG93bmVyRG9jdW1lbnQgPSBzdHlsZVNoZWV0LT5vd25lckRv Y3VtZW50KCkpCi0gICAgICAgICAgICAgICAgICAgIHNvdXJjZVVSTCA9IG93bmVyRG9jdW1lbnQt PnVybCgpOwotICAgICAgICAgICAgICAgIGVsc2UgaWYgKCFzdHlsZVNoZWV0LT5jb250ZW50cygp LmJhc2VVUkwoKS5pc0VtcHR5KCkpCi0gICAgICAgICAgICAgICAgICAgIHNvdXJjZVVSTCA9IHN0 eWxlU2hlZXQtPmNvbnRlbnRzKCkuYmFzZVVSTCgpOwotICAgICAgICAgICAgICAgIGlmICghc291 cmNlVVJMLmlzRW1wdHkoKSkKLSAgICAgICAgICAgICAgICAgICAgc2hlZXRHcm91cGluZ1BheWxv YWQtPnNldFNvdXJjZVVSTChzb3VyY2VVUkwpOwotCi0gICAgICAgICAgICAgICAgZ3JvdXBpbmdz UGF5bG9hZC0+YWRkSXRlbShXVEZNb3ZlKHNoZWV0R3JvdXBpbmdQYXlsb2FkKSk7CisgICAgICAg IGVsc2UgeworICAgICAgICAgICAgQ1NTU3R5bGVTaGVldCogc3R5bGVTaGVldCA9IHBhcmVudFJ1 bGUtPnBhcmVudFN0eWxlU2hlZXQoKTsKKyAgICAgICAgICAgIHdoaWxlIChzdHlsZVNoZWV0KSB7 CisgICAgICAgICAgICAgICAgbWVkaWFMaXN0ID0gc3R5bGVTaGVldC0+bWVkaWEoKTsKKyAgICAg ICAgICAgICAgICBpZiAobWVkaWFMaXN0ICYmIG1lZGlhTGlzdC0+bGVuZ3RoKCkpIHsKKyAgICAg ICAgICAgICAgICAgICAgRG9jdW1lbnQqIGRvYyA9IHN0eWxlU2hlZXQtPm93bmVyRG9jdW1lbnQo KTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKGRvYykKKyAgICAgICAgICAgICAgICAgICAgICAg IHNvdXJjZVVSTCA9IGRvYy0+dXJsKCk7CisgICAgICAgICAgICAgICAgICAgIGVsc2UgaWYgKCFz dHlsZVNoZWV0LT5jb250ZW50cygpLmJhc2VVUkwoKS5pc0VtcHR5KCkpCisgICAgICAgICAgICAg ICAgICAgICAgICBzb3VyY2VVUkwgPSBzdHlsZVNoZWV0LT5jb250ZW50cygpLmJhc2VVUkwoKTsK KyAgICAgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICAgICAgc291cmNl VVJMID0gZW1wdHlTdHJpbmcoKTsKKyAgICAgICAgICAgICAgICAgICAgbWVkaWFBcnJheS5hZGRJ dGVtKGJ1aWxkTWVkaWFPYmplY3QobWVkaWFMaXN0LCBzdHlsZVNoZWV0LT5vd25lck5vZGUoKSA/ IE1lZGlhTGlzdFNvdXJjZUxpbmtlZFNoZWV0IDogTWVkaWFMaXN0U291cmNlSW5saW5lU2hlZXQs IHNvdXJjZVVSTCkpOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBwYXJlbnRS dWxlID0gc3R5bGVTaGVldC0+b3duZXJSdWxlKCk7CisgICAgICAgICAgICAgICAgaWYgKHBhcmVu dFJ1bGUpCisgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgIHN0eWxl U2hlZXQgPSBzdHlsZVNoZWV0LT5wYXJlbnRTdHlsZVNoZWV0KCk7CiAgICAgICAgICAgICB9Ci0K LSAgICAgICAgICAgIHBhcmVudFJ1bGUgPSBzdHlsZVNoZWV0LT5vd25lclJ1bGUoKTsKLSAgICAg ICAgICAgIGlmIChwYXJlbnRSdWxlKQotICAgICAgICAgICAgICAgIGJyZWFrOwotCi0gICAgICAg ICAgICBzdHlsZVNoZWV0ID0gc3R5bGVTaGVldC0+cGFyZW50U3R5bGVTaGVldCgpOwogICAgICAg ICB9CiAgICAgfQotCi0gICAgcmV0dXJuIGdyb3VwaW5nc1BheWxvYWQ7CiB9CiAKIFJlZjxJbnNw ZWN0b3JTdHlsZT4gSW5zcGVjdG9yU3R5bGU6OmNyZWF0ZShjb25zdCBJbnNwZWN0b3JDU1NJZCYg c3R5bGVJZCwgUmVmPENTU1N0eWxlRGVjbGFyYXRpb24+JiYgc3R5bGUsIEluc3BlY3RvclN0eWxl U2hlZXQqIHBhcmVudFN0eWxlU2hlZXQpCkBAIC0xMTYxLDkgKzExNzMsMTEgQEAgUmVmUHRyPElu c3BlY3Rvcjo6UHJvdG9jb2w6OkNTUzo6Q1NTUnVsZT4gSW5zcGVjdG9yU3R5bGVTaGVldDo6YnVp bGRPYmplY3RGb3JSdWwKICAgICAgICAgICAgIHJlc3VsdC0+c2V0UnVsZUlkKGlkLmFzUHJvdG9j b2xWYWx1ZTxJbnNwZWN0b3I6OlByb3RvY29sOjpDU1M6OkNTU1J1bGVJZD4oKSk7CiAgICAgfQog Ci0gICAgYXV0byBncm91cGluZ3NQYXlsb2FkID0gYnVpbGRBcnJheUZvckdyb3VwaW5ncygqcnVs ZSk7Ci0gICAgaWYgKGdyb3VwaW5nc1BheWxvYWQtPmxlbmd0aCgpKQotICAgICAgICByZXN1bHQt PnNldEdyb3VwaW5ncyhXVEZNb3ZlKGdyb3VwaW5nc1BheWxvYWQpKTsKKyAgICBhdXRvIG1lZGlh QXJyYXkgPSBBcnJheU9mPEluc3BlY3Rvcjo6UHJvdG9jb2w6OkNTUzo6Q1NTTWVkaWE+OjpjcmVh dGUoKTsKKworICAgIGZpbGxNZWRpYUxpc3RDaGFpbihydWxlLCBtZWRpYUFycmF5LmdldCgpKTsK KyAgICBpZiAobWVkaWFBcnJheS0+bGVuZ3RoKCkpCisgICAgICAgIHJlc3VsdC0+c2V0TWVkaWEo V1RGTW92ZShtZWRpYUFycmF5KSk7CiAKICAgICByZXR1cm4gcmVzdWx0OwogfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ1NTTWFu YWdlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJz L0NTU01hbmFnZXIuanMKaW5kZXggYjAyNjY1NTk4NTY1YWQ2ZmZhZTBmODkyMWIxOWE2ODEyNTJm ZTc3NC4uMDg3ZDlkNzdiYzI1NjVkMzdlNzJjZTBiMjQ5NWMzOWIyMWEwNDgzMSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ1NTTWFu YWdlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9s bGVycy9DU1NNYW5hZ2VyLmpzCkBAIC04MSwyMiArODEsMjEgQEAgV0kuQ1NTTWFuYWdlciA9IGNs YXNzIENTU01hbmFnZXIgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgfQogICAgIH0KIAotICAg IHN0YXRpYyBwcm90b2NvbEdyb3VwaW5nVHlwZVRvRW51bSh0eXBlKQotICAgIHsKLSAgICAgICAg Ly8gQ09NUEFUSUJJTElUWSAoaU9TIDEzKTogQ1NTLkdyb3VwaW5nIGRpZCBub3QgZXhpc3QgeWV0 LgotICAgICAgICBpZiAoIUluc3BlY3RvckJhY2tlbmQuZG9tYWlucy5DU1MuR3JvdXBpbmcpIHsK LSAgICAgICAgICAgIHN3aXRjaCAodHlwZSkgewotICAgICAgICAgICAgY2FzZSAibWVkaWFSdWxl IjoKLSAgICAgICAgICAgICAgICByZXR1cm4gV0kuQ1NTR3JvdXBpbmcuVHlwZS5NZWRpYVJ1bGU7 Ci0gICAgICAgICAgICBjYXNlICJpbXBvcnRSdWxlIjoKLSAgICAgICAgICAgICAgICByZXR1cm4g V0kuQ1NTR3JvdXBpbmcuVHlwZS5NZWRpYUltcG9ydFJ1bGU7Ci0gICAgICAgICAgICBjYXNlICJs aW5rZWRTaGVldCI6Ci0gICAgICAgICAgICAgICAgcmV0dXJuIFdJLkNTU0dyb3VwaW5nLlR5cGUu TWVkaWFMaW5rTm9kZTsKLSAgICAgICAgICAgIGNhc2UgImlubGluZVNoZWV0IjoKLSAgICAgICAg ICAgICAgICByZXR1cm4gV0kuQ1NTR3JvdXBpbmcuVHlwZS5NZWRpYVN0eWxlTm9kZTsKLSAgICAg ICAgICAgIH0KKyAgICBzdGF0aWMgcHJvdG9jb2xNZWRpYVNvdXJjZVRvRW51bShzb3VyY2UpCisg ICAgeworICAgICAgICBzd2l0Y2ggKHNvdXJjZSkgeworICAgICAgICBjYXNlIENTU0FnZW50LkNT U01lZGlhU291cmNlLk1lZGlhUnVsZToKKyAgICAgICAgICAgIHJldHVybiBXSS5DU1NNZWRpYS5U eXBlLk1lZGlhUnVsZTsKKyAgICAgICAgY2FzZSBDU1NBZ2VudC5DU1NNZWRpYVNvdXJjZS5JbXBv cnRSdWxlOgorICAgICAgICAgICAgcmV0dXJuIFdJLkNTU01lZGlhLlR5cGUuSW1wb3J0UnVsZTsK KyAgICAgICAgY2FzZSBDU1NBZ2VudC5DU1NNZWRpYVNvdXJjZS5MaW5rZWRTaGVldDoKKyAgICAg ICAgICAgIHJldHVybiBXSS5DU1NNZWRpYS5UeXBlLkxpbmtlZFN0eWxlU2hlZXQ7CisgICAgICAg IGNhc2UgQ1NTQWdlbnQuQ1NTTWVkaWFTb3VyY2UuSW5saW5lU2hlZXQ6CisgICAgICAgICAgICBy ZXR1cm4gV0kuQ1NTTWVkaWEuVHlwZS5JbmxpbmVTdHlsZVNoZWV0OworICAgICAgICBkZWZhdWx0 OgorICAgICAgICAgICAgY29uc29sZS5hc3NlcnQoZmFsc2UsICJVbmtub3duIENTUy5DU1NNZWRp YVNvdXJjZSIsIHNvdXJjZSk7CisgICAgICAgICAgICByZXR1cm4gV0kuQ1NTTWVkaWEuVHlwZS5N ZWRpYVJ1bGU7CiAgICAgICAgIH0KLSAgICAgICAgcmV0dXJuIHR5cGU7CiAgICAgfQogCiAgICAg c3RhdGljIGRpc3BsYXlOYW1lRm9yUHNldWRvSWQocHNldWRvSWQpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9NYWluLmh0bWwgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9NYWluLmh0bWwKaW5kZXggNTQ5MmJkMjE2MDc2NjZlOTAw MTZjYThhNGI5YzI1OTFkNTJkODEyMC4uNWY4Y2U2ZDgwMjIxMzA2NzkxNjk4M2ExODA4YmI4MTJm Yzc0YWNhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv TWFpbi5odG1sCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01haW4u aHRtbApAQCAtMzYxLDggKzM2MSw4IEBACiAgICAgPHNjcmlwdCBzcmM9Ik1vZGVscy9DUFVUaW1l bGluZS5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9Ik1vZGVscy9DUFVUaW1lbGluZVJl Y29yZC5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9Ik1vZGVscy9DU1NDb21wbGV0aW9u cy5qcyI+PC9zY3JpcHQ+Ci0gICAgPHNjcmlwdCBzcmM9Ik1vZGVscy9DU1NHcm91cGluZy5qcyI+ PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9Ik1vZGVscy9DU1NLZXl3b3JkQ29tcGxldGlvbnMu anMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPSJNb2RlbHMvQ1NTTWVkaWEuanMiPjwvc2Ny aXB0PgogICAgIDxzY3JpcHQgc3JjPSJNb2RlbHMvQ1NTUHJvcGVydHkuanMiPjwvc2NyaXB0Pgog ICAgIDxzY3JpcHQgc3JjPSJNb2RlbHMvQ1NTUnVsZS5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlw dCBzcmM9Ik1vZGVscy9DU1NTZWxlY3Rvci5qcyI+PC9zY3JpcHQ+CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ1NTR3JvdXBpbmcuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ1NTR3JvdXBpbmcuanMK ZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDYxZGYwNGMyZTQ1MTZiYmU1N2QyNTI3NzU3 NmY3OWEwZjgzNzI5ODguLjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NTU0dyb3Vw aW5nLmpzCisrKyAvZGV2L251bGwKQEAgLTEsNzQgKzAsMCBAQAotLyoKLSAqIENvcHlyaWdodCAo QykgMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0gKgotICogUmVkaXN0cmli dXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0 Ci0gKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93 aW5nIGNvbmRpdGlvbnMKLSAqIGFyZSBtZXQ6Ci0gKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291 cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAotICogICAgbm90aWNlLCB0 aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgotICog Mi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92 ZSBjb3B5cmlnaHQKLSAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRo ZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKLSAqICAgIGRvY3VtZW50YXRpb24gYW5kL29y IG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCi0gKgotICog VEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVU T1JTIGBgQVMgSVMnJwotICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywg SU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCi0gKiBUSEUgSU1QTElFRCBXQVJSQU5USUVT IE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCi0gKiBQVVJQ T1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBD T05UUklCVVRPUlMKLSAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lE RU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKLSAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAo SU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCi0gKiBTVUJTVElU VVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1Ig QlVTSU5FU1MKLSAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVP UlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCi0gKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElU WSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQotICogQVJJU0lO RyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURW SVNFRCBPRgotICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgotICovCi0KLVdJLkNT U0dyb3VwaW5nID0gY2xhc3MgQ1NTR3JvdXBpbmcKLXsKLSAgICBjb25zdHJ1Y3Rvcih0eXBlLCB0 ZXh0LCBzb3VyY2VDb2RlTG9jYXRpb24pCi0gICAgewotICAgICAgICBjb25zb2xlLmFzc2VydChP YmplY3QudmFsdWVzKENTU0dyb3VwaW5nLlR5cGUpLmluY2x1ZGVzKHR5cGUpKTsKLSAgICAgICAg Y29uc29sZS5hc3NlcnQodHlwZW9mIHRleHQgPT09ICJzdHJpbmciICYmIHRleHQubGVuZ3RoKTsK LSAgICAgICAgY29uc29sZS5hc3NlcnQoIXNvdXJjZUNvZGVMb2NhdGlvbiB8fCBzb3VyY2VDb2Rl TG9jYXRpb24gaW5zdGFuY2VvZiBXSS5Tb3VyY2VDb2RlTG9jYXRpb24pOwotCi0gICAgICAgIHRo aXMuX3R5cGUgPSB0eXBlOwotICAgICAgICB0aGlzLl90ZXh0ID0gdGV4dDsKLSAgICAgICAgdGhp cy5fc291cmNlQ29kZUxvY2F0aW9uID0gc291cmNlQ29kZUxvY2F0aW9uIHx8IG51bGw7Ci0gICAg fQotCi0gICAgLy8gUHVibGljCi0KLSAgICBnZXQgdHlwZSgpIHsgcmV0dXJuIHRoaXMuX3R5cGU7 IH0KLSAgICBnZXQgdGV4dCgpIHsgcmV0dXJuIHRoaXMuX3RleHQ7IH0KLSAgICBnZXQgc291cmNl Q29kZUxvY2F0aW9uKCkgeyByZXR1cm4gdGhpcy5fc291cmNlQ29kZUxvY2F0aW9uOyB9Ci0KLSAg ICBnZXQgaXNNZWRpYSgpCi0gICAgewotICAgICAgICByZXR1cm4gdGhpcy5fdHlwZSA9PT0gV0ku Q1NTR3JvdXBpbmcuVHlwZS5NZWRpYVJ1bGUKLSAgICAgICAgICAgIHx8IHRoaXMuX3R5cGUgPT09 IFdJLkNTU0dyb3VwaW5nLlR5cGUuTWVkaWFJbXBvcnRSdWxlCi0gICAgICAgICAgICB8fCB0aGlz Ll90eXBlID09PSBXSS5DU1NHcm91cGluZy5UeXBlLk1lZGlhTGlua05vZGUKLSAgICAgICAgICAg IHx8IHRoaXMuX3R5cGUgPT09IFdJLkNTU0dyb3VwaW5nLlR5cGUuTWVkaWFTdHlsZU5vZGU7Ci0g ICAgfQotCi0gICAgZ2V0IGlzU3VwcG9ydHMoKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMu X3R5cGUgPT09IFdJLkNTU0dyb3VwaW5nLlR5cGUuU3VwcG9ydHNSdWxlOwotICAgIH0KLQotICAg IGdldCBwcmVmaXgoKQotICAgIHsKLSAgICAgICAgaWYgKHRoaXMuaXNTdXBwb3J0cykKLSAgICAg ICAgICAgIHJldHVybiAiQHN1cHBvcnRzIjsKLQotICAgICAgICBjb25zb2xlLmFzc2VydCh0aGlz LmlzTWVkaWEpOwotICAgICAgICByZXR1cm4gIkBtZWRpYSI7Ci0gICAgfQotfTsKLQotV0kuQ1NT R3JvdXBpbmcuVHlwZSA9IHsKLSAgICBNZWRpYVJ1bGU6ICJtZWRpYS1ydWxlIiwKLSAgICBNZWRp YUltcG9ydFJ1bGU6ICJtZWRpYS1pbXBvcnQtcnVsZSIsCi0gICAgTWVkaWFMaW5rTm9kZTogIm1l ZGlhLWxpbmstbm9kZSIsCi0gICAgTWVkaWFTdHlsZU5vZGU6ICJtZWRpYS1zdHlsZS1ub2RlIiwK LSAgICBTdXBwb3J0c1J1bGU6ICJzdXBwb3J0cy1ydWxlIiwKLX07CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ1NTTWVkaWEuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ1NTTWVkaWEuanMKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uM2JkNjg5OWRjYmM0MjFiMzBlM2RkMDYzYjQ4OWUyZTE3MmRlYzliZAotLS0gL2Rldi9u dWxsCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9DU1NN ZWRpYS5qcwpAQCAtMCwwICsxLDQ5IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDEzIEFwcGxl IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNl IGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNh dGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9u cworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0 IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBj b25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1 dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAor ICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBk aXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJp YWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJF IElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycn CisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJV VCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRB QklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NM QUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUwor ICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lB TCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJV VCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1Ig U0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICog SU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJ VFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJ TkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkg T1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBU SEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworV0kuQ1NTTWVkaWEgPSBjbGFz cyBDU1NNZWRpYQoreworICAgIGNvbnN0cnVjdG9yKHR5cGUsIHRleHQsIHNvdXJjZUNvZGVMb2Nh dGlvbikKKyAgICB7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KCFzb3VyY2VDb2RlTG9jYXRpb24g fHwgc291cmNlQ29kZUxvY2F0aW9uIGluc3RhbmNlb2YgV0kuU291cmNlQ29kZUxvY2F0aW9uKTsK KworICAgICAgICB0aGlzLl90eXBlID0gdHlwZSB8fCBudWxsOworICAgICAgICB0aGlzLl90ZXh0 ID0gdGV4dCB8fCAiIjsKKyAgICAgICAgdGhpcy5fc291cmNlQ29kZUxvY2F0aW9uID0gc291cmNl Q29kZUxvY2F0aW9uIHx8IG51bGw7CisgICAgfQorCisgICAgLy8gUHVibGljCisKKyAgICBnZXQg dHlwZSgpIHsgcmV0dXJuIHRoaXMuX3R5cGU7IH0KKyAgICBnZXQgdGV4dCgpIHsgcmV0dXJuIHRo aXMuX3RleHQ7IH0KKyAgICBnZXQgc291cmNlQ29kZUxvY2F0aW9uKCkgeyByZXR1cm4gdGhpcy5f c291cmNlQ29kZUxvY2F0aW9uOyB9Cit9OworCitXSS5DU1NNZWRpYS5UeXBlID0geworICAgIE1l ZGlhUnVsZTogImNzcy1tZWRpYS10eXBlLW1lZGlhLXJ1bGUiLAorICAgIEltcG9ydFJ1bGU6ICJj c3MtbWVkaWEtdHlwZS1pbXBvcnQtcnVsZSIsCisgICAgTGlua2VkU3R5bGVTaGVldDogImNzcy1t ZWRpYS10eXBlLWxpbmtlZC1zdHlsZXNoZWV0IiwKKyAgICBJbmxpbmVTdHlsZVNoZWV0OiAiY3Nz LW1lZGlhLXR5cGUtaW5saW5lLXN0eWxlc2hlZXQiCit9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NTU1J1bGUuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ1NTUnVsZS5qcwppbmRleCA1YzIxMDc5 OTRkNjRkMTA0MDJjOTE5NjQ0YjM0OGZkMzg5NWI4N2YyLi44ZDhlMjU5YzdhOGUyMzNiMTRiZTQ2 YzU3NjBhODZmMGRiM2EzMWQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Nb2RlbHMvQ1NTUnVsZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Nb2RlbHMvQ1NTUnVsZS5qcwpAQCAtMjUsNyArMjUsNyBAQAogCiBXSS5D U1NSdWxlID0gY2xhc3MgQ1NTUnVsZSBleHRlbmRzIFdJLk9iamVjdAogewotICAgIGNvbnN0cnVj dG9yKG5vZGVTdHlsZXMsIG93bmVyU3R5bGVTaGVldCwgaWQsIHR5cGUsIHNvdXJjZUNvZGVMb2Nh dGlvbiwgc2VsZWN0b3JUZXh0LCBzZWxlY3RvcnMsIG1hdGNoZWRTZWxlY3RvckluZGljZXMsIHN0 eWxlLCBncm91cGluZ3MpCisgICAgY29uc3RydWN0b3Iobm9kZVN0eWxlcywgb3duZXJTdHlsZVNo ZWV0LCBpZCwgdHlwZSwgc291cmNlQ29kZUxvY2F0aW9uLCBzZWxlY3RvclRleHQsIHNlbGVjdG9y cywgbWF0Y2hlZFNlbGVjdG9ySW5kaWNlcywgc3R5bGUsIG1lZGlhTGlzdCkKICAgICB7CiAgICAg ICAgIHN1cGVyKCk7CiAKQEAgLTM3LDI2ICszNyw1NyBAQCBXSS5DU1NSdWxlID0gY2xhc3MgQ1NT UnVsZSBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICB0aGlzLl90eXBlID0gdHlwZSB8fCBudWxs OwogICAgICAgICB0aGlzLl9pbml0aWFsU3RhdGUgPSBudWxsOwogCi0gICAgICAgIHRoaXMudXBk YXRlKHNvdXJjZUNvZGVMb2NhdGlvbiwgc2VsZWN0b3JUZXh0LCBzZWxlY3RvcnMsIG1hdGNoZWRT ZWxlY3RvckluZGljZXMsIHN0eWxlLCBncm91cGluZ3MsIHRydWUpOworICAgICAgICB0aGlzLnVw ZGF0ZShzb3VyY2VDb2RlTG9jYXRpb24sIHNlbGVjdG9yVGV4dCwgc2VsZWN0b3JzLCBtYXRjaGVk U2VsZWN0b3JJbmRpY2VzLCBzdHlsZSwgbWVkaWFMaXN0LCB0cnVlKTsKICAgICB9CiAKICAgICAv LyBQdWJsaWMKIAotICAgIGdldCBvd25lclN0eWxlU2hlZXQoKSB7IHJldHVybiB0aGlzLl9vd25l clN0eWxlU2hlZXQ7IH0KICAgICBnZXQgaWQoKSB7IHJldHVybiB0aGlzLl9pZDsgfQotICAgIGdl dCB0eXBlKCkgeyByZXR1cm4gdGhpcy5fdHlwZTsgfQogICAgIGdldCBpbml0aWFsU3RhdGUoKSB7 IHJldHVybiB0aGlzLl9pbml0aWFsU3RhdGU7IH0KLSAgICBnZXQgc291cmNlQ29kZUxvY2F0aW9u KCkgeyByZXR1cm4gdGhpcy5fc291cmNlQ29kZUxvY2F0aW9uOyB9Ci0gICAgZ2V0IHNlbGVjdG9y cygpIHsgcmV0dXJuIHRoaXMuX3NlbGVjdG9yczsgfQotICAgIGdldCBtYXRjaGVkU2VsZWN0b3JJ bmRpY2VzKCkgeyByZXR1cm4gdGhpcy5fbWF0Y2hlZFNlbGVjdG9ySW5kaWNlczsgfQotICAgIGdl dCBzdHlsZSgpIHsgcmV0dXJuIHRoaXMuX3N0eWxlOyB9Ci0gICAgZ2V0IGdyb3VwaW5ncygpIHsg cmV0dXJuIHRoaXMuX2dyb3VwaW5nczsgfQorCisgICAgZ2V0IG93bmVyU3R5bGVTaGVldCgpCisg ICAgeworICAgICAgICByZXR1cm4gdGhpcy5fb3duZXJTdHlsZVNoZWV0OworICAgIH0KIAogICAg IGdldCBlZGl0YWJsZSgpCiAgICAgewogICAgICAgICByZXR1cm4gISF0aGlzLl9pZCAmJiAodGhp cy5fdHlwZSA9PT0gV0kuQ1NTU3R5bGVTaGVldC5UeXBlLkF1dGhvciB8fCB0aGlzLl90eXBlID09 PSBXSS5DU1NTdHlsZVNoZWV0LlR5cGUuSW5zcGVjdG9yKTsKICAgICB9CiAKKyAgICB1cGRhdGUo c291cmNlQ29kZUxvY2F0aW9uLCBzZWxlY3RvclRleHQsIHNlbGVjdG9ycywgbWF0Y2hlZFNlbGVj dG9ySW5kaWNlcywgc3R5bGUsIG1lZGlhTGlzdCkKKyAgICB7CisgICAgICAgIHNvdXJjZUNvZGVM b2NhdGlvbiA9IHNvdXJjZUNvZGVMb2NhdGlvbiB8fCBudWxsOworICAgICAgICBzZWxlY3RvclRl eHQgPSBzZWxlY3RvclRleHQgfHwgIiI7CisgICAgICAgIHNlbGVjdG9ycyA9IHNlbGVjdG9ycyB8 fCBbXTsKKyAgICAgICAgbWF0Y2hlZFNlbGVjdG9ySW5kaWNlcyA9IG1hdGNoZWRTZWxlY3Rvcklu ZGljZXMgfHwgW107CisgICAgICAgIHN0eWxlID0gc3R5bGUgfHwgbnVsbDsKKyAgICAgICAgbWVk aWFMaXN0ID0gbWVkaWFMaXN0IHx8IFtdOworCisgICAgICAgIGlmICh0aGlzLl9zdHlsZSkKKyAg ICAgICAgICAgIHRoaXMuX3N0eWxlLm93bmVyUnVsZSA9IG51bGw7CisKKyAgICAgICAgdGhpcy5f c291cmNlQ29kZUxvY2F0aW9uID0gc291cmNlQ29kZUxvY2F0aW9uOworICAgICAgICB0aGlzLl9z ZWxlY3RvclRleHQgPSBzZWxlY3RvclRleHQ7CisgICAgICAgIHRoaXMuX3NlbGVjdG9ycyA9IHNl bGVjdG9yczsKKyAgICAgICAgdGhpcy5fbWF0Y2hlZFNlbGVjdG9ySW5kaWNlcyA9IG1hdGNoZWRT ZWxlY3RvckluZGljZXM7CisgICAgICAgIHRoaXMuX3N0eWxlID0gc3R5bGU7CisgICAgICAgIHRo aXMuX21lZGlhTGlzdCA9IG1lZGlhTGlzdDsKKworICAgICAgICBpZiAodGhpcy5fc3R5bGUpCisg ICAgICAgICAgICB0aGlzLl9zdHlsZS5vd25lclJ1bGUgPSB0aGlzOworICAgIH0KKworICAgIGdl dCB0eXBlKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl90eXBlOworICAgIH0KKworICAg IGdldCBzb3VyY2VDb2RlTG9jYXRpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3Nv dXJjZUNvZGVMb2NhdGlvbjsKKyAgICB9CisKICAgICBnZXQgc2VsZWN0b3JUZXh0KCkKICAgICB7 CiAgICAgICAgIHJldHVybiB0aGlzLl9zZWxlY3RvclRleHQ7CkBAIC03NiwyNyArMTA3LDI0IEBA IFdJLkNTU1J1bGUgPSBjbGFzcyBDU1NSdWxlIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgIHRo aXMuX25vZGVTdHlsZXMuY2hhbmdlUnVsZVNlbGVjdG9yKHRoaXMsIHNlbGVjdG9yVGV4dCkudGhl bih0aGlzLl9zZWxlY3RvclJlc29sdmVkLmJpbmQodGhpcyksIHRoaXMuX3NlbGVjdG9yUmVqZWN0 ZWQuYmluZCh0aGlzKSk7CiAgICAgfQogCi0gICAgdXBkYXRlKHNvdXJjZUNvZGVMb2NhdGlvbiwg c2VsZWN0b3JUZXh0LCBzZWxlY3RvcnMsIG1hdGNoZWRTZWxlY3RvckluZGljZXMsIHN0eWxlLCBn cm91cGluZ3MpCisgICAgZ2V0IHNlbGVjdG9ycygpCiAgICAgewotICAgICAgICBzb3VyY2VDb2Rl TG9jYXRpb24gPSBzb3VyY2VDb2RlTG9jYXRpb24gfHwgbnVsbDsKLSAgICAgICAgc2VsZWN0b3JU ZXh0ID0gc2VsZWN0b3JUZXh0IHx8ICIiOwotICAgICAgICBzZWxlY3RvcnMgPSBzZWxlY3RvcnMg fHwgW107Ci0gICAgICAgIG1hdGNoZWRTZWxlY3RvckluZGljZXMgPSBtYXRjaGVkU2VsZWN0b3JJ bmRpY2VzIHx8IFtdOwotICAgICAgICBzdHlsZSA9IHN0eWxlIHx8IG51bGw7Ci0gICAgICAgIGdy b3VwaW5ncyA9IGdyb3VwaW5ncyB8fCBbXTsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3NlbGVjdG9y czsKKyAgICB9CiAKLSAgICAgICAgaWYgKHRoaXMuX3N0eWxlKQotICAgICAgICAgICAgdGhpcy5f c3R5bGUub3duZXJSdWxlID0gbnVsbDsKKyAgICBnZXQgbWF0Y2hlZFNlbGVjdG9ySW5kaWNlcygp CisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fbWF0Y2hlZFNlbGVjdG9ySW5kaWNlczsKKyAg ICB9CiAKLSAgICAgICAgdGhpcy5fc291cmNlQ29kZUxvY2F0aW9uID0gc291cmNlQ29kZUxvY2F0 aW9uOwotICAgICAgICB0aGlzLl9zZWxlY3RvclRleHQgPSBzZWxlY3RvclRleHQ7Ci0gICAgICAg IHRoaXMuX3NlbGVjdG9ycyA9IHNlbGVjdG9yczsKLSAgICAgICAgdGhpcy5fbWF0Y2hlZFNlbGVj dG9ySW5kaWNlcyA9IG1hdGNoZWRTZWxlY3RvckluZGljZXM7Ci0gICAgICAgIHRoaXMuX3N0eWxl ID0gc3R5bGU7Ci0gICAgICAgIHRoaXMuX2dyb3VwaW5ncyA9IGdyb3VwaW5nczsKKyAgICBnZXQg c3R5bGUoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3N0eWxlOworICAgIH0KIAotICAg ICAgICBpZiAodGhpcy5fc3R5bGUpCi0gICAgICAgICAgICB0aGlzLl9zdHlsZS5vd25lclJ1bGUg PSB0aGlzOworICAgIGdldCBtZWRpYUxpc3QoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMu X21lZGlhTGlzdDsKICAgICB9CiAKICAgICBpc0VxdWFsVG8ocnVsZSkKQEAgLTE0NSw3ICsxNzMs NyBAQCBXSS5DU1NSdWxlID0gY2xhc3MgQ1NTUnVsZSBleHRlbmRzIFdJLk9iamVjdAogICAgICAg ICAgICAgICAgICAgICBzb3VyY2VDb2RlTG9jYXRpb24gPSB0aGlzLl9vd25lclN0eWxlU2hlZXQu b2Zmc2V0U291cmNlQ29kZUxvY2F0aW9uKHNvdXJjZUNvZGVMb2NhdGlvbik7CiAgICAgICAgICAg ICAgICAgfQogCi0gICAgICAgICAgICAgICAgdGhpcy51cGRhdGUoc291cmNlQ29kZUxvY2F0aW9u LCBzZWxlY3RvclRleHQsIHNlbGVjdG9ycywgW10sIHRoaXMuX3N0eWxlLCB0aGlzLl9ncm91cGlu Z3MpOworICAgICAgICAgICAgICAgIHRoaXMudXBkYXRlKHNvdXJjZUNvZGVMb2NhdGlvbiwgc2Vs ZWN0b3JUZXh0LCBzZWxlY3RvcnMsIFtdLCB0aGlzLl9zdHlsZSwgdGhpcy5fbWVkaWFMaXN0KTsK ICAgICAgICAgICAgIH0KICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ1NTU3R5bGVEZWNsYXJhdGlvbi5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9DU1NTdHlsZURlY2xhcmF0aW9u LmpzCmluZGV4IDRkZGEzY2VkM2Q2YzFiM2JiYTI0MmI3NTQ1NWVmYzgyZWE3Yjk3MzIuLmI3OWFj OGU5MTQ0YzNjMTJkY2MxZjA4NTg2YjNmZGFiOWMxMWU0N2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9DU1NTdHlsZURlY2xhcmF0aW9uLmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9DU1NTdHls ZURlY2xhcmF0aW9uLmpzCkBAIC0yODcsMTAgKzI4NywxMCBAQCBXSS5DU1NTdHlsZURlY2xhcmF0 aW9uID0gY2xhc3MgQ1NTU3R5bGVEZWNsYXJhdGlvbiBleHRlbmRzIFdJLk9iamVjdAogICAgICAg ICByZXR1cm4gdGhpcy5fc3R5bGVTaGVldFRleHRSYW5nZTsKICAgICB9CiAKLSAgICBnZXQgZ3Jv dXBpbmdzKCkKKyAgICBnZXQgbWVkaWFMaXN0KCkKICAgICB7CiAgICAgICAgIGlmICh0aGlzLl9v d25lclJ1bGUpCi0gICAgICAgICAgICByZXR1cm4gdGhpcy5fb3duZXJSdWxlLmdyb3VwaW5nczsK KyAgICAgICAgICAgIHJldHVybiB0aGlzLl9vd25lclJ1bGUubWVkaWFMaXN0OwogICAgICAgICBy ZXR1cm4gW107CiAgICAgfQogCkBAIC01MTEsMTcgKzUxMSwxNyBAQCBXSS5DU1NTdHlsZURlY2xh cmF0aW9uID0gY2xhc3MgQ1NTU3R5bGVEZWNsYXJhdGlvbiBleHRlbmRzIFdJLk9iamVjdAogICAg IHsKICAgICAgICAgbGV0IGluZGVudFN0cmluZyA9IFdJLmluZGVudFN0cmluZygpOwogICAgICAg ICBsZXQgc3R5bGVUZXh0ID0gIiI7Ci0gICAgICAgIGxldCBncm91cGluZ3MgPSB0aGlzLmdyb3Vw aW5ncy5maWx0ZXIoKGdyb3VwaW5nKSA9PiBncm91cGluZy50ZXh0ICE9PSAiYWxsIik7Ci0gICAg ICAgIGxldCBncm91cGluZ3NDb3VudCA9IGdyb3VwaW5ncy5sZW5ndGg7Ci0gICAgICAgIGZvciAo bGV0IGkgPSBncm91cGluZ3NDb3VudCAtIDE7IGkgPj0gMDsgLS1pKQotICAgICAgICAgICAgc3R5 bGVUZXh0ICs9IGluZGVudFN0cmluZy5yZXBlYXQoZ3JvdXBpbmdzQ291bnQgLSBpIC0gMSkgKyBn cm91cGluZ3NbaV0ucHJlZml4ICsgIiAiICsgZ3JvdXBpbmdzW2ldLnRleHQgKyAiIHtcbiI7Cisg ICAgICAgIGxldCBtZWRpYUxpc3QgPSB0aGlzLm1lZGlhTGlzdC5maWx0ZXIoKG1lZGlhKSA9PiBt ZWRpYS50ZXh0ICE9PSAiYWxsIik7CisgICAgICAgIGxldCBtZWRpYVF1ZXJpZXNDb3VudCA9IG1l ZGlhTGlzdC5sZW5ndGg7CisgICAgICAgIGZvciAobGV0IGkgPSBtZWRpYVF1ZXJpZXNDb3VudCAt IDE7IGkgPj0gMDsgLS1pKQorICAgICAgICAgICAgc3R5bGVUZXh0ICs9IGluZGVudFN0cmluZy5y ZXBlYXQobWVkaWFRdWVyaWVzQ291bnQgLSBpIC0gMSkgKyAiQG1lZGlhICIgKyBtZWRpYUxpc3Rb aV0udGV4dCArICIge1xuIjsKIAotICAgICAgICBzdHlsZVRleHQgKz0gaW5kZW50U3RyaW5nLnJl cGVhdChncm91cGluZ3NDb3VudCkgKyB0aGlzLnNlbGVjdG9yVGV4dCArICIge1xuIjsKKyAgICAg ICAgc3R5bGVUZXh0ICs9IGluZGVudFN0cmluZy5yZXBlYXQobWVkaWFRdWVyaWVzQ291bnQpICsg dGhpcy5zZWxlY3RvclRleHQgKyAiIHtcbiI7CiAKICAgICAgICAgZm9yIChsZXQgcHJvcGVydHkg b2YgKHRoaXMuX3N0eWxlU2hlZXRUZXh0UmFuZ2UgPyB0aGlzLnZpc2libGVQcm9wZXJ0aWVzIDog dGhpcy5fcHJvcGVydGllcykpCi0gICAgICAgICAgICBzdHlsZVRleHQgKz0gaW5kZW50U3RyaW5n LnJlcGVhdChncm91cGluZ3NDb3VudCArIDEpICsgcHJvcGVydHkuZm9ybWF0dGVkVGV4dCArICJc biI7CisgICAgICAgICAgICBzdHlsZVRleHQgKz0gaW5kZW50U3RyaW5nLnJlcGVhdChtZWRpYVF1 ZXJpZXNDb3VudCArIDEpICsgcHJvcGVydHkuZm9ybWF0dGVkVGV4dCArICJcbiI7CiAKLSAgICAg ICAgZm9yIChsZXQgaSA9IGdyb3VwaW5nc0NvdW50OyBpID4gMDsgLS1pKQorICAgICAgICBmb3Ig KGxldCBpID0gbWVkaWFRdWVyaWVzQ291bnQ7IGkgPiAwOyAtLWkpCiAgICAgICAgICAgICBzdHls ZVRleHQgKz0gaW5kZW50U3RyaW5nLnJlcGVhdChpKSArICJ9XG4iOwogCiAgICAgICAgIHN0eWxl VGV4dCArPSAifSI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9Nb2RlbHMvRE9NTm9kZVN0eWxlcy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL01vZGVscy9ET01Ob2RlU3R5bGVzLmpzCmluZGV4IGMxYTI5NmEzMzI0NTgzMTFi NTQzNGNkNTEzMzllOGQ1M2RlMjdmM2YuLjE1ZTM5YzllMjhhMGFkZTY1ZGZjNjQwNjE0NzhmOGFl ZjM0ZTY0NTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L01vZGVscy9ET01Ob2RlU3R5bGVzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL01vZGVscy9ET01Ob2RlU3R5bGVzLmpzCkBAIC0xMjMsMjMgKzEyMywxNCBAQCBX SS5ET01Ob2RlU3R5bGVzID0gY2xhc3MgRE9NTm9kZVN0eWxlcyBleHRlbmRzIFdJLk9iamVjdAog CiAgICAgLy8gUHVibGljCiAKLSAgICBnZXQgbm9kZSgpIHsgcmV0dXJuIHRoaXMuX25vZGU7IH0K LSAgICBnZXQgbWF0Y2hlZFJ1bGVzKCkgeyByZXR1cm4gdGhpcy5fbWF0Y2hlZFJ1bGVzOyB9Ci0g ICAgZ2V0IGluaGVyaXRlZFJ1bGVzKCkgeyByZXR1cm4gdGhpcy5faW5oZXJpdGVkUnVsZXM7IH0K LSAgICBnZXQgaW5saW5lU3R5bGUoKSB7IHJldHVybiB0aGlzLl9pbmxpbmVTdHlsZTsgfQotICAg IGdldCBhdHRyaWJ1dGVzU3R5bGUoKSB7IHJldHVybiB0aGlzLl9hdHRyaWJ1dGVzU3R5bGU7IH0K LSAgICBnZXQgcHNldWRvRWxlbWVudHMoKSB7IHJldHVybiB0aGlzLl9wc2V1ZG9FbGVtZW50czsg fQotICAgIGdldCBjb21wdXRlZFN0eWxlKCkgeyByZXR1cm4gdGhpcy5fY29tcHV0ZWRTdHlsZTsg fQotICAgIGdldCBvcmRlcmVkU3R5bGVzKCkgeyByZXR1cm4gdGhpcy5fb3JkZXJlZFN0eWxlczsg fQotCi0gICAgZ2V0IG5lZWRzUmVmcmVzaCgpCisgICAgZ2V0IG5vZGUoKQogICAgIHsKLSAgICAg ICAgcmV0dXJuIHRoaXMuX3BlbmRpbmdSZWZyZXNoVGFzayB8fCB0aGlzLl9uZWVkc1JlZnJlc2g7 CisgICAgICAgIHJldHVybiB0aGlzLl9ub2RlOwogICAgIH0KIAotICAgIGdldCB1bmlxdWVPcmRl cmVkU3R5bGVzKCkKKyAgICBnZXQgbmVlZHNSZWZyZXNoKCkKICAgICB7Ci0gICAgICAgIHJldHVy biBXSS5ET01Ob2RlU3R5bGVzLnVuaXF1ZU9yZGVyZWRTdHlsZXModGhpcy5fb3JkZXJlZFN0eWxl cyk7CisgICAgICAgIHJldHVybiB0aGlzLl9wZW5kaW5nUmVmcmVzaFRhc2sgfHwgdGhpcy5fbmVl ZHNSZWZyZXNoOwogICAgIH0KIAogICAgIHJlZnJlc2hJZk5lZWRlZCgpCkBAIC0zODQsNiArMzc1 LDYyIEBAIFdJLkRPTU5vZGVTdHlsZXMgPSBjbGFzcyBET01Ob2RlU3R5bGVzIGV4dGVuZHMgV0ku T2JqZWN0CiAgICAgICAgICAgICBXSS5jc3NNYW5hZ2VyLnByZWZlcnJlZEluc3BlY3RvclN0eWxl U2hlZXRGb3JGcmFtZSh0aGlzLl9ub2RlLmZyYW1lLCBpbnNwZWN0b3JTdHlsZVNoZWV0QXZhaWxh YmxlLmJpbmQodGhpcykpOwogICAgIH0KIAorICAgIHJ1bGVzRm9yU2VsZWN0b3Ioc2VsZWN0b3Ip CisgICAgeworICAgICAgICBzZWxlY3RvciA9IHNlbGVjdG9yIHx8IHRoaXMuX25vZGUuYXBwcm9w cmlhdGVTZWxlY3RvckZvcih0cnVlKTsKKworICAgICAgICBmdW5jdGlvbiBydWxlSGFzU2VsZWN0 b3IocnVsZSkgeworICAgICAgICAgICAgcmV0dXJuICFydWxlLm1lZGlhTGlzdC5sZW5ndGggJiYg cnVsZS5zZWxlY3RvclRleHQgPT09IHNlbGVjdG9yOworICAgICAgICB9CisKKyAgICAgICAgbGV0 IHJ1bGVzID0gdGhpcy5fbWF0Y2hlZFJ1bGVzLmZpbHRlcihydWxlSGFzU2VsZWN0b3IpOworCisg ICAgICAgIGZvciAobGV0IHBzZXVkb0VsZW1lbnRJbmZvIG9mIHRoaXMuX3BzZXVkb0VsZW1lbnRz LnZhbHVlcygpKQorICAgICAgICAgICAgcnVsZXMgPSBydWxlcy5jb25jYXQocHNldWRvRWxlbWVu dEluZm8ubWF0Y2hlZFJ1bGVzLmZpbHRlcihydWxlSGFzU2VsZWN0b3IpKTsKKworICAgICAgICBy ZXR1cm4gcnVsZXM7CisgICAgfQorCisgICAgZ2V0IG1hdGNoZWRSdWxlcygpCisgICAgeworICAg ICAgICByZXR1cm4gdGhpcy5fbWF0Y2hlZFJ1bGVzOworICAgIH0KKworICAgIGdldCBpbmhlcml0 ZWRSdWxlcygpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5faW5oZXJpdGVkUnVsZXM7Cisg ICAgfQorCisgICAgZ2V0IGlubGluZVN0eWxlKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlz Ll9pbmxpbmVTdHlsZTsKKyAgICB9CisKKyAgICBnZXQgYXR0cmlidXRlc1N0eWxlKCkKKyAgICB7 CisgICAgICAgIHJldHVybiB0aGlzLl9hdHRyaWJ1dGVzU3R5bGU7CisgICAgfQorCisgICAgZ2V0 IHBzZXVkb0VsZW1lbnRzKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9wc2V1ZG9FbGVt ZW50czsKKyAgICB9CisKKyAgICBnZXQgY29tcHV0ZWRTdHlsZSgpCisgICAgeworICAgICAgICBy ZXR1cm4gdGhpcy5fY29tcHV0ZWRTdHlsZTsKKyAgICB9CisKKyAgICBnZXQgb3JkZXJlZFN0eWxl cygpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fb3JkZXJlZFN0eWxlczsKKyAgICB9CisK KyAgICBnZXQgdW5pcXVlT3JkZXJlZFN0eWxlcygpCisgICAgeworICAgICAgICByZXR1cm4gV0ku RE9NTm9kZVN0eWxlcy51bmlxdWVPcmRlcmVkU3R5bGVzKHRoaXMuX29yZGVyZWRTdHlsZXMpOwor ICAgIH0KKwogICAgIGVmZmVjdGl2ZVByb3BlcnR5Rm9yTmFtZShuYW1lKQogICAgIHsKICAgICAg ICAgbGV0IHByb3BlcnR5ID0gdGhpcy5fcHJvcGVydHlOYW1lVG9FZmZlY3RpdmVQcm9wZXJ0eU1h cFtuYW1lXTsKQEAgLTY4NCwyNCArNzMxLDI3IEBAIFdJLkRPTU5vZGVTdHlsZXMgPSBjbGFzcyBE T01Ob2RlU3R5bGVzIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgICAgICBzb3VyY2VDb2RlTG9j YXRpb24gPSBzdHlsZVNoZWV0Lm9mZnNldFNvdXJjZUNvZGVMb2NhdGlvbihzb3VyY2VDb2RlTG9j YXRpb24pOwogICAgICAgICB9CiAKLSAgICAgICAgLy8gQ09NUEFUSUJJTElUWSAoaU9TIDEzKTog Q1NTLkNTU1J1bGUuZ3JvdXBpbmdzIGRpZCBub3QgZXhpc3QgeWV0LgotICAgICAgICBsZXQgZ3Jv dXBpbmdzID0gKHBheWxvYWQuZ3JvdXBpbmdzIHx8IHBheWxvYWQubWVkaWEgfHwgW10pLm1hcCgo Z3JvdXBpbmcpID0+IHsKLSAgICAgICAgICAgIGxldCBncm91cGluZ1R5cGUgPSBXSS5DU1NNYW5h Z2VyLnByb3RvY29sR3JvdXBpbmdUeXBlVG9FbnVtKGdyb3VwaW5nLnR5cGUgfHwgZ3JvdXBpbmcu c291cmNlKTsKLSAgICAgICAgICAgIGxldCBncm91cGluZ1NvdXJjZUNvZGVMb2NhdGlvbiA9IERP TU5vZGVTdHlsZXMuY3JlYXRlU291cmNlQ29kZUxvY2F0aW9uKGdyb3VwaW5nLnNvdXJjZVVSTCk7 CisgICAgICAgIHZhciBtZWRpYUxpc3QgPSBbXTsKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IHBh eWxvYWQubWVkaWEgJiYgaSA8IHBheWxvYWQubWVkaWEubGVuZ3RoOyArK2kpIHsKKyAgICAgICAg ICAgIHZhciBtZWRpYUl0ZW0gPSBwYXlsb2FkLm1lZGlhW2ldOworICAgICAgICAgICAgdmFyIG1l ZGlhVHlwZSA9IFdJLkNTU01hbmFnZXIucHJvdG9jb2xNZWRpYVNvdXJjZVRvRW51bShtZWRpYUl0 ZW0uc291cmNlKTsKKyAgICAgICAgICAgIHZhciBtZWRpYVRleHQgPSBtZWRpYUl0ZW0udGV4dDsK KyAgICAgICAgICAgIGxldCBtZWRpYVNvdXJjZUNvZGVMb2NhdGlvbiA9IERPTU5vZGVTdHlsZXMu Y3JlYXRlU291cmNlQ29kZUxvY2F0aW9uKG1lZGlhSXRlbS5zb3VyY2VVUkwsIHtsaW5lOiBtZWRp YUl0ZW0uc291cmNlTGluZX0pOwogICAgICAgICAgICAgaWYgKHN0eWxlU2hlZXQpCi0gICAgICAg ICAgICAgICAgZ3JvdXBpbmdTb3VyY2VDb2RlTG9jYXRpb24gPSBzdHlsZVNoZWV0Lm9mZnNldFNv dXJjZUNvZGVMb2NhdGlvbihncm91cGluZ1NvdXJjZUNvZGVMb2NhdGlvbik7Ci0gICAgICAgICAg ICByZXR1cm4gbmV3IFdJLkNTU0dyb3VwaW5nKGdyb3VwaW5nVHlwZSwgZ3JvdXBpbmcudGV4dCwg Z3JvdXBpbmdTb3VyY2VDb2RlTG9jYXRpb24pOwotICAgICAgICB9KTsKKyAgICAgICAgICAgICAg ICBtZWRpYVNvdXJjZUNvZGVMb2NhdGlvbiA9IHN0eWxlU2hlZXQub2Zmc2V0U291cmNlQ29kZUxv Y2F0aW9uKG1lZGlhU291cmNlQ29kZUxvY2F0aW9uKTsKKworICAgICAgICAgICAgbWVkaWFMaXN0 LnB1c2gobmV3IFdJLkNTU01lZGlhKG1lZGlhVHlwZSwgbWVkaWFUZXh0LCBtZWRpYVNvdXJjZUNv ZGVMb2NhdGlvbikpOworICAgICAgICB9CiAKICAgICAgICAgaWYgKHJ1bGUpIHsKLSAgICAgICAg ICAgIHJ1bGUudXBkYXRlKHNvdXJjZUNvZGVMb2NhdGlvbiwgc2VsZWN0b3JUZXh0LCBzZWxlY3Rv cnMsIG1hdGNoZWRTZWxlY3RvckluZGljZXMsIHN0eWxlLCBncm91cGluZ3MpOworICAgICAgICAg ICAgcnVsZS51cGRhdGUoc291cmNlQ29kZUxvY2F0aW9uLCBzZWxlY3RvclRleHQsIHNlbGVjdG9y cywgbWF0Y2hlZFNlbGVjdG9ySW5kaWNlcywgc3R5bGUsIG1lZGlhTGlzdCk7CiAgICAgICAgICAg ICByZXR1cm4gcnVsZTsKICAgICAgICAgfQogCiAgICAgICAgIGlmIChzdHlsZVNoZWV0KQogICAg ICAgICAgICAgc3R5bGVTaGVldC5hZGRFdmVudExpc3RlbmVyKFdJLkNTU1N0eWxlU2hlZXQuRXZl bnQuQ29udGVudERpZENoYW5nZSwgdGhpcy5fc3R5bGVTaGVldENvbnRlbnREaWRDaGFuZ2UsIHRo aXMpOwogCi0gICAgICAgIHJ1bGUgPSBuZXcgV0kuQ1NTUnVsZSh0aGlzLCBzdHlsZVNoZWV0LCBp ZCwgdHlwZSwgc291cmNlQ29kZUxvY2F0aW9uLCBzZWxlY3RvclRleHQsIHNlbGVjdG9ycywgbWF0 Y2hlZFNlbGVjdG9ySW5kaWNlcywgc3R5bGUsIGdyb3VwaW5ncyk7CisgICAgICAgIHJ1bGUgPSBu ZXcgV0kuQ1NTUnVsZSh0aGlzLCBzdHlsZVNoZWV0LCBpZCwgdHlwZSwgc291cmNlQ29kZUxvY2F0 aW9uLCBzZWxlY3RvclRleHQsIHNlbGVjdG9ycywgbWF0Y2hlZFNlbGVjdG9ySW5kaWNlcywgc3R5 bGUsIG1lZGlhTGlzdCk7CiAKICAgICAgICAgaWYgKG1hcEtleSkKICAgICAgICAgICAgIHRoaXMu X3J1bGVzTWFwLnNldChtYXBLZXksIHJ1bGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVGVzdC5odG1sIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVGVzdC5odG1sCmluZGV4IDkyYzdlOThkZDQ0NzczMjQxZmRiNmU2Njg3MGQ2 ODI3MGFjNGFhZjMuLmMwMDIxODNlZjQ4ODdiNGFkNGI0ZmJkYjUyZGFlZjY2NDBmMTUyNjIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rlc3QuaHRtbAor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UZXN0Lmh0bWwKQEAgLTEy NCw4ICsxMjQsOCBAQAogICAgIDxzY3JpcHQgc3JjPSJNb2RlbHMvQ1BVVGltZWxpbmUuanMiPjwv c2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJNb2RlbHMvQ1BVVGltZWxpbmVSZWNvcmQuanMiPjwv c2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJNb2RlbHMvQ1NTQ29tcGxldGlvbnMuanMiPjwvc2Ny aXB0PgotICAgIDxzY3JpcHQgc3JjPSJNb2RlbHMvQ1NTR3JvdXBpbmcuanMiPjwvc2NyaXB0Pgog ICAgIDxzY3JpcHQgc3JjPSJNb2RlbHMvQ1NTS2V5d29yZENvbXBsZXRpb25zLmpzIj48L3Njcmlw dD4KKyAgICA8c2NyaXB0IHNyYz0iTW9kZWxzL0NTU01lZGlhLmpzIj48L3NjcmlwdD4KICAgICA8 c2NyaXB0IHNyYz0iTW9kZWxzL0NTU1Byb3BlcnR5LmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0 IHNyYz0iTW9kZWxzL0NTU1J1bGUuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJNb2Rl bHMvQ1NTU2VsZWN0b3IuanMiPjwvc2NyaXB0PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9u U2VjdGlvbi5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9T cHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmNzcwppbmRleCA3ZDU1ZDQ1YzFk OTliYzg5NmE1ZmQzODViNmQwODkxMzEzZjI3NzU5Li4zZmU3NGMwYmI4MTUwMTY2ZTYzMWIyNmZl NTU3NDRlMWNlZjc2NTE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmNzcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVl dENTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmNzcwpAQCAtMzksMTEgKzM5LDExIEBACiAgICAg LXdlYmtpdC11c2VyLXNlbGVjdDogbm9uZTsKIH0KIAotLnNwcmVhZHNoZWV0LWNzcy1kZWNsYXJh dGlvbiA6bWF0Y2hlcyguaGVhZGVyLCAuaGVhZGVyLWdyb3VwaW5ncykgeworLnNwcmVhZHNoZWV0 LWNzcy1kZWNsYXJhdGlvbiA6bWF0Y2hlcyguaGVhZGVyLCAuaGVhZGVyLW1lZGlhKSB7CiAgICAg cGFkZGluZzogMCB2YXIoLS1jc3MtZGVjbGFyYXRpb24taG9yaXpvbnRhbC1wYWRkaW5nKTsKIH0K IAotLnNwcmVhZHNoZWV0LWNzcy1kZWNsYXJhdGlvbiA6bWF0Y2hlcyguaGVhZGVyLCAuaGVhZGVy LWdyb3VwaW5ncyk6Zmlyc3QtY2hpbGQgeworLnNwcmVhZHNoZWV0LWNzcy1kZWNsYXJhdGlvbiA6 bWF0Y2hlcyguaGVhZGVyLCAuaGVhZGVyLW1lZGlhKTpmaXJzdC1jaGlsZCB7CiAgICAgcGFkZGlu Zy10b3A6IHZhcigtLWNzcy1kZWNsYXJhdGlvbi12ZXJ0aWNhbC1wYWRkaW5nKTsKIH0KIApAQCAt NTYsNyArNTYsNyBAQAogICAgIHJpZ2h0OiB2YXIoLS1jc3MtZGVjbGFyYXRpb24taG9yaXpvbnRh bC1wYWRkaW5nKTsKIH0KIAotLnNwcmVhZHNoZWV0LWNzcy1kZWNsYXJhdGlvbiAuaGVhZGVyLWdy b3VwaW5ncyA+IC5ncm91cGluZyB7Cisuc3ByZWFkc2hlZXQtY3NzLWRlY2xhcmF0aW9uIC5tZWRp YS1sYWJlbCB7CiAgICAgY29sb3I6IHZhcigtLXRleHQtY29sb3IpOwogfQogCkBAIC0xMTIsMTAg KzExMiw2IEBACiAgICAgLXdlYmtpdC11c2VyLXNlbGVjdDogbm9uZTsKIH0KIAotLnNwcmVhZHNo ZWV0LWNzcy1kZWNsYXJhdGlvbiAuaGVhZGVyLWdyb3VwaW5ncyArIC5oZWFkZXIgPiAuc2VsZWN0 b3IgPiAuaWNvbiB7Ci0gICAgbWFyZ2luLXRvcDogMDsKLX0KLQogLnNwcmVhZHNoZWV0LWNzcy1k ZWNsYXJhdGlvbiAuc2VsZWN0b3IgPiAuaWNvbiArICogewogICAgIC13ZWJraXQtcGFkZGluZy1z dGFydDogMnB4OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0Q1NTU3R5 bGVEZWNsYXJhdGlvblNlY3Rpb24uanMKaW5kZXggNjQzYjU4YmFiMzBjYjkzZjc4ZjkyODY3N2M2 NmJhMDIxZTI4NTlmOC4uMGFkYzIyNzk4MzNmOTMyYzdiYjUyZjRjNjYxMTMwNDMxYzhjZDk0OCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3By ZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRp b25TZWN0aW9uLmpzCkBAIC0zOCw3ICszOCw3IEBAIFdJLlNwcmVhZHNoZWV0Q1NTU3R5bGVEZWNs YXJhdGlvblNlY3Rpb24gPSBjbGFzcyBTcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25TCiAg ICAgICAgIHRoaXMuX3N0eWxlID0gc3R5bGU7CiAgICAgICAgIHRoaXMuX3Byb3BlcnRpZXNFZGl0 b3IgPSBudWxsOwogICAgICAgICB0aGlzLl9zZWxlY3RvckVsZW1lbnRzID0gW107Ci0gICAgICAg IHRoaXMuX2dyb3VwaW5nRWxlbWVudHMgPSBbXTsKKyAgICAgICAgdGhpcy5fbWVkaWFFbGVtZW50 cyA9IFtdOwogICAgICAgICB0aGlzLl9maWx0ZXJUZXh0ID0gbnVsbDsKICAgICAgICAgdGhpcy5f c2hvdWxkRm9jdXNTZWxlY3RvckVsZW1lbnQgPSBmYWxzZTsKICAgICAgICAgdGhpcy5fd2FzRWRp dGluZyA9IGZhbHNlOwpAQCAtOTksMjkgKzk5LDcgQEAgV0kuU3ByZWFkc2hlZXRDU1NTdHlsZURl Y2xhcmF0aW9uU2VjdGlvbiA9IGNsYXNzIFNwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvblMK ICAgICAgICAgICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NMaXN0LmFkZChpY29uQ2xhc3NOYW1lKTsK ICAgICAgICAgfQogCi0gICAgICAgIGxldCBncm91cGluZ3MgPSB0aGlzLl9zdHlsZS5ncm91cGlu Z3MuZmlsdGVyKChncm91cGluZykgPT4gZ3JvdXBpbmcudGV4dCAhPT0gImFsbCIpOwotICAgICAg ICBpZiAoZ3JvdXBpbmdzLmxlbmd0aCkgewotICAgICAgICAgICAgbGV0IGdyb3VwaW5nc0VsZW1l bnQgPSB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2 IikpOwotICAgICAgICAgICAgZ3JvdXBpbmdzRWxlbWVudC5jbGFzc0xpc3QuYWRkKCJoZWFkZXIt Z3JvdXBpbmdzIik7Ci0KLSAgICAgICAgICAgIGxldCBjdXJyZW50R3JvdXBpbmdUeXBlID0gbnVs bDsKLSAgICAgICAgICAgIGxldCBncm91cGluZ1R5cGVFbGVtZW50ID0gbnVsbDsKLSAgICAgICAg ICAgIHRoaXMuX2dyb3VwaW5nRWxlbWVudHMgPSBncm91cGluZ3MubWFwKChncm91cGluZykgPT4g ewotICAgICAgICAgICAgICAgIGlmIChncm91cGluZy50eXBlICE9PSBjdXJyZW50R3JvdXBpbmdU eXBlKSB7Ci0gICAgICAgICAgICAgICAgICAgIGdyb3VwaW5nVHlwZUVsZW1lbnQgPSBncm91cGlu Z3NFbGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpKTsKLSAg ICAgICAgICAgICAgICAgICAgZ3JvdXBpbmdUeXBlRWxlbWVudC5jbGFzc0xpc3QuYWRkKCJncm91 cGluZyIpOwotICAgICAgICAgICAgICAgICAgICBncm91cGluZ1R5cGVFbGVtZW50LnRleHRDb250 ZW50ID0gZ3JvdXBpbmcucHJlZml4ICsgIiAiOwotICAgICAgICAgICAgICAgICAgICBjdXJyZW50 R3JvdXBpbmdUeXBlID0gZ3JvdXBpbmcudHlwZTsKLSAgICAgICAgICAgICAgICB9IGVsc2UKLSAg ICAgICAgICAgICAgICAgICAgZ3JvdXBpbmdUeXBlRWxlbWVudC5hcHBlbmQoIiwgIik7Ci0KLSAg ICAgICAgICAgICAgICBsZXQgc3BhbiA9IGdyb3VwaW5nVHlwZUVsZW1lbnQuYXBwZW5kQ2hpbGQo ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpKTsKLSAgICAgICAgICAgICAgICBzcGFuLnRl eHRDb250ZW50ID0gZ3JvdXBpbmcudGV4dDsKLSAgICAgICAgICAgICAgICByZXR1cm4gc3BhbjsK LSAgICAgICAgICAgIH0pOwotICAgICAgICB9Ci0KLSAgICAgICAgdGhpcy5faGVhZGVyRWxlbWVu dCA9IHRoaXMuX2VsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2 IikpOworICAgICAgICB0aGlzLl9oZWFkZXJFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgiZGl2Iik7CiAgICAgICAgIHRoaXMuX2hlYWRlckVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiaGVh ZGVyIik7CiAKICAgICAgICAgdGhpcy5fc3R5bGVPcmlnaW5WaWV3ID0gbmV3IFdJLlN0eWxlT3Jp Z2luVmlldygpOwpAQCAtMTU4LDcgKzEzNiw3IEBAIFdJLlNwcmVhZHNoZWV0Q1NTU3R5bGVEZWNs YXJhdGlvblNlY3Rpb24gPSBjbGFzcyBTcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25TCiAg ICAgICAgIHRoaXMuX2Nsb3NlQnJhY2UuY2xhc3NMaXN0LmFkZCgiY2xvc2UtYnJhY2UiKTsKICAg ICAgICAgdGhpcy5fY2xvc2VCcmFjZS50ZXh0Q29udGVudCA9ICJ9IjsKIAotCisgICAgICAgIHRo aXMuX2VsZW1lbnQuYXBwZW5kKHRoaXMuX2NyZWF0ZU1lZGlhSGVhZGVyKCksIHRoaXMuX2hlYWRl ckVsZW1lbnQpOwogICAgICAgICB0aGlzLmFkZFN1YnZpZXcodGhpcy5fcHJvcGVydGllc0VkaXRv cik7CiAgICAgICAgIHRoaXMuX3Byb3BlcnRpZXNFZGl0b3IubmVlZHNMYXlvdXQoKTsKICAgICAg ICAgdGhpcy5fZWxlbWVudC5hcHBlbmQodGhpcy5fY2xvc2VCcmFjZSk7CkBAIC00MDQsNiArMzgy LDMxIEBAIFdJLlNwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24gPSBjbGFzcyBT cHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25TCiAgICAgICAgICAgICB0aGlzLmFwcGx5Rmls dGVyKHRoaXMuX2ZpbHRlclRleHQpOwogICAgIH0KIAorICAgIF9jcmVhdGVNZWRpYUhlYWRlcigp CisgICAgeworICAgICAgICBsZXQgbWVkaWFMaXN0ID0gdGhpcy5fc3R5bGUubWVkaWFMaXN0Owor ICAgICAgICBpZiAoIW1lZGlhTGlzdC5sZW5ndGggfHwgKG1lZGlhTGlzdC5sZW5ndGggPT09IDEg JiYgKG1lZGlhTGlzdFswXS50ZXh0ID09PSAiYWxsIiB8fCBtZWRpYUxpc3RbMF0udGV4dCA9PT0g InNjcmVlbiIpKSkKKyAgICAgICAgICAgIHJldHVybiAiIjsKKworICAgICAgICBsZXQgbWVkaWFF bGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgICAgIG1lZGlhRWxl bWVudC5jbGFzc0xpc3QuYWRkKCJoZWFkZXItbWVkaWEiKTsKKworICAgICAgICBsZXQgbWVkaWFM YWJlbCA9IG1lZGlhRWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJk aXYiKSk7CisgICAgICAgIG1lZGlhTGFiZWwuY2xhc3NOYW1lID0gIm1lZGlhLWxhYmVsIjsKKyAg ICAgICAgbWVkaWFMYWJlbC5hcHBlbmQoIkBtZWRpYSAiKTsKKworICAgICAgICB0aGlzLl9tZWRp YUVsZW1lbnRzID0gbWVkaWFMaXN0Lm1hcCgobWVkaWEsIGkpID0+IHsKKyAgICAgICAgICAgIGlm IChpKQorICAgICAgICAgICAgICAgIG1lZGlhTGFiZWwuYXBwZW5kKCIsICIpOworCisgICAgICAg ICAgICBsZXQgc3BhbiA9IG1lZGlhTGFiZWwuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgic3BhbiIpKTsKKyAgICAgICAgICAgIHNwYW4udGV4dENvbnRlbnQgPSBtZWRpYS50ZXh0 OworICAgICAgICAgICAgcmV0dXJuIHNwYW47CisgICAgICAgIH0pOworCisgICAgICAgIHJldHVy biBtZWRpYUVsZW1lbnQ7CisgICAgfQorCiAgICAgX3NhdmUoZXZlbnQpCiAgICAgewogICAgICAg ICBldmVudC5zdG9wKCk7CkBAIC02NjUsMTMgKzY2OCwxMyBAQCBXSS5TcHJlYWRzaGVldENTU1N0 eWxlRGVjbGFyYXRpb25TZWN0aW9uID0gY2xhc3MgU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0 aW9uUwogCiAgICAgX2hhbmRsZUVkaXRvckZpbHRlckFwcGxpZWQoZXZlbnQpCiAgICAgewotICAg ICAgICBsZXQgbWF0Y2hlc0dyb3VwaW5nID0gZmFsc2U7Ci0gICAgICAgIGZvciAobGV0IGdyb3Vw aW5nRWxlbWVudCBvZiB0aGlzLl9ncm91cGluZ0VsZW1lbnRzKSB7Ci0gICAgICAgICAgICBncm91 cGluZ0VsZW1lbnQuY2xhc3NMaXN0LnJlbW92ZShXSS5HZW5lcmFsU3R5bGVEZXRhaWxzU2lkZWJh clBhbmVsLkZpbHRlck1hdGNoU2VjdGlvbkNsYXNzTmFtZSk7CisgICAgICAgIGxldCBtYXRjaGVz TWVkaWEgPSBmYWxzZTsKKyAgICAgICAgZm9yIChsZXQgbWVkaWFFbGVtZW50IG9mIHRoaXMuX21l ZGlhRWxlbWVudHMpIHsKKyAgICAgICAgICAgIG1lZGlhRWxlbWVudC5jbGFzc0xpc3QucmVtb3Zl KFdJLkdlbmVyYWxTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwuRmlsdGVyTWF0Y2hTZWN0aW9uQ2xh c3NOYW1lKTsKIAotICAgICAgICAgICAgaWYgKGdyb3VwaW5nRWxlbWVudC50ZXh0Q29udGVudC5p bmNsdWRlcyh0aGlzLl9maWx0ZXJUZXh0KSkgewotICAgICAgICAgICAgICAgIGdyb3VwaW5nRWxl bWVudC5jbGFzc0xpc3QuYWRkKFdJLkdlbmVyYWxTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwuRmls dGVyTWF0Y2hTZWN0aW9uQ2xhc3NOYW1lKTsKLSAgICAgICAgICAgICAgICBtYXRjaGVzR3JvdXBp bmcgPSB0cnVlOworICAgICAgICAgICAgaWYgKG1lZGlhRWxlbWVudC50ZXh0Q29udGVudC5pbmNs dWRlcyh0aGlzLl9maWx0ZXJUZXh0KSkgeworICAgICAgICAgICAgICAgIG1lZGlhRWxlbWVudC5j bGFzc0xpc3QuYWRkKFdJLkdlbmVyYWxTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwuRmlsdGVyTWF0 Y2hTZWN0aW9uQ2xhc3NOYW1lKTsKKyAgICAgICAgICAgICAgICBtYXRjaGVzTWVkaWEgPSB0cnVl OwogICAgICAgICAgICAgfQogICAgICAgICB9CiAKQEAgLTY4NSw3ICs2ODgsNyBAQCBXSS5TcHJl YWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uID0gY2xhc3MgU3ByZWFkc2hlZXRDU1NT dHlsZURlY2xhcmF0aW9uUwogICAgICAgICAgICAgfQogICAgICAgICB9CiAKLSAgICAgICAgbGV0 IG1hdGNoZXMgPSBldmVudC5kYXRhLm1hdGNoZXMgfHwgbWF0Y2hlc0dyb3VwaW5nIHx8IG1hdGNo ZXNTZWxlY3RvcjsKKyAgICAgICAgbGV0IG1hdGNoZXMgPSBldmVudC5kYXRhLm1hdGNoZXMgfHwg bWF0Y2hlc01lZGlhIHx8IG1hdGNoZXNTZWxlY3RvcjsKICAgICAgICAgaWYgKCFtYXRjaGVzKQog ICAgICAgICAgICAgdGhpcy5fZWxlbWVudC5jbGFzc0xpc3QuYWRkKFdJLkdlbmVyYWxTdHlsZURl dGFpbHNTaWRlYmFyUGFuZWwuTm9GaWx0ZXJNYXRjaEluU2VjdGlvbkNsYXNzTmFtZSk7CiAKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpp bmRleCAwMzI4ODcxYTI2NzA1NjUwYmNiY2RjMjA4MzdiMTU3Y2YxNDE2MDUyLi5iYTk0ZDk3NmM1 MmU5YzExOTFhYjY5ZWRmM2NmMTBiN2M5MGE1YzE3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIw MTktMDgtMDYgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgorCisgICAg ICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIyNDgyODkuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDA0ODgKKworICAgICAgICBCcm9rZSBpbnRl cm5hbCBidWlsZHMgKFJlcXVlc3RlZCBieSBkcm91c3NvIG9uICN3ZWJraXQpLgorCisgICAgICAg IFJldmVydGVkIGNoYW5nZXNldDoKKworICAgICAgICAiV2ViIEluc3BlY3RvcjogU3R5bGVzOiBz aG93IEBzdXBwb3J0cyBDU1MgZ3JvdXBpbmdzIgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAwNDE5CisgICAgICAgIGh0dHBzOi8vdHJhYy53ZWJraXQu b3JnL2NoYW5nZXNldC8yNDgyODkKKwogMjAxOS0wOC0wNiAgUnVzc2VsbCBFcHN0ZWluICA8cmVw c3RlaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFVwZGF0aW5nIFRlc3QgRXhwZWN0YXRpb25zIGZv ciA8cmRhcjovLzUzOTU3MjY0PiwgPHJkYXI6Ly81Mzk0NjQ4Mj4sIDxyZGFyOi8vNTM4NjY3ODM+ CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY3NzL2dldE1hdGNoZWRTdHlsZXNG b3JOb2RlLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jc3MvZ2V0TWF0Y2hl ZFN0eWxlc0Zvck5vZGUtZXhwZWN0ZWQudHh0CmluZGV4IDM1YzU2NmY0OGYyNjQ5MGY1YTg2ZjU2 YmNmOTIxZjhiNDY4YzQzMjYuLmY4ZmQ2M2E5MWFhM2NlNTYxOGQ4YjYyYTg1MTk4YmFkMmJkYzY0 MjAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9jc3MvZ2V0TWF0Y2hlZFN0eWxl c0Zvck5vZGUtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jc3MvZ2V0 TWF0Y2hlZFN0eWxlc0Zvck5vZGUtZXhwZWN0ZWQudHh0CkBAIC03OTAsNTkgKzc5MCw5IEBAIElu aGVyaXRlZDoKICAgICAgICAgICAic3R5bGUiOiB7CiAgICAgICAgICAgICAiY3NzUHJvcGVydGll cyI6IFsKICAgICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICJuYW1lIjogImNvbG9yIiwK LSAgICAgICAgICAgICAgICAidmFsdWUiOiAicmVkIiwKLSAgICAgICAgICAgICAgICAidGV4dCI6 ICJjb2xvcjogcmVkOyIsCi0gICAgICAgICAgICAgICAgInJhbmdlIjogIjxmaWx0ZXJlZD4iLAot ICAgICAgICAgICAgICAgICJpbXBsaWNpdCI6IGZhbHNlLAotICAgICAgICAgICAgICAgICJzdGF0 dXMiOiAiYWN0aXZlIgotICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBdLAotICAgICAgICAg ICAgInNob3J0aGFuZEVudHJpZXMiOiBbXSwKLSAgICAgICAgICAgICJzdHlsZUlkIjogIjxmaWx0 ZXJlZD4iLAotICAgICAgICAgICAgIndpZHRoIjogIiIsCi0gICAgICAgICAgICAiaGVpZ2h0Ijog IiIsCi0gICAgICAgICAgICAicmFuZ2UiOiAiPGZpbHRlcmVkPiIsCi0gICAgICAgICAgICAiY3Nz VGV4dCI6ICIgY29sb3I6IHJlZDsgIgotICAgICAgICAgIH0sCi0gICAgICAgICAgInNvdXJjZVVS TCI6ICI8ZmlsdGVyZWQ+IiwKLSAgICAgICAgICAicnVsZUlkIjogIjxmaWx0ZXJlZD4iLAotICAg ICAgICAgICJncm91cGluZ3MiOiBbCi0gICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICJ0ZXh0 IjogIihtaW4td2lkdGg6IDBweCkiLAotICAgICAgICAgICAgICAidHlwZSI6ICJtZWRpYS1pbXBv cnQtcnVsZSIsCi0gICAgICAgICAgICAgICJzb3VyY2VVUkwiOiAiPGZpbHRlcmVkPiIKLSAgICAg ICAgICAgIH0KLSAgICAgICAgICBdCi0gICAgICAgIH0sCi0gICAgICAgICJtYXRjaGluZ1NlbGVj dG9ycyI6IFsKLSAgICAgICAgICAwCi0gICAgICAgIF0KLSAgICAgIH0sCi0gICAgICB7Ci0gICAg ICAgICJydWxlIjogewotICAgICAgICAgICJzZWxlY3Rvckxpc3QiOiB7Ci0gICAgICAgICAgICAi c2VsZWN0b3JzIjogWwotICAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgInRleHQiOiAi Ym9keSIsCi0gICAgICAgICAgICAgICAgInNwZWNpZmljaXR5IjogWwotICAgICAgICAgICAgICAg ICAgMCwKLSAgICAgICAgICAgICAgICAgIDAsCi0gICAgICAgICAgICAgICAgICAxCi0gICAgICAg ICAgICAgICAgXQotICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBdLAotICAgICAgICAgICAg InRleHQiOiAiYm9keSIsCi0gICAgICAgICAgICAicmFuZ2UiOiAiPGZpbHRlcmVkPiIKLSAgICAg ICAgICB9LAotICAgICAgICAgICJzb3VyY2VMaW5lIjogIjxmaWx0ZXJlZD4iLAotICAgICAgICAg ICJvcmlnaW4iOiAicmVndWxhciIsCi0gICAgICAgICAgInN0eWxlIjogewotICAgICAgICAgICAg ImNzc1Byb3BlcnRpZXMiOiBbCi0gICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAibmFt ZSI6ICJjb2xvciIsCi0gICAgICAgICAgICAgICAgInZhbHVlIjogInJlZCIsCi0gICAgICAgICAg ICAgICAgInRleHQiOiAiY29sb3I6IHJlZDsiLAorICAgICAgICAgICAgICAgICJuYW1lIjogInot aW5kZXgiLAorICAgICAgICAgICAgICAgICJ2YWx1ZSI6ICIwIiwKKyAgICAgICAgICAgICAgICAi dGV4dCI6ICJ6LWluZGV4OiAwOyIsCiAgICAgICAgICAgICAgICAgInJhbmdlIjogIjxmaWx0ZXJl ZD4iLAogICAgICAgICAgICAgICAgICJpbXBsaWNpdCI6IGZhbHNlLAogICAgICAgICAgICAgICAg ICJzdGF0dXMiOiAiYWN0aXZlIgpAQCAtODUzLDcgKzgwMyw3IEBAIEluaGVyaXRlZDoKICAgICAg ICAgICAgICJ3aWR0aCI6ICIiLAogICAgICAgICAgICAgImhlaWdodCI6ICIiLAogICAgICAgICAg ICAgInJhbmdlIjogIjxmaWx0ZXJlZD4iLAotICAgICAgICAgICAgImNzc1RleHQiOiAiIGNvbG9y OiByZWQ7ICIKKyAgICAgICAgICAgICJjc3NUZXh0IjogIiB6LWluZGV4OiAwOyAiCiAgICAgICAg ICAgfSwKICAgICAgICAgICAic291cmNlVVJMIjogIjxmaWx0ZXJlZD4iLAogICAgICAgICAgICJy dWxlSWQiOiAiPGZpbHRlcmVkPiIKQEAgLTg2MSwyMTEgKzgxMSw2IEBAIEluaGVyaXRlZDoKICAg ICAgICAgIm1hdGNoaW5nU2VsZWN0b3JzIjogWwogICAgICAgICAgIDAKICAgICAgICAgXQotICAg ICAgfSwKLSAgICAgIHsKLSAgICAgICAgInJ1bGUiOiB7Ci0gICAgICAgICAgInNlbGVjdG9yTGlz dCI6IHsKLSAgICAgICAgICAgICJzZWxlY3RvcnMiOiBbCi0gICAgICAgICAgICAgIHsKLSAgICAg ICAgICAgICAgICAidGV4dCI6ICJib2R5IiwKLSAgICAgICAgICAgICAgICAic3BlY2lmaWNpdHki OiBbCi0gICAgICAgICAgICAgICAgICAwLAotICAgICAgICAgICAgICAgICAgMCwKLSAgICAgICAg ICAgICAgICAgIDEKLSAgICAgICAgICAgICAgICBdCi0gICAgICAgICAgICAgIH0KLSAgICAgICAg ICAgIF0sCi0gICAgICAgICAgICAidGV4dCI6ICJib2R5IiwKLSAgICAgICAgICAgICJyYW5nZSI6 ICI8ZmlsdGVyZWQ+IgotICAgICAgICAgIH0sCi0gICAgICAgICAgInNvdXJjZUxpbmUiOiAiPGZp bHRlcmVkPiIsCi0gICAgICAgICAgIm9yaWdpbiI6ICJyZWd1bGFyIiwKLSAgICAgICAgICAic3R5 bGUiOiB7Ci0gICAgICAgICAgICAiY3NzUHJvcGVydGllcyI6IFsKLSAgICAgICAgICAgICAgewot ICAgICAgICAgICAgICAgICJuYW1lIjogImNvbG9yIiwKLSAgICAgICAgICAgICAgICAidmFsdWUi OiAicmVkIiwKLSAgICAgICAgICAgICAgICAidGV4dCI6ICJjb2xvcjogcmVkOyIsCi0gICAgICAg ICAgICAgICAgInJhbmdlIjogIjxmaWx0ZXJlZD4iLAotICAgICAgICAgICAgICAgICJpbXBsaWNp dCI6IGZhbHNlLAotICAgICAgICAgICAgICAgICJzdGF0dXMiOiAiYWN0aXZlIgotICAgICAgICAg ICAgICB9Ci0gICAgICAgICAgICBdLAotICAgICAgICAgICAgInNob3J0aGFuZEVudHJpZXMiOiBb XSwKLSAgICAgICAgICAgICJzdHlsZUlkIjogIjxmaWx0ZXJlZD4iLAotICAgICAgICAgICAgIndp ZHRoIjogIiIsCi0gICAgICAgICAgICAiaGVpZ2h0IjogIiIsCi0gICAgICAgICAgICAicmFuZ2Ui OiAiPGZpbHRlcmVkPiIsCi0gICAgICAgICAgICAiY3NzVGV4dCI6ICIgY29sb3I6IHJlZDsgIgot ICAgICAgICAgIH0sCi0gICAgICAgICAgInNvdXJjZVVSTCI6ICI8ZmlsdGVyZWQ+IiwKLSAgICAg ICAgICAicnVsZUlkIjogIjxmaWx0ZXJlZD4iLAotICAgICAgICAgICJncm91cGluZ3MiOiBbCi0g ICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICJ0ZXh0IjogIihtaW4td2lkdGg6IDFweCkiLAot ICAgICAgICAgICAgICAidHlwZSI6ICJtZWRpYS1ydWxlIiwKLSAgICAgICAgICAgICAgInNvdXJj ZVVSTCI6ICI8ZmlsdGVyZWQ+IgotICAgICAgICAgICAgfQotICAgICAgICAgIF0KLSAgICAgICAg fSwKLSAgICAgICAgIm1hdGNoaW5nU2VsZWN0b3JzIjogWwotICAgICAgICAgIDAKLSAgICAgICAg XQotICAgICAgfSwKLSAgICAgIHsKLSAgICAgICAgInJ1bGUiOiB7Ci0gICAgICAgICAgInNlbGVj dG9yTGlzdCI6IHsKLSAgICAgICAgICAgICJzZWxlY3RvcnMiOiBbCi0gICAgICAgICAgICAgIHsK LSAgICAgICAgICAgICAgICAidGV4dCI6ICJib2R5IiwKLSAgICAgICAgICAgICAgICAic3BlY2lm aWNpdHkiOiBbCi0gICAgICAgICAgICAgICAgICAwLAotICAgICAgICAgICAgICAgICAgMCwKLSAg ICAgICAgICAgICAgICAgIDEKLSAgICAgICAgICAgICAgICBdCi0gICAgICAgICAgICAgIH0KLSAg ICAgICAgICAgIF0sCi0gICAgICAgICAgICAidGV4dCI6ICJib2R5IiwKLSAgICAgICAgICAgICJy YW5nZSI6ICI8ZmlsdGVyZWQ+IgotICAgICAgICAgIH0sCi0gICAgICAgICAgInNvdXJjZUxpbmUi OiAiPGZpbHRlcmVkPiIsCi0gICAgICAgICAgIm9yaWdpbiI6ICJyZWd1bGFyIiwKLSAgICAgICAg ICAic3R5bGUiOiB7Ci0gICAgICAgICAgICAiY3NzUHJvcGVydGllcyI6IFsKLSAgICAgICAgICAg ICAgewotICAgICAgICAgICAgICAgICJuYW1lIjogImNvbG9yIiwKLSAgICAgICAgICAgICAgICAi dmFsdWUiOiAicmVkIiwKLSAgICAgICAgICAgICAgICAidGV4dCI6ICJjb2xvcjogcmVkOyIsCi0g ICAgICAgICAgICAgICAgInJhbmdlIjogIjxmaWx0ZXJlZD4iLAotICAgICAgICAgICAgICAgICJp bXBsaWNpdCI6IGZhbHNlLAotICAgICAgICAgICAgICAgICJzdGF0dXMiOiAiYWN0aXZlIgotICAg ICAgICAgICAgICB9Ci0gICAgICAgICAgICBdLAotICAgICAgICAgICAgInNob3J0aGFuZEVudHJp ZXMiOiBbXSwKLSAgICAgICAgICAgICJzdHlsZUlkIjogIjxmaWx0ZXJlZD4iLAotICAgICAgICAg ICAgIndpZHRoIjogIiIsCi0gICAgICAgICAgICAiaGVpZ2h0IjogIiIsCi0gICAgICAgICAgICAi cmFuZ2UiOiAiPGZpbHRlcmVkPiIsCi0gICAgICAgICAgICAiY3NzVGV4dCI6ICIgY29sb3I6IHJl ZDsgIgotICAgICAgICAgIH0sCi0gICAgICAgICAgInNvdXJjZVVSTCI6ICI8ZmlsdGVyZWQ+IiwK LSAgICAgICAgICAicnVsZUlkIjogIjxmaWx0ZXJlZD4iLAotICAgICAgICAgICJncm91cGluZ3Mi OiBbCi0gICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICJ0ZXh0IjogIihkaXNwbGF5OiBibG9j aykiLAotICAgICAgICAgICAgICAidHlwZSI6ICJzdXBwb3J0cy1ydWxlIiwKLSAgICAgICAgICAg ICAgInNvdXJjZVVSTCI6ICI8ZmlsdGVyZWQ+IgotICAgICAgICAgICAgfSwKLSAgICAgICAgICAg IHsKLSAgICAgICAgICAgICAgInRleHQiOiAiKG1pbi13aWR0aDogMnB4KSIsCi0gICAgICAgICAg ICAgICJ0eXBlIjogIm1lZGlhLXJ1bGUiLAotICAgICAgICAgICAgICAic291cmNlVVJMIjogIjxm aWx0ZXJlZD4iCi0gICAgICAgICAgICB9Ci0gICAgICAgICAgXQotICAgICAgICB9LAotICAgICAg ICAibWF0Y2hpbmdTZWxlY3RvcnMiOiBbCi0gICAgICAgICAgMAotICAgICAgICBdCi0gICAgICB9 LAotICAgICAgewotICAgICAgICAicnVsZSI6IHsKLSAgICAgICAgICAic2VsZWN0b3JMaXN0Ijog ewotICAgICAgICAgICAgInNlbGVjdG9ycyI6IFsKLSAgICAgICAgICAgICAgewotICAgICAgICAg ICAgICAgICJ0ZXh0IjogImJvZHkiLAotICAgICAgICAgICAgICAgICJzcGVjaWZpY2l0eSI6IFsK LSAgICAgICAgICAgICAgICAgIDAsCi0gICAgICAgICAgICAgICAgICAwLAotICAgICAgICAgICAg ICAgICAgMQotICAgICAgICAgICAgICAgIF0KLSAgICAgICAgICAgICAgfQotICAgICAgICAgICAg XSwKLSAgICAgICAgICAgICJ0ZXh0IjogImJvZHkiLAotICAgICAgICAgICAgInJhbmdlIjogIjxm aWx0ZXJlZD4iCi0gICAgICAgICAgfSwKLSAgICAgICAgICAic291cmNlTGluZSI6ICI8ZmlsdGVy ZWQ+IiwKLSAgICAgICAgICAib3JpZ2luIjogInJlZ3VsYXIiLAotICAgICAgICAgICJzdHlsZSI6 IHsKLSAgICAgICAgICAgICJjc3NQcm9wZXJ0aWVzIjogWwotICAgICAgICAgICAgICB7Ci0gICAg ICAgICAgICAgICAgIm5hbWUiOiAiY29sb3IiLAotICAgICAgICAgICAgICAgICJ2YWx1ZSI6ICJy ZWQiLAotICAgICAgICAgICAgICAgICJ0ZXh0IjogImNvbG9yOiByZWQ7IiwKLSAgICAgICAgICAg ICAgICAicmFuZ2UiOiAiPGZpbHRlcmVkPiIsCi0gICAgICAgICAgICAgICAgImltcGxpY2l0Ijog ZmFsc2UsCi0gICAgICAgICAgICAgICAgInN0YXR1cyI6ICJhY3RpdmUiCi0gICAgICAgICAgICAg IH0KLSAgICAgICAgICAgIF0sCi0gICAgICAgICAgICAic2hvcnRoYW5kRW50cmllcyI6IFtdLAot ICAgICAgICAgICAgInN0eWxlSWQiOiAiPGZpbHRlcmVkPiIsCi0gICAgICAgICAgICAid2lkdGgi OiAiIiwKLSAgICAgICAgICAgICJoZWlnaHQiOiAiIiwKLSAgICAgICAgICAgICJyYW5nZSI6ICI8 ZmlsdGVyZWQ+IiwKLSAgICAgICAgICAgICJjc3NUZXh0IjogIiBjb2xvcjogcmVkOyIKLSAgICAg ICAgICB9LAotICAgICAgICAgICJzb3VyY2VVUkwiOiAiPGZpbHRlcmVkPiIsCi0gICAgICAgICAg InJ1bGVJZCI6ICI8ZmlsdGVyZWQ+IiwKLSAgICAgICAgICAiZ3JvdXBpbmdzIjogWwotICAgICAg ICAgICAgewotICAgICAgICAgICAgICAidGV4dCI6ICIobWluLXdpZHRoOiAzcHgpIiwKLSAgICAg ICAgICAgICAgInR5cGUiOiAibWVkaWEtc3R5bGUtbm9kZSIsCi0gICAgICAgICAgICAgICJzb3Vy Y2VVUkwiOiAiPGZpbHRlcmVkPiIKLSAgICAgICAgICAgIH0KLSAgICAgICAgICBdCi0gICAgICAg IH0sCi0gICAgICAgICJtYXRjaGluZ1NlbGVjdG9ycyI6IFsKLSAgICAgICAgICAwCi0gICAgICAg IF0KLSAgICAgIH0sCi0gICAgICB7Ci0gICAgICAgICJydWxlIjogewotICAgICAgICAgICJzZWxl Y3Rvckxpc3QiOiB7Ci0gICAgICAgICAgICAic2VsZWN0b3JzIjogWwotICAgICAgICAgICAgICB7 Ci0gICAgICAgICAgICAgICAgInRleHQiOiAiYm9keSIsCi0gICAgICAgICAgICAgICAgInNwZWNp ZmljaXR5IjogWwotICAgICAgICAgICAgICAgICAgMCwKLSAgICAgICAgICAgICAgICAgIDAsCi0g ICAgICAgICAgICAgICAgICAxCi0gICAgICAgICAgICAgICAgXQotICAgICAgICAgICAgICB9Ci0g ICAgICAgICAgICBdLAotICAgICAgICAgICAgInRleHQiOiAiYm9keSIsCi0gICAgICAgICAgICAi cmFuZ2UiOiAiPGZpbHRlcmVkPiIKLSAgICAgICAgICB9LAotICAgICAgICAgICJzb3VyY2VMaW5l IjogIjxmaWx0ZXJlZD4iLAotICAgICAgICAgICJvcmlnaW4iOiAicmVndWxhciIsCi0gICAgICAg ICAgInN0eWxlIjogewotICAgICAgICAgICAgImNzc1Byb3BlcnRpZXMiOiBbCi0gICAgICAgICAg ICAgIHsKLSAgICAgICAgICAgICAgICAibmFtZSI6ICJjb2xvciIsCi0gICAgICAgICAgICAgICAg InZhbHVlIjogInJlZCIsCi0gICAgICAgICAgICAgICAgInRleHQiOiAiY29sb3I6IHJlZDsiLAot ICAgICAgICAgICAgICAgICJyYW5nZSI6ICI8ZmlsdGVyZWQ+IiwKLSAgICAgICAgICAgICAgICAi aW1wbGljaXQiOiBmYWxzZSwKLSAgICAgICAgICAgICAgICAic3RhdHVzIjogImFjdGl2ZSIKLSAg ICAgICAgICAgICAgfQotICAgICAgICAgICAgXSwKLSAgICAgICAgICAgICJzaG9ydGhhbmRFbnRy aWVzIjogW10sCi0gICAgICAgICAgICAic3R5bGVJZCI6ICI8ZmlsdGVyZWQ+IiwKLSAgICAgICAg ICAgICJ3aWR0aCI6ICIiLAotICAgICAgICAgICAgImhlaWdodCI6ICIiLAotICAgICAgICAgICAg InJhbmdlIjogIjxmaWx0ZXJlZD4iLAotICAgICAgICAgICAgImNzc1RleHQiOiAiIGNvbG9yOiBy ZWQ7ICIKLSAgICAgICAgICB9LAotICAgICAgICAgICJzb3VyY2VVUkwiOiAiPGZpbHRlcmVkPiIs Ci0gICAgICAgICAgInJ1bGVJZCI6ICI8ZmlsdGVyZWQ+IiwKLSAgICAgICAgICAiZ3JvdXBpbmdz IjogWwotICAgICAgICAgICAgewotICAgICAgICAgICAgICAidGV4dCI6ICIobWluLXdpZHRoOiA0 cHgpIiwKLSAgICAgICAgICAgICAgInR5cGUiOiAibWVkaWEtbGluay1ub2RlIiwKLSAgICAgICAg ICAgICAgInNvdXJjZVVSTCI6ICI8ZmlsdGVyZWQ+IgotICAgICAgICAgICAgfQotICAgICAgICAg IF0KLSAgICAgICAgfSwKLSAgICAgICAgIm1hdGNoaW5nU2VsZWN0b3JzIjogWwotICAgICAgICAg IDAKLSAgICAgICAgXQogICAgICAgfQogICAgIF0KICAgfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2Nzcy9nZXRNYXRjaGVkU3R5bGVzRm9yTm9kZS5odG1sIGIvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2Nzcy9nZXRNYXRjaGVkU3R5bGVzRm9yTm9kZS5odG1sCmluZGV4IDZkYmJm MmVhMzlhMDRmZTM0NGQ2YzE4MjIxMmMxNWJjOGE4N2JhMmYuLjYxYzgwYjE4NmY0N2Q0M2NjNWMw YjM5MTQ0NGFjZTA1YjhkMzNmZDAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9j c3MvZ2V0TWF0Y2hlZFN0eWxlc0Zvck5vZGUuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0 b3IvY3NzL2dldE1hdGNoZWRTdHlsZXNGb3JOb2RlLmh0bWwKQEAgLTEsMzYgKzEsNiBAQAogPGh0 bWw+CiA8aGVhZD4KIDxzY3JpcHQgc3JjPSIuLi8uLi9odHRwL3Rlc3RzL2luc3BlY3Rvci9yZXNv dXJjZXMvcHJvdG9jb2wtdGVzdC5qcyI+PC9zY3JpcHQ+Ci08c3R5bGU+Ci0gICAgQGltcG9ydCB1 cmwocmVzb3VyY2VzL2V4dGVybmFsLmNzcz8xKSAobWluLXdpZHRoOiAwcHgpOwotCi0gICAgYm9k eSB7IGNvbG9yOiByZWQ7IH0KLSAgICBAbWVkaWEgKG1pbi13aWR0aDogMXB4KSB7IGJvZHkgeyBj b2xvcjogcmVkOyB9IH0KLSAgICBAbWVkaWEgKG1pbi13aWR0aDogMnB4KSB7IEBzdXBwb3J0cyhk aXNwbGF5OiBibG9jaykgeyBib2R5IHsgY29sb3I6IHJlZDsgfSB9IH0KLTwvc3R5bGU+Ci08c3R5 bGUgbWVkaWE9IihtaW4td2lkdGg6IDNweCkiPgotICAgIGJvZHkgeyBjb2xvcjogcmVkO30KLTwv c3R5bGU+Ci08bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9InJlc291cmNlcy9leHRlcm5hbC5j c3M/MiIgbWVkaWE9IihtaW4td2lkdGg6IDRweCkiPgotPHN0eWxlPgotICAgIGRpdiN4IHsgei1p bmRleDogMTAwOyB9Ci0gICAgI3ggeyB6LWluZGV4OiAyMDA7IH0KLSAgICBkaXYgeyB6LWluZGV4 OiAzMDA7IH0KLQotICAgIGRpdjo6Zmlyc3QtbGluZSB7IHotaW5kZXg6IDE7IH0KLSAgICBkaXY6 OmZpcnN0LWxldHRlciB7IHotaW5kZXg6IDI7IH0KLSAgICBkaXY6Om1hcmtlciB7IHotaW5kZXg6 IDM7IH0KLSAgICBkaXY6OmJlZm9yZSB7IHotaW5kZXg6IDQ7IH0KLSAgICBkaXY6OmFmdGVyIHsg ei1pbmRleDogNTsgfQotICAgIGRpdjo6c2VsZWN0aW9uIHsgei1pbmRleDogNjsgfQotICAgIGRp djo6LXdlYmtpdC1zY3JvbGxiYXIgeyB6LWluZGV4OiA3OyB9Ci0gICAgZGl2Ojotd2Via2l0LXNj cm9sbGJhci10aHVtYiB7IHotaW5kZXg6IDg7IH0KLSAgICBkaXY6Oi13ZWJraXQtc2Nyb2xsYmFy LWJ1dHRvbiB7IHotaW5kZXg6IDk7IH0KLSAgICBkaXY6Oi13ZWJraXQtc2Nyb2xsYmFyLXRyYWNr IHsgei1pbmRleDogMTA7IH0KLSAgICBkaXY6Oi13ZWJraXQtc2Nyb2xsYmFyLXRyYWNrLXBpZWNl IHsgei1pbmRleDogMTE7IH0KLSAgICBkaXY6Oi13ZWJraXQtc2Nyb2xsYmFyLWNvcm5lciB7IHot aW5kZXg6IDEyOyB9Ci0gICAgZGl2Ojotd2Via2l0LXJlc2l6ZXIgeyB6LWluZGV4OiAxMzsgfQot PC9zdHlsZT4KIDxzY3JpcHQ+CiBmdW5jdGlvbiB0ZXN0KCkKIHsKQEAgLTEwNSw3ICs3NSwyOSBA QCBmdW5jdGlvbiB0ZXN0KCkKIDwvc2NyaXB0PgogPC9oZWFkPgogPGJvZHkgb25Mb2FkPSJydW5U ZXN0KCkiPgotPHA+VGVzdGluZyBDU1MuZ2V0TWF0Y2hlZFN0eWxlc0Zvck5vZGUuPC9wPgotPGRp diBpZD0ieCI+PC9kaXY+CisgICAgPHA+VGVzdGluZyBDU1MuZ2V0TWF0Y2hlZFN0eWxlc0Zvck5v ZGUuPC9wPgorCisgICAgPHN0eWxlPgorICAgIGJvZHkgeyB6LWluZGV4OiAwOyB9CisKKyAgICBk aXYjeCB7IHotaW5kZXg6IDEwMDsgfQorICAgICN4IHsgei1pbmRleDogMjAwOyB9CisgICAgZGl2 IHsgei1pbmRleDogMzAwOyB9CisKKyAgICBkaXY6OmZpcnN0LWxpbmUgeyB6LWluZGV4OiAxOyB9 CisgICAgZGl2OjpmaXJzdC1sZXR0ZXIgeyB6LWluZGV4OiAyOyB9CisgICAgZGl2OjptYXJrZXIg eyB6LWluZGV4OiAzOyB9CisgICAgZGl2OjpiZWZvcmUgeyB6LWluZGV4OiA0OyB9CisgICAgZGl2 OjphZnRlciB7IHotaW5kZXg6IDU7IH0KKyAgICBkaXY6OnNlbGVjdGlvbiB7IHotaW5kZXg6IDY7 IH0KKyAgICBkaXY6Oi13ZWJraXQtc2Nyb2xsYmFyIHsgei1pbmRleDogNzsgfQorICAgIGRpdjo6 LXdlYmtpdC1zY3JvbGxiYXItdGh1bWIgeyB6LWluZGV4OiA4OyB9CisgICAgZGl2Ojotd2Via2l0 LXNjcm9sbGJhci1idXR0b24geyB6LWluZGV4OiA5OyB9CisgICAgZGl2Ojotd2Via2l0LXNjcm9s bGJhci10cmFjayB7IHotaW5kZXg6IDEwOyB9CisgICAgZGl2Ojotd2Via2l0LXNjcm9sbGJhci10 cmFjay1waWVjZSB7IHotaW5kZXg6IDExOyB9CisgICAgZGl2Ojotd2Via2l0LXNjcm9sbGJhci1j b3JuZXIgeyB6LWluZGV4OiAxMjsgfQorICAgIGRpdjo6LXdlYmtpdC1yZXNpemVyIHsgei1pbmRl eDogMTM7IH0KKyAgICA8L3N0eWxlPgorICAgIDxkaXYgaWQ9IngiPjwvZGl2PgogPC9ib2R5Pgog PC9odG1sPgo=