61039 2011-05-18 04:30:54 -0700 REGRESSION(r86747): Breaks JSC debugger tests. (Requested by pfeldman on #webkit). 2011-05-18 04:34:06 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 61028 1 webkit.review.bot webkit.review.bot commit-queue pfeldman yurys oldest_to_newest 405638 0 webkit.review.bot 2011-05-18 04:30:54 -0700 http://trac.webkit.org/changeset/86747 broke the build: Breaks JSC debugger tests. (Requested by pfeldman on #webkit). This is an automatic bug report generated by the sheriff-bot. 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 case pain. "Only you can prevent forest fires." -- Smokey the Bear 405639 1 93898 webkit.review.bot 2011-05-18 04:31:13 -0700 Created attachment 93898 ROLLOUT of r86747 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 --ignore-builders where ATTACHMENT_ID is the ID of this attachment. 405640 2 93898 commit-queue 2011-05-18 04:34:02 -0700 Comment on attachment 93898 ROLLOUT of r86747 Clearing flags on attachment: 93898 Committed r86751: <http://trac.webkit.org/changeset/86751> 405641 3 commit-queue 2011-05-18 04:34:06 -0700 All reviewed patches have been landed. Closing bug. 93898 2011-05-18 04:31:13 -0700 2011-05-18 04:34:02 -0700 ROLLOUT of r86747 bug-61039-20110518113040.patch text/plain 34943 webkit.review.bot U3VidmVyc2lvbiBSZXZpc2lvbjogODY3NTAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhOTU0ZGM5Zjc3Nzk0ZDYy YzljMjVkNmUzMGZkZWFhZGNjOGExZmIzLi44YWZlOGM5ZjliMzdlZDQwNjdjNjEzNWJkNmZkZGYw NzU4ZTk2N2M1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNjIgQEAKKzIwMTEtMDUtMTggIFNoZXJp ZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgorCisgICAgICAgIFVucmV2aWV3 ZWQsIHJvbGxpbmcgb3V0IHI4Njc0Ny4KKyAgICAgICAgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9j aGFuZ2VzZXQvODY3NDcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTYxMDM5CisKKyAgICAgICAgQnJlYWtzIEpTQyBkZWJ1Z2dlciB0ZXN0cy4gKFJlcXVl c3RlZCBieSBwZmVsZG1hbiBvbiAjd2Via2l0KS4KKworICAgICAgICAqIGluc3BlY3Rvci9Jbmpl Y3RlZFNjcmlwdFNvdXJjZS5qczoKKyAgICAgICAgKCk6CisgICAgICAgICogaW5zcGVjdG9yL0lu c3BlY3Rvci5qc29uOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JDb25zb2xlQWdlbnQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29uc29sZUFnZW50OjphZGRNZXNzYWdl VG9Db25zb2xlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29uc29sZUFnZW50Lmg6 CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVJbnN0cnVtZW50YXRpb24uaDoK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6YWRkTWVzc2FnZVRv Q29uc29sZSk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6cGFyc2VMb2NhdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpJ bnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpyZXNvbHZlQnJlYWtwb2ludCk6CisgICAgICAgIChXZWJD b3JlOjpJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjplZGl0U2NyaXB0U291cmNlKToKKyAgICAgICAg KFdlYkNvcmU6Okluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmdldFNjcmlwdFNvdXJjZSk6CisgICAg ICAgIChXZWJDb3JlOjpJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpkaWRQYXJzZVNvdXJjZSk6Cisg ICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaDoKKyAgICAgICAgKiBp bnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Okluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6YWRkTWVzc2FnZVRvQ29uc29sZUltcGwpOgorICAg ICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaDoKKyAgICAgICAgKiBp bnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpi dWlsZE9iamVjdEZvclJlc291cmNlUmVzcG9uc2UpOgorICAgICAgICAqIGluc3BlY3Rvci9TY3Jp cHREZWJ1Z0xpc3RlbmVyLmg6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dl ck1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwucHJvdG90eXBl LnNjcmlwdEZvclNvdXJjZUlEKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVs LnByb3RvdHlwZS5xdWVyeVNjcmlwdHMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2Vy TW9kZWwucHJvdG90eXBlLmVkaXRTY3JpcHRTb3VyY2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkRlYnVnZ2VyTW9kZWwucHJvdG90eXBlLl9kaWRFZGl0U2NyaXB0U291cmNlKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLnByb3RvdHlwZS5fcGFyc2VkU2NyaXB0U291cmNl KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlckRpc3BhdGNoZXIucHJvdG90eXBlLnNj cmlwdFBhcnNlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJEaXNwYXRjaGVyLnBy b3RvdHlwZS5icmVha3BvaW50UmVzb2x2ZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5E ZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZS5lZGl0U2NyaXB0U291cmNlLmRpZFJl Y2VpdmVTb3VyY2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9u TW9kZWwucHJvdG90eXBlLmVkaXRTY3JpcHRTb3VyY2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLl9zZXRCcmVha3BvaW50SW5EZWJ1 Z2dlci5kaWRSZXF1ZXN0U291cmNlTWFwcGluZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVi dWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuX3NldEJyZWFrcG9pbnRJbkRlYnVnZ2Vy KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3Rv dHlwZS5fZGVidWdnZXJQYXVzZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJl c2VudGF0aW9uTW9kZWwucHJvdG90eXBlLl9zb3VyY2VGaWxlRm9yU2NyaXB0KToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZS5fc2NyaXB0 Rm9yU291cmNlRmlsZUlkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRh dGlvbk1vZGVsLnByb3RvdHlwZS5fY3JlYXRlU291cmNlRmlsZUlkKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5QcmVzZW5hdGlvbkNhbGxGcmFtZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9OZXR3b3JrTWFuYWdlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrRGlz cGF0Y2hlci5wcm90b3R5cGUuX3VwZGF0ZVJlc291cmNlV2l0aFJlc3BvbnNlKToKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T Y3JpcHQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdC5wcm90b3R5cGUucmVxdWVzdFNv dXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0LnByb3RvdHlwZS5lZGl0U291cmNl KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZpbGUuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU291cmNlRmlsZS5wcm90b3R5cGUuZm9yY2VMb2FkQ29udGVudCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRmlsZS5wcm90b3R5cGUuX2NvbmNhdGVuYXRlU2Ny aXB0c0NvbnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZU1hcHBpbmcucHJvdG90 eXBlLl9zb3VyY2VMb2NhdGlvblRvU2NyaXB0TG9jYXRpb24pOgorICAgICAgICAoV2ViSW5zcGVj dG9yKToKKwogMjAxMS0wNS0xOCAgQWJoaXNoZWsgQXJ5YSAgPGluZmVybm9AY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFJldmlld2VkIGJ5IERpcmsgU2NodWx6ZS4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJjZS5qcyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJjZS5qcwppbmRleCBmODc3OTJkNGE3ZDJl Mjg1ZGE0YzQwMDEzNDcyMzk0YzQ2YjgwZTVkLi44NWUxNDdjZWY4ZDQzYjRjZmYyM2Y1NjI0MzMw ODAxYjdkZTY5NmFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0 ZWRTY3JpcHRTb3VyY2UuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVk U2NyaXB0U291cmNlLmpzCkBAIC00NTQsNyArNDU0LDcgQEAgSW5qZWN0ZWRTY3JpcHQuQ2FsbEZy YW1lUHJveHkgPSBmdW5jdGlvbihvcmRpbmFsLCBjYWxsRnJhbWUpCiB7CiAgICAgdGhpcy5pZCA9 ICJ7XCJvcmRpbmFsXCI6IiArIG9yZGluYWwgKyAiLFwiaW5qZWN0ZWRTY3JpcHRJZFwiOiIgKyBp bmplY3RlZFNjcmlwdElkICsgIn0iOwogICAgIHRoaXMuZnVuY3Rpb25OYW1lID0gKGNhbGxGcmFt ZS50eXBlID09PSAiZnVuY3Rpb24iID8gY2FsbEZyYW1lLmZ1bmN0aW9uTmFtZSA6ICIiKTsKLSAg ICB0aGlzLmxvY2F0aW9uID0geyBzb3VyY2VJZDogU3RyaW5nKGNhbGxGcmFtZS5zb3VyY2VJRCks IGxpbmVOdW1iZXI6IGNhbGxGcmFtZS5saW5lLCBjb2x1bW5OdW1iZXI6IGNhbGxGcmFtZS5jb2x1 bW4gfTsKKyAgICB0aGlzLmxvY2F0aW9uID0geyBzb3VyY2VJRDogU3RyaW5nKGNhbGxGcmFtZS5z b3VyY2VJRCksIGxpbmVOdW1iZXI6IGNhbGxGcmFtZS5saW5lLCBjb2x1bW5OdW1iZXI6IGNhbGxG cmFtZS5jb2x1bW4gfTsKICAgICB0aGlzLnNjb3BlQ2hhaW4gPSB0aGlzLl93cmFwU2NvcGVDaGFp bihjYWxsRnJhbWUpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yLmpzb24gYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24K aW5kZXggY2JhYzU1ZmI4YmFmYjZmYmQ1NjQxNjA4NmIwYTBlYjcwZWUxYjY2Yy4uOGU1MWU5Nzk3 NDlhOTcwNWQyZWFlMGE5ZDJjNDEzODM5MzQwY2ZjZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3IuanNvbgpAQCAtNDMyLDcgKzQzMiw3IEBACiAgICAgICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAicmVxdWVzdEhlYWRlcnMiLCAidHlwZSI6ICJvYmplY3QiLCAib3B0aW9uYWwi OiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiUmVmaW5lZCBIVFRQIHJlcXVlc3QgaGVhZGVycyB0aGF0 IHdlcmUgYWN0dWFsbHkgdHJhbnNtaXR0ZWQgb3ZlciB0aGUgbmV0d29yay4iIH0sCiAgICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAicmVxdWVzdEhlYWRlcnNUZXh0IiwgInR5cGUiOiAic3Ry aW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIkhUVFAgcmVxdWVzdCBoZWFk ZXJzIHRleHQuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImNvbm5lY3Rpb25S ZXVzZWQiLCAidHlwZSI6ICJib29sZWFuIiwgImRlc2NyaXB0aW9uIjogIlNwZWNpZmllcyB3aGV0 aGVyIHBoeXNpY2FsIGNvbm5lY3Rpb24gd2FzIGFjdHVhbGx5IHJldXNlZCBmb3IgdGhpcyByZXF1 ZXN0LiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJjb25uZWN0aW9uSWQiLCAi dHlwZSI6ICJudW1iZXIiLCAiZGVzY3JpcHRpb24iOiAiUGh5c2ljYWwgY29ubmVjdGlvbiBpZCB0 aGF0IHdhcyBhY3R1YWxseSB1c2VkIGZvciB0aGlzIHJlcXVlc3QuIiB9LAorICAgICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogImNvbm5lY3Rpb25JRCIsICJ0eXBlIjogIm51bWJlciIsICJkZXNj cmlwdGlvbiI6ICJQaHlzaWNhbCBjb25uZWN0aW9uIGlkIHRoYXQgd2FzIGFjdHVhbGx5IHVzZWQg Zm9yIHRoaXMgcmVxdWVzdC4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZnJv bURpc2tDYWNoZSIsICJ0eXBlIjogImJvb2xlYW4iLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3Jp cHRpb24iOiAiU3BlY2lmaWVzIHRoYXQgdGhlIHJlc291cmNlIHdhcyBsb2FkZWQgZnJvbSB0aGUg ZGlzayBjYWNoZS4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidGltaW5nIiwg IiRyZWYiOiAiUmVzb3VyY2VUaW1pbmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24i OiAiVGltaW5nIGluZm9ybWF0aW9uIGZvciB0aGUgZ2l2ZW4gcmVxdWVzdC4iIH0KICAgICAgICAg ICAgICAgICBdCkBAIC0xMzQxLDcgKzEzNDEsNyBAQAogICAgICAgICAgICAgICAgICJpZCI6ICJM b2NhdGlvbiIsCiAgICAgICAgICAgICAgICAgInR5cGUiOiAib2JqZWN0IiwKICAgICAgICAgICAg ICAgICAicHJvcGVydGllcyI6IFsKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzb3Vy Y2VJZCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJTY3JpcHQgaWRlbnRpZmll ciBhcyByZXBvcnRlZCBieSB0aGUgPGNvZGU+c2NyaXB0UGFyc2VkPC9jb2RlPiIgfSwKKyAgICAg ICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzb3VyY2VJRCIsICJ0eXBlIjogInN0cmluZyIsICJk ZXNjcmlwdGlvbiI6ICJTY3JpcHQgaWRlbnRpZmllciBhcyByZXBvcnRlZCBieSB0aGUgPGNvZGU+ c2NyaXB0UGFyc2VkPC9jb2RlPiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJs aW5lTnVtYmVyIiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJMaW5lIG51bWJl ciBpbiB0aGUgc2NyaXB0LiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJjb2x1 bW5OdW1iZXIiLCAidHlwZSI6ICJpbnRlZ2VyIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0 aW9uIjogIkNvbHVtbiBudW1iZXIgaW4gdGhlIHNjcmlwdC4iIH0KICAgICAgICAgICAgICAgICBd LApAQCAtMTQ0OCw3ICsxNDQ4LDcgQEAKICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAi bmFtZSI6ICJlZGl0U2NyaXB0U291cmNlIiwKICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6 IFsKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzb3VyY2VJZCIsICJ0eXBlIjogInN0 cmluZyIsICJkZXNjcmlwdGlvbiI6ICJJZCBvZiB0aGUgc2NyaXB0IHRvIGVkaXQuIiB9LAorICAg ICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInNvdXJjZUlEIiwgInR5cGUiOiAic3RyaW5nIiwg ImRlc2NyaXB0aW9uIjogIklkIG9mIHRoZSBzY3JpcHQgdG8gZWRpdC4iIH0sCiAgICAgICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAic2NyaXB0U291cmNlIiwgInR5cGUiOiAic3RyaW5nIiwgImRl c2NyaXB0aW9uIjogIk5ldyBjb250ZW50IG9mIHRoZSBzY3JpcHQuIiB9CiAgICAgICAgICAgICAg ICAgXSwKICAgICAgICAgICAgICAgICAicmV0dXJucyI6IFsKQEAgLTE0NTksNyArMTQ1OSw3IEBA CiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAiZ2V0U2NyaXB0U291cmNl IiwKICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKLSAgICAgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJzb3VyY2VJZCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJJ ZCBvZiB0aGUgc2NyaXB0IHRvIGdldCBzb3VyY2UgZm9yLiIgfQorICAgICAgICAgICAgICAgICAg ICB7ICJuYW1lIjogInNvdXJjZUlEIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjog IklkIG9mIHRoZSBzY3JpcHQgdG8gZ2V0IHNvdXJjZSBmb3IuIiB9CiAgICAgICAgICAgICAgICAg XSwKICAgICAgICAgICAgICAgICAicmV0dXJucyI6IFsKICAgICAgICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJzY3JpcHRTb3VyY2UiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAi U2NyaXB0IHNvdXJjZS4iIH0KQEAgLTE1MDAsNyArMTUwMCw3IEBACiAgICAgICAgICAgICB7CiAg ICAgICAgICAgICAgICAgIm5hbWUiOiAic2NyaXB0UGFyc2VkIiwKICAgICAgICAgICAgICAgICAi cGFyYW1ldGVycyI6IFsKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzb3VyY2VJZCIs ICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJJZGVudGlmaWVyIG9mIHRoZSBzY3Jp cHQgcGFyc2VkLiIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzb3VyY2VJRCIs ICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJJZGVudGlmaWVyIG9mIHRoZSBzY3Jp cHQgcGFyc2VkLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ1cmwiLCAidHlw ZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiVVJMIG9mIHRoZSBzY3JpcHQgcGFyc2VkIChp ZiBhbnkpLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzdGFydExpbmUiLCAi dHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIkxpbmUgb2Zmc2V0IG9mIHRoZSBzY3Jp cHQgd2l0aGluIHRoZSByZXNvdXJjZSB3aXRoIGdpdmVuIFVSTCAoZm9yIHNjcmlwdCB0YWdzKS4i IH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic3RhcnRDb2x1bW4iLCAidHlwZSI6 ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIkNvbHVtbiBvZmZzZXQgb2YgdGhlIHNjcmlwdCB3 aXRoaW4gdGhlIHJlc291cmNlIHdpdGggZ2l2ZW4gVVJMLiIgfSwKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb25zb2xlQWdlbnQuY3BwIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVBZ2VudC5jcHAKaW5kZXggNzM4Mjk1ZDA2 OTg4ZDIxZTg2NmU1NDM2YjdkYzVmYmZlNmM2M2YzYy4uMGMyNWU4MTgxN2ViYTZlM2MzZDE4ODc4 Mzk1MDYzYWE2NzBlZDA1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckNvbnNvbGVBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckNvbnNvbGVBZ2VudC5jcHAKQEAgLTEzMSwxMSArMTMxLDExIEBAIHZvaWQgSW5zcGVj dG9yQ29uc29sZUFnZW50OjphZGRNZXNzYWdlVG9Db25zb2xlKE1lc3NhZ2VTb3VyY2Ugc291cmNl LCBNZXNzYWdlVHlwCiAgICAgYWRkQ29uc29sZU1lc3NhZ2UoYWRvcHRQdHIobmV3IENvbnNvbGVN ZXNzYWdlKHNvdXJjZSwgdHlwZSwgbGV2ZWwsIG1lc3NhZ2UsIGFyZ3VtZW50cywgY2FsbFN0YWNr KSkpOwogfQogCi12b2lkIEluc3BlY3RvckNvbnNvbGVBZ2VudDo6YWRkTWVzc2FnZVRvQ29uc29s ZShNZXNzYWdlU291cmNlIHNvdXJjZSwgTWVzc2FnZVR5cGUgdHlwZSwgTWVzc2FnZUxldmVsIGxl dmVsLCBjb25zdCBTdHJpbmcmIG1lc3NhZ2UsIHVuc2lnbmVkIGxpbmVOdW1iZXIsIGNvbnN0IFN0 cmluZyYgc291cmNlSWQpCit2b2lkIEluc3BlY3RvckNvbnNvbGVBZ2VudDo6YWRkTWVzc2FnZVRv Q29uc29sZShNZXNzYWdlU291cmNlIHNvdXJjZSwgTWVzc2FnZVR5cGUgdHlwZSwgTWVzc2FnZUxl dmVsIGxldmVsLCBjb25zdCBTdHJpbmcmIG1lc3NhZ2UsIHVuc2lnbmVkIGxpbmVOdW1iZXIsIGNv bnN0IFN0cmluZyYgc291cmNlSUQpCiB7CiAgICAgaWYgKCFtX2luc3BlY3RvckFnZW50LT5lbmFi bGVkKCkpCiAgICAgICAgIHJldHVybjsKLSAgICBhZGRDb25zb2xlTWVzc2FnZShhZG9wdFB0cihu ZXcgQ29uc29sZU1lc3NhZ2Uoc291cmNlLCB0eXBlLCBsZXZlbCwgbWVzc2FnZSwgbGluZU51bWJl ciwgc291cmNlSWQpKSk7CisgICAgYWRkQ29uc29sZU1lc3NhZ2UoYWRvcHRQdHIobmV3IENvbnNv bGVNZXNzYWdlKHNvdXJjZSwgdHlwZSwgbGV2ZWwsIG1lc3NhZ2UsIGxpbmVOdW1iZXIsIHNvdXJj ZUlEKSkpOwogfQogCiB2b2lkIEluc3BlY3RvckNvbnNvbGVBZ2VudDo6c3RhcnRUaW1pbmcoY29u c3QgU3RyaW5nJiB0aXRsZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JDb25zb2xlQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JDb25zb2xlQWdlbnQuaAppbmRleCAwMDlmMWEyZTYwZmViMWY1Y2ZiZDE4NTZmODQyMTZiMWFl YzVlNGYxLi41NTczNGRiNzU3YzBiODQ2ZWFkOTFmYmIxYjE3NThiODg0YTM2N2Y0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29uc29sZUFnZW50LmgKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVBZ2VudC5oCkBAIC02 Niw3ICs2Niw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGNsZWFyRnJvbnRlbmQoKTsKIAogICAgIHZv aWQgYWRkTWVzc2FnZVRvQ29uc29sZShNZXNzYWdlU291cmNlLCBNZXNzYWdlVHlwZSwgTWVzc2Fn ZUxldmVsLCBjb25zdCBTdHJpbmcmIG1lc3NhZ2UsIFBhc3NSZWZQdHI8U2NyaXB0QXJndW1lbnRz PiwgUGFzc1JlZlB0cjxTY3JpcHRDYWxsU3RhY2s+KTsKLSAgICB2b2lkIGFkZE1lc3NhZ2VUb0Nv bnNvbGUoTWVzc2FnZVNvdXJjZSwgTWVzc2FnZVR5cGUsIE1lc3NhZ2VMZXZlbCwgY29uc3QgU3Ry aW5nJiBtZXNzYWdlLCB1bnNpZ25lZCBsaW5lTnVtYmVyLCBjb25zdCBTdHJpbmcmIHNvdXJjZUlk KTsKKyAgICB2b2lkIGFkZE1lc3NhZ2VUb0NvbnNvbGUoTWVzc2FnZVNvdXJjZSwgTWVzc2FnZVR5 cGUsIE1lc3NhZ2VMZXZlbCwgY29uc3QgU3RyaW5nJiBtZXNzYWdlLCB1bnNpZ25lZCBsaW5lTnVt YmVyLCBjb25zdCBTdHJpbmcmIHNvdXJjZUlEKTsKIAogICAgIHZvaWQgc3RhcnRUaW1pbmcoY29u c3QgU3RyaW5nJiB0aXRsZSk7CiAgICAgdm9pZCBzdG9wVGltaW5nKGNvbnN0IFN0cmluZyYgdGl0 bGUsIFBhc3NSZWZQdHI8U2NyaXB0Q2FsbFN0YWNrPik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29uc29sZUluc3RydW1lbnRhdGlvbi5oIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVJbnN0cnVtZW50YXRpb24uaAppbmRl eCBkNDVlOWU0Njk3MDE1ZmFjOGYyMjJhN2IyOTBhY2FkZGEzYmEyMWM1Li4xZTYwMTllZmYxZjU2 Mjc3ZmYxM2YzODk3OTQxNmIxYzE5NzE2NDk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yQ29uc29sZUluc3RydW1lbnRhdGlvbi5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb25zb2xlSW5zdHJ1bWVudGF0aW9uLmgKQEAgLTQ2 LDExICs0NiwxMSBAQCBpbmxpbmUgdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmFkZE1l c3NhZ2VUb0NvbnNvbGUoUGFnZSogcGFnZSwgTWVzc2FnZVNvdQogI2VuZGlmCiB9CiAKLWlubGlu ZSB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6YWRkTWVzc2FnZVRvQ29uc29sZShQYWdl KiBwYWdlLCBNZXNzYWdlU291cmNlIHNvdXJjZSwgTWVzc2FnZVR5cGUgdHlwZSwgTWVzc2FnZUxl dmVsIGxldmVsLCBjb25zdCBTdHJpbmcmIG1lc3NhZ2UsIHVuc2lnbmVkIGxpbmVOdW1iZXIsIGNv bnN0IFN0cmluZyYgc291cmNlSWQpCitpbmxpbmUgdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRp b246OmFkZE1lc3NhZ2VUb0NvbnNvbGUoUGFnZSogcGFnZSwgTWVzc2FnZVNvdXJjZSBzb3VyY2Us IE1lc3NhZ2VUeXBlIHR5cGUsIE1lc3NhZ2VMZXZlbCBsZXZlbCwgY29uc3QgU3RyaW5nJiBtZXNz YWdlLCB1bnNpZ25lZCBsaW5lTnVtYmVyLCBjb25zdCBTdHJpbmcmIHNvdXJjZUlEKQogewogI2lm IEVOQUJMRShJTlNQRUNUT1IpCiAgICAgaWYgKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1l bnRpbmdBZ2VudHMgPSBpbnN0cnVtZW50aW5nQWdlbnRzRm9yUGFnZShwYWdlKSkKLSAgICAgICAg YWRkTWVzc2FnZVRvQ29uc29sZUltcGwoaW5zdHJ1bWVudGluZ0FnZW50cywgc291cmNlLCB0eXBl LCBsZXZlbCwgbWVzc2FnZSwgbGluZU51bWJlciwgc291cmNlSWQpOworICAgICAgICBhZGRNZXNz YWdlVG9Db25zb2xlSW1wbChpbnN0cnVtZW50aW5nQWdlbnRzLCBzb3VyY2UsIHR5cGUsIGxldmVs LCBtZXNzYWdlLCBsaW5lTnVtYmVyLCBzb3VyY2VJRCk7CiAjZW5kaWYKIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwCmluZGV4 IDUyNGIxMGE3YjY0Njc3YTczZmU4OGVhNTJlZmZmYTZkNDUxZGQ0OWIuLjAwYTY2ODQ0NzdkOTIx NzI4YzNhODM0YjVmNTA4Nzg1ODQ4YjFmYzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAKQEAgLTE5Myw3ICsxOTMsNyBAQCB2 b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OnNldEJyZWFrcG9pbnRCeVVybChFcnJvclN0cmlu ZyosIGNvbnN0IFN0cmluZyYgdXJsLAogCiBzdGF0aWMgYm9vbCBwYXJzZUxvY2F0aW9uKEVycm9y U3RyaW5nKiBlcnJvclN0cmluZywgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gbG9jYXRpb24sIFN0 cmluZyogc291cmNlSWQsIGludCogbGluZU51bWJlciwgaW50KiBjb2x1bW5OdW1iZXIpCiB7Ci0g ICAgaWYgKCFsb2NhdGlvbi0+Z2V0U3RyaW5nKCJzb3VyY2VJZCIsIHNvdXJjZUlkKSB8fCAhbG9j YXRpb24tPmdldE51bWJlcigibGluZU51bWJlciIsIGxpbmVOdW1iZXIpKSB7CisgICAgaWYgKCFs b2NhdGlvbi0+Z2V0U3RyaW5nKCJzb3VyY2VJRCIsIHNvdXJjZUlkKSB8fCAhbG9jYXRpb24tPmdl dE51bWJlcigibGluZU51bWJlciIsIGxpbmVOdW1iZXIpKSB7CiAgICAgICAgIC8vIEZJWE1FOiBy ZXBsYWNlIHdpdGggaW5wdXQgdmFsaWRhdGlvbi4KICAgICAgICAgKmVycm9yU3RyaW5nID0gInNv dXJjZUlkIGFuZCBsaW5lTnVtYmVyIGFyZSByZXF1aXJlZC4iOwogICAgICAgICByZXR1cm4gZmFs c2U7CkBAIC0yNzksMjEgKzI3OSwyMSBAQCBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gSW5z cGVjdG9yRGVidWdnZXJBZ2VudDo6cmVzb2x2ZUJyZWFrcG9pbnQoY29uc3QgU3RyaQogICAgIGRl YnVnU2VydmVyQnJlYWtwb2ludElkc0l0ZXJhdG9yLT5zZWNvbmQuYXBwZW5kKGRlYnVnU2VydmVy QnJlYWtwb2ludElkKTsKIAogICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGxvY2F0aW9uID0g SW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUoKTsKLSAgICBsb2NhdGlvbi0+c2V0U3RyaW5nKCJzb3Vy Y2VJZCIsIHNvdXJjZUlkKTsKKyAgICBsb2NhdGlvbi0+c2V0U3RyaW5nKCJzb3VyY2VJRCIsIHNv dXJjZUlkKTsKICAgICBsb2NhdGlvbi0+c2V0TnVtYmVyKCJsaW5lTnVtYmVyIiwgYWN0dWFsTGlu ZU51bWJlcik7CiAgICAgbG9jYXRpb24tPnNldE51bWJlcigiY29sdW1uTnVtYmVyIiwgYWN0dWFs Q29sdW1uTnVtYmVyKTsKICAgICByZXR1cm4gbG9jYXRpb247CiB9CiAKLXZvaWQgSW5zcGVjdG9y RGVidWdnZXJBZ2VudDo6ZWRpdFNjcmlwdFNvdXJjZShFcnJvclN0cmluZyogZXJyb3IsIGNvbnN0 IFN0cmluZyYgc291cmNlSWQsIGNvbnN0IFN0cmluZyYgbmV3Q29udGVudCwgUmVmUHRyPEluc3Bl Y3RvckFycmF5PiogbmV3Q2FsbEZyYW1lcykKK3ZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6 ZWRpdFNjcmlwdFNvdXJjZShFcnJvclN0cmluZyogZXJyb3IsIGNvbnN0IFN0cmluZyYgc291cmNl SUQsIGNvbnN0IFN0cmluZyYgbmV3Q29udGVudCwgUmVmUHRyPEluc3BlY3RvckFycmF5PiogbmV3 Q2FsbEZyYW1lcykKIHsKLSAgICBpZiAoc2NyaXB0RGVidWdTZXJ2ZXIoKS5lZGl0U2NyaXB0U291 cmNlKHNvdXJjZUlkLCBuZXdDb250ZW50LCBlcnJvciwgJm1fY3VycmVudENhbGxTdGFjaykpCisg ICAgaWYgKHNjcmlwdERlYnVnU2VydmVyKCkuZWRpdFNjcmlwdFNvdXJjZShzb3VyY2VJRCwgbmV3 Q29udGVudCwgZXJyb3IsICZtX2N1cnJlbnRDYWxsU3RhY2spKQogICAgICAgICAqbmV3Q2FsbEZy YW1lcyA9IGN1cnJlbnRDYWxsRnJhbWVzKCk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yRGVidWdnZXJB Z2VudDo6Z2V0U2NyaXB0U291cmNlKEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiBzb3VyY2VJ ZCwgU3RyaW5nKiBzY3JpcHRTb3VyY2UpCit2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6Omdl dFNjcmlwdFNvdXJjZShFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgc291cmNlSUQsIFN0cmlu Zyogc2NyaXB0U291cmNlKQogewotICAgICpzY3JpcHRTb3VyY2UgPSBtX3NjcmlwdHMuZ2V0KHNv dXJjZUlkKS5kYXRhOworICAgICpzY3JpcHRTb3VyY2UgPSBtX3NjcmlwdHMuZ2V0KHNvdXJjZUlE KS5kYXRhOwogfQogCiB2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OnNjaGVkdWxlUGF1c2VP bk5leHRTdGF0ZW1lbnQoRGVidWdnZXJFdmVudFR5cGUgdHlwZSwgUGFzc1JlZlB0cjxJbnNwZWN0 b3JWYWx1ZT4gZGF0YSkKQEAgLTM4MywxMiArMzgzLDEyIEBAIFBhc3NSZWZQdHI8SW5zcGVjdG9y QXJyYXk+IEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmN1cnJlbnRDYWxsRnJhbWVzKCkKIAogLy8g SmF2YVNjcmlwdERlYnVnTGlzdGVuZXIgZnVuY3Rpb25zCiAKLXZvaWQgSW5zcGVjdG9yRGVidWdn ZXJBZ2VudDo6ZGlkUGFyc2VTb3VyY2UoY29uc3QgU3RyaW5nJiBzb3VyY2VJZCwgY29uc3QgU3Ry aW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgZGF0YSwgaW50IHN0YXJ0TGluZSwgaW50IHN0YXJ0Q29s dW1uLCBpbnQgZW5kTGluZSwgaW50IGVuZENvbHVtbiwgYm9vbCBpc0NvbnRlbnRTY3JpcHQpCit2 b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmRpZFBhcnNlU291cmNlKGNvbnN0IFN0cmluZyYg c291cmNlSUQsIGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIGRhdGEsIGludCBzdGFy dExpbmUsIGludCBzdGFydENvbHVtbiwgaW50IGVuZExpbmUsIGludCBlbmRDb2x1bW4sIGJvb2wg aXNDb250ZW50U2NyaXB0KQogewogICAgIC8vIERvbid0IHNlbmQgc2NyaXB0IGNvbnRlbnQgdG8g dGhlIGZyb250IGVuZCB1bnRpbCBpdCdzIHJlYWxseSBuZWVkZWQuCi0gICAgbV9mcm9udGVuZC0+ c2NyaXB0UGFyc2VkKHNvdXJjZUlkLCB1cmwsIHN0YXJ0TGluZSwgc3RhcnRDb2x1bW4sIGVuZExp bmUsIGVuZENvbHVtbiwgaXNDb250ZW50U2NyaXB0KTsKKyAgICBtX2Zyb250ZW5kLT5zY3JpcHRQ YXJzZWQoc291cmNlSUQsIHVybCwgc3RhcnRMaW5lLCBzdGFydENvbHVtbiwgZW5kTGluZSwgZW5k Q29sdW1uLCBpc0NvbnRlbnRTY3JpcHQpOwogCi0gICAgbV9zY3JpcHRzLnNldChzb3VyY2VJZCwg U2NyaXB0KHVybCwgZGF0YSwgc3RhcnRMaW5lLCBzdGFydENvbHVtbiwgZW5kTGluZSwgZW5kQ29s dW1uKSk7CisgICAgbV9zY3JpcHRzLnNldChzb3VyY2VJRCwgU2NyaXB0KHVybCwgZGF0YSwgc3Rh cnRMaW5lLCBzdGFydENvbHVtbiwgZW5kTGluZSwgZW5kQ29sdW1uKSk7CiAKICAgICBpZiAodXJs LmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwpAQCAtNDA0LDcgKzQwNCw3IEBAIHZvaWQgSW5z cGVjdG9yRGVidWdnZXJBZ2VudDo6ZGlkUGFyc2VTb3VyY2UoY29uc3QgU3RyaW5nJiBzb3VyY2VJ ZCwgY29uc3QgU3RyaW5nCiAgICAgICAgIGJyZWFrcG9pbnRPYmplY3QtPmdldE51bWJlcigibGlu ZU51bWJlciIsICZicmVha3BvaW50LmxpbmVOdW1iZXIpOwogICAgICAgICBicmVha3BvaW50T2Jq ZWN0LT5nZXROdW1iZXIoImNvbHVtbk51bWJlciIsICZicmVha3BvaW50LmNvbHVtbk51bWJlcik7 CiAgICAgICAgIGJyZWFrcG9pbnRPYmplY3QtPmdldFN0cmluZygiY29uZGl0aW9uIiwgJmJyZWFr cG9pbnQuY29uZGl0aW9uKTsKLSAgICAgICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gbG9jYXRp b24gPSByZXNvbHZlQnJlYWtwb2ludChpdC0+Zmlyc3QsIHNvdXJjZUlkLCBicmVha3BvaW50KTsK KyAgICAgICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gbG9jYXRpb24gPSByZXNvbHZlQnJlYWtw b2ludChpdC0+Zmlyc3QsIHNvdXJjZUlELCBicmVha3BvaW50KTsKICAgICAgICAgaWYgKGxvY2F0 aW9uKQogICAgICAgICAgICAgbV9mcm9udGVuZC0+YnJlYWtwb2ludFJlc29sdmVkKGl0LT5maXJz dCwgbG9jYXRpb24pOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yRGVidWdnZXJBZ2VudC5oCmluZGV4IDNkNWUwOGRmNmQzMTQ4N2IwNmYzODk3MDY2NmIw OGY1YmVkZThlMTAuLjE4ZTA5NzQwZGQ0ZjdiNjMwODNlOWZjOWE5YTI4N2NlOWY1YjE1ODkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQu aApAQCAtODUsOCArODUsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCByZW1vdmVCcmVha3BvaW50KEVy cm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiBicmVha3BvaW50SWQpOwogICAgIHZvaWQgY29udGlu dWVUb0xvY2F0aW9uKEVycm9yU3RyaW5nKiwgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGxv Y2F0aW9uKTsKIAotICAgIHZvaWQgZWRpdFNjcmlwdFNvdXJjZShFcnJvclN0cmluZyosIGNvbnN0 IFN0cmluZyYgc291cmNlSWQsIGNvbnN0IFN0cmluZyYgbmV3Q29udGVudCwgUmVmUHRyPEluc3Bl Y3RvckFycmF5PiogbmV3Q2FsbEZyYW1lcyk7Ci0gICAgdm9pZCBnZXRTY3JpcHRTb3VyY2UoRXJy b3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHNvdXJjZUlkLCBTdHJpbmcqIHNjcmlwdFNvdXJjZSk7 CisgICAgdm9pZCBlZGl0U2NyaXB0U291cmNlKEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiBz b3VyY2VJRCwgY29uc3QgU3RyaW5nJiBuZXdDb250ZW50LCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+ KiBuZXdDYWxsRnJhbWVzKTsKKyAgICB2b2lkIGdldFNjcmlwdFNvdXJjZShFcnJvclN0cmluZyos IGNvbnN0IFN0cmluZyYgc291cmNlSUQsIFN0cmluZyogc2NyaXB0U291cmNlKTsKICAgICB2b2lk IHNjaGVkdWxlUGF1c2VPbk5leHRTdGF0ZW1lbnQoRGVidWdnZXJFdmVudFR5cGUgdHlwZSwgUGFz c1JlZlB0cjxJbnNwZWN0b3JWYWx1ZT4gZGF0YSk7CiAgICAgdm9pZCBjYW5jZWxQYXVzZU9uTmV4 dFN0YXRlbWVudCgpOwogICAgIHZvaWQgYnJlYWtQcm9ncmFtKERlYnVnZ2VyRXZlbnRUeXBlIHR5 cGUsIFBhc3NSZWZQdHI8SW5zcGVjdG9yVmFsdWU+IGRhdGEpOwpAQCAtMTIwLDcgKzEyMCw3IEBA IHByaXZhdGU6CiAKICAgICBQYXNzUmVmUHRyPEluc3BlY3RvckFycmF5PiBjdXJyZW50Q2FsbEZy YW1lcygpOwogCi0gICAgdmlydHVhbCB2b2lkIGRpZFBhcnNlU291cmNlKGNvbnN0IFN0cmluZyYg c291cmNlSWQsIGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIGRhdGEsIGludCBzdGFy dExpbmUsIGludCBzdGFydENvbHVtbiwgaW50IGVuZExpbmUsIGludCBlbmRDb2x1bW4sIGJvb2wg aXNDb250ZW50U2NyaXB0KTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkUGFyc2VTb3VyY2UoY29uc3Qg U3RyaW5nJiBzb3VyY2VJRCwgY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgZGF0YSwg aW50IHN0YXJ0TGluZSwgaW50IHN0YXJ0Q29sdW1uLCBpbnQgZW5kTGluZSwgaW50IGVuZENvbHVt biwgYm9vbCBpc0NvbnRlbnRTY3JpcHQpOwogICAgIHZpcnR1YWwgdm9pZCBmYWlsZWRUb1BhcnNl U291cmNlKGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIGRhdGEsIGludCBmaXJzdExp bmUsIGludCBlcnJvckxpbmUsIGNvbnN0IFN0cmluZyYgZXJyb3JNZXNzYWdlKTsKICAgICB2aXJ0 dWFsIHZvaWQgZGlkUGF1c2UoU2NyaXB0U3RhdGUqLCBjb25zdCBTY3JpcHRWYWx1ZSYgY2FsbEZy YW1lcywgY29uc3QgU2NyaXB0VmFsdWUmIGV4Y2VwdGlvbik7CiAgICAgdmlydHVhbCB2b2lkIGRp ZENvbnRpbnVlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9ySW5zdHJ1bWVudGF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JJbnN0cnVtZW50YXRpb24uY3BwCmluZGV4IDk1OThlYWFkNzhhZjI4YTNkZTY4YTczZDVmMjhk OTEzNzk5NGUyYTEuLmQ1YjBiZTEzODBkYjA1NTZmYzM5YmUwMzhjOWNjMzNiMGM1MzVlY2YgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRp b24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50 YXRpb24uY3BwCkBAIC02MzIsMTAgKzYzMiwxMCBAQCB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRh dGlvbjo6YWRkTWVzc2FnZVRvQ29uc29sZUltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyogaW5zdAog ICAgICAgICBjb25zb2xlQWdlbnQtPmFkZE1lc3NhZ2VUb0NvbnNvbGUoc291cmNlLCB0eXBlLCBs ZXZlbCwgbWVzc2FnZSwgYXJndW1lbnRzLCBjYWxsU3RhY2spOwogfQogCi12b2lkIEluc3BlY3Rv ckluc3RydW1lbnRhdGlvbjo6YWRkTWVzc2FnZVRvQ29uc29sZUltcGwoSW5zdHJ1bWVudGluZ0Fn ZW50cyogaW5zdHJ1bWVudGluZ0FnZW50cywgTWVzc2FnZVNvdXJjZSBzb3VyY2UsIE1lc3NhZ2VU eXBlIHR5cGUsIE1lc3NhZ2VMZXZlbCBsZXZlbCwgY29uc3QgU3RyaW5nJiBtZXNzYWdlLCB1bnNp Z25lZCBsaW5lTnVtYmVyLCBjb25zdCBTdHJpbmcmIHNvdXJjZUlkKQordm9pZCBJbnNwZWN0b3JJ bnN0cnVtZW50YXRpb246OmFkZE1lc3NhZ2VUb0NvbnNvbGVJbXBsKEluc3RydW1lbnRpbmdBZ2Vu dHMqIGluc3RydW1lbnRpbmdBZ2VudHMsIE1lc3NhZ2VTb3VyY2Ugc291cmNlLCBNZXNzYWdlVHlw ZSB0eXBlLCBNZXNzYWdlTGV2ZWwgbGV2ZWwsIGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgdW5zaWdu ZWQgbGluZU51bWJlciwgY29uc3QgU3RyaW5nJiBzb3VyY2VJRCkKIHsKICAgICBpZiAoSW5zcGVj dG9yQ29uc29sZUFnZW50KiBjb25zb2xlQWdlbnQgPSBpbnN0cnVtZW50aW5nQWdlbnRzLT5pbnNw ZWN0b3JDb25zb2xlQWdlbnQoKSkKLSAgICAgICAgY29uc29sZUFnZW50LT5hZGRNZXNzYWdlVG9D b25zb2xlKHNvdXJjZSwgdHlwZSwgbGV2ZWwsIG1lc3NhZ2UsIGxpbmVOdW1iZXIsIHNvdXJjZUlk KTsKKyAgICAgICAgY29uc29sZUFnZW50LT5hZGRNZXNzYWdlVG9Db25zb2xlKHNvdXJjZSwgdHlw ZSwgbGV2ZWwsIG1lc3NhZ2UsIGxpbmVOdW1iZXIsIHNvdXJjZUlEKTsKIH0KIAogdm9pZCBJbnNw ZWN0b3JJbnN0cnVtZW50YXRpb246OmNvbnNvbGVDb3VudEltcGwoSW5zdHJ1bWVudGluZ0FnZW50 cyogaW5zdHJ1bWVudGluZ0FnZW50cywgUGFzc1JlZlB0cjxTY3JpcHRBcmd1bWVudHM+IGFyZ3Vt ZW50cywgUGFzc1JlZlB0cjxTY3JpcHRDYWxsU3RhY2s+IHN0YWNrKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oCmluZGV4IDQ0NTc2 YjBmNDViNTA4ZGYyMGVkOTNiYTlhYWU0YmMxMTQyMTEwZDIuLjdkZWFjN2FhYTExMWYyYzdiNzEw YzZhOTM1YTc4NWY5ZmVhZDYzNzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmgKQEAgLTI2MSw3ICsyNjEsNyBAQCBwcml2YXRl OgogICAgIHN0YXRpYyB2b2lkIGRpZFdyaXRlSFRNTEltcGwoY29uc3QgSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uQ29va2llJiwgdW5zaWduZWQgaW50IGVuZExpbmUpOwogCiAgICAgc3RhdGljIHZv aWQgYWRkTWVzc2FnZVRvQ29uc29sZUltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyosIE1lc3NhZ2VT b3VyY2UsIE1lc3NhZ2VUeXBlLCBNZXNzYWdlTGV2ZWwsIGNvbnN0IFN0cmluZyYgbWVzc2FnZSwg UGFzc1JlZlB0cjxTY3JpcHRBcmd1bWVudHM+LCBQYXNzUmVmUHRyPFNjcmlwdENhbGxTdGFjaz4p OwotICAgIHN0YXRpYyB2b2lkIGFkZE1lc3NhZ2VUb0NvbnNvbGVJbXBsKEluc3RydW1lbnRpbmdB Z2VudHMqLCBNZXNzYWdlU291cmNlLCBNZXNzYWdlVHlwZSwgTWVzc2FnZUxldmVsLCBjb25zdCBT dHJpbmcmIG1lc3NhZ2UsIHVuc2lnbmVkIGxpbmVOdW1iZXIsIGNvbnN0IFN0cmluZyYgc291cmNl SWQpOworICAgIHN0YXRpYyB2b2lkIGFkZE1lc3NhZ2VUb0NvbnNvbGVJbXBsKEluc3RydW1lbnRp bmdBZ2VudHMqLCBNZXNzYWdlU291cmNlLCBNZXNzYWdlVHlwZSwgTWVzc2FnZUxldmVsLCBjb25z dCBTdHJpbmcmIG1lc3NhZ2UsIHVuc2lnbmVkIGxpbmVOdW1iZXIsIGNvbnN0IFN0cmluZyYgc291 cmNlSUQpOwogICAgIHN0YXRpYyB2b2lkIGNvbnNvbGVDb3VudEltcGwoSW5zdHJ1bWVudGluZ0Fn ZW50cyosIFBhc3NSZWZQdHI8U2NyaXB0QXJndW1lbnRzPiwgUGFzc1JlZlB0cjxTY3JpcHRDYWxs U3RhY2s+KTsKICAgICBzdGF0aWMgdm9pZCBzdGFydENvbnNvbGVUaW1pbmdJbXBsKEluc3RydW1l bnRpbmdBZ2VudHMqLCBjb25zdCBTdHJpbmcmIHRpdGxlKTsKICAgICBzdGF0aWMgdm9pZCBzdG9w Q29uc29sZVRpbWluZ0ltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyosIGNvbnN0IFN0cmluZyYgdGl0 bGUsIFBhc3NSZWZQdHI8U2NyaXB0Q2FsbFN0YWNrPik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAKaW5kZXggODliMzJjYTc3ZTg0 MjZkOGNkZjQyMDU4NjJmZmEwOWUxNzBiNmI1NS4uM2NjOGU0NGVlYzQwZThhYjhhZGI3YmRjZjdj Y2FkNmE0OGU3Y2JmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvclJlc291cmNlQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JSZXNvdXJjZUFnZW50LmNwcApAQCAtMTQ5LDcgKzE0OSw3IEBAIHN0YXRpYyBQYXNzUmVm UHRyPEluc3BlY3Rvck9iamVjdD4gYnVpbGRPYmplY3RGb3JSZXNvdXJjZVJlc3BvbnNlKGNvbnN0 IFJlc291cmNlCiAKICAgICByZXNwb25zZU9iamVjdC0+c2V0U3RyaW5nKCJtaW1lVHlwZSIsIHJl c3BvbnNlLm1pbWVUeXBlKCkpOwogICAgIHJlc3BvbnNlT2JqZWN0LT5zZXRCb29sZWFuKCJjb25u ZWN0aW9uUmV1c2VkIiwgcmVzcG9uc2UuY29ubmVjdGlvblJldXNlZCgpKTsKLSAgICByZXNwb25z ZU9iamVjdC0+c2V0TnVtYmVyKCJjb25uZWN0aW9uSWQiLCByZXNwb25zZS5jb25uZWN0aW9uSUQo KSk7CisgICAgcmVzcG9uc2VPYmplY3QtPnNldE51bWJlcigiY29ubmVjdGlvbklEIiwgcmVzcG9u c2UuY29ubmVjdGlvbklEKCkpOwogICAgIHJlc3BvbnNlT2JqZWN0LT5zZXRCb29sZWFuKCJmcm9t RGlza0NhY2hlIiwgcmVzcG9uc2Uud2FzQ2FjaGVkKCkpOwogICAgIGlmIChyZXNwb25zZS5yZXNv dXJjZUxvYWRUaW1pbmcoKSkKICAgICAgICAgcmVzcG9uc2VPYmplY3QtPnNldE9iamVjdCgidGlt aW5nIiwgYnVpbGRPYmplY3RGb3JUaW1pbmcoKnJlc3BvbnNlLnJlc291cmNlTG9hZFRpbWluZygp KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvU2NyaXB0RGVidWdMaXN0 ZW5lci5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1NjcmlwdERlYnVnTGlzdGVuZXIuaApp bmRleCBlNDk3ZTIyNmFkZDczMjY0YjQ0MjVmOTk2MDcxYzdlOTY1Yjk2ZWU2Li44MDJmODVhNDI1 MjczNDI5NzRjZWUwMDkyNzQ5ZDJhZTI4MGQ1NzMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvU2NyaXB0RGVidWdMaXN0ZW5lci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9TY3JpcHREZWJ1Z0xpc3RlbmVyLmgKQEAgLTQyLDcgKzQyLDcgQEAgY2xhc3MgU2Ny aXB0RGVidWdMaXN0ZW5lciB7CiBwdWJsaWM6CiAgICAgdmlydHVhbCB+U2NyaXB0RGVidWdMaXN0 ZW5lcigpIHsgfQogCi0gICAgdmlydHVhbCB2b2lkIGRpZFBhcnNlU291cmNlKGNvbnN0IFN0cmlu ZyYgIHNvdXJjZUlkLCBjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBkYXRhLCAgaW50 IHN0YXJ0TGluZSwgaW50IHN0YXJ0Q29sdW1uLCBpbnQgZW5kTGluZSwgaW50IGVuZENvbHVtbiwg Ym9vbCBpc0NvbnRlbnRTY3JpcHQpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkUGFyc2VTb3Vy Y2UoY29uc3QgU3RyaW5nJiAgc291cmNlSUQsIGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJp bmcmIGRhdGEsICBpbnQgc3RhcnRMaW5lLCBpbnQgc3RhcnRDb2x1bW4sIGludCBlbmRMaW5lLCBp bnQgZW5kQ29sdW1uLCBib29sIGlzQ29udGVudFNjcmlwdCkgPSAwOwogICAgIHZpcnR1YWwgdm9p ZCBmYWlsZWRUb1BhcnNlU291cmNlKGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIGRh dGEsIGludCBmaXJzdExpbmUsIGludCBlcnJvckxpbmUsIGNvbnN0IFN0cmluZyYgZXJyb3JNZXNz YWdlKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRpZFBhdXNlKFNjcmlwdFN0YXRlKiwgY29uc3Qg U2NyaXB0VmFsdWUmIGNhbGxGcmFtZXMsIGNvbnN0IFNjcmlwdFZhbHVlJiBleGNlcHRpb24pID0g MDsKICAgICB2aXJ0dWFsIHZvaWQgZGlkQ29udGludWUoKSA9IDA7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9kZWwuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9kZWwuanMKaW5kZXggMzFhZTZi OGZhZWYxYWJhYWI1M2MxYTMyZTJkZDAyZDdiOWFkNzM4Ny4uMzVjZjhhNTYwNjcxMGE3N2MxNWUy MmI3ZTZmYmI1YTM0NTc2MGZkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9EZWJ1Z2dlck1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qcwpAQCAtMTI0LDkgKzEyNCw5IEBAIFdlYkluc3Bl Y3Rvci5EZWJ1Z2dlck1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMuX3Nj cmlwdHM7CiAgICAgfSwKIAotICAgIHNjcmlwdEZvclNvdXJjZUlEOiBmdW5jdGlvbihzb3VyY2VJ ZCkKKyAgICBzY3JpcHRGb3JTb3VyY2VJRDogZnVuY3Rpb24oc291cmNlSUQpCiAgICAgewotICAg ICAgICByZXR1cm4gdGhpcy5fc2NyaXB0c1tzb3VyY2VJZF07CisgICAgICAgIHJldHVybiB0aGlz Ll9zY3JpcHRzW3NvdXJjZUlEXTsKICAgICB9LAogCiAgICAgc2NyaXB0c0ZvclVSTDogZnVuY3Rp b24odXJsKQpAQCAtMTM3LDIwICsxMzcsMjAgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwu cHJvdG90eXBlID0gewogICAgIHF1ZXJ5U2NyaXB0czogZnVuY3Rpb24oZmlsdGVyKQogICAgIHsK ICAgICAgICAgdmFyIHNjcmlwdHMgPSBbXTsKLSAgICAgICAgZm9yICh2YXIgc291cmNlSWQgaW4g dGhpcy5fc2NyaXB0cykgewotICAgICAgICAgICAgdmFyIHNjcmlwdCA9IHRoaXMuX3NjcmlwdHNb c291cmNlSWRdOworICAgICAgICBmb3IgKHZhciBzb3VyY2VJRCBpbiB0aGlzLl9zY3JpcHRzKSB7 CisgICAgICAgICAgICB2YXIgc2NyaXB0ID0gdGhpcy5fc2NyaXB0c1tzb3VyY2VJRF07CiAgICAg ICAgICAgICBpZiAoZmlsdGVyKHNjcmlwdCkpCiAgICAgICAgICAgICAgICAgc2NyaXB0cy5wdXNo KHNjcmlwdCk7CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuIHNjcmlwdHM7CiAgICAgfSwKIAot ICAgIGVkaXRTY3JpcHRTb3VyY2U6IGZ1bmN0aW9uKHNvdXJjZUlkLCBuZXdTb3VyY2UsIGNhbGxi YWNrKQorICAgIGVkaXRTY3JpcHRTb3VyY2U6IGZ1bmN0aW9uKHNvdXJjZUlELCBuZXdTb3VyY2Us IGNhbGxiYWNrKQogICAgIHsKLSAgICAgICAgdGhpcy5fc2NyaXB0c1tzb3VyY2VJZF0uZWRpdFNv dXJjZShuZXdTb3VyY2UsIHRoaXMuX2RpZEVkaXRTY3JpcHRTb3VyY2UuYmluZCh0aGlzLCBzb3Vy Y2VJZCwgbmV3U291cmNlLCBjYWxsYmFjaykpOworICAgICAgICB0aGlzLl9zY3JpcHRzW3NvdXJj ZUlEXS5lZGl0U291cmNlKG5ld1NvdXJjZSwgdGhpcy5fZGlkRWRpdFNjcmlwdFNvdXJjZS5iaW5k KHRoaXMsIHNvdXJjZUlELCBuZXdTb3VyY2UsIGNhbGxiYWNrKSk7CiAgICAgfSwKIAotICAgIF9k aWRFZGl0U2NyaXB0U291cmNlOiBmdW5jdGlvbihzb3VyY2VJZCwgbmV3U291cmNlLCBjYWxsYmFj aywgZXJyb3IsIGNhbGxGcmFtZXMpCisgICAgX2RpZEVkaXRTY3JpcHRTb3VyY2U6IGZ1bmN0aW9u KHNvdXJjZUlELCBuZXdTb3VyY2UsIGNhbGxiYWNrLCBlcnJvciwgY2FsbEZyYW1lcykKICAgICB7 CiAgICAgICAgIGlmICghZXJyb3IgJiYgY2FsbEZyYW1lcyAmJiBjYWxsRnJhbWVzLmxlbmd0aCkK ICAgICAgICAgICAgIHRoaXMuX2RlYnVnZ2VyUGF1c2VkRGV0YWlscy5jYWxsRnJhbWVzID0gY2Fs bEZyYW1lczsKQEAgLTE3OSwxMCArMTc5LDEwIEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVs LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2Vi SW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwuRXZlbnRzLkRlYnVnZ2VyUmVzdW1lZCk7CiAgICAgfSwK IAotICAgIF9wYXJzZWRTY3JpcHRTb3VyY2U6IGZ1bmN0aW9uKHNvdXJjZUlkLCBzb3VyY2VVUkws IHN0YXJ0TGluZSwgc3RhcnRDb2x1bW4sIGVuZExpbmUsIGVuZENvbHVtbiwgaXNDb250ZW50U2Ny aXB0KQorICAgIF9wYXJzZWRTY3JpcHRTb3VyY2U6IGZ1bmN0aW9uKHNvdXJjZUlELCBzb3VyY2VV UkwsIHN0YXJ0TGluZSwgc3RhcnRDb2x1bW4sIGVuZExpbmUsIGVuZENvbHVtbiwgaXNDb250ZW50 U2NyaXB0KQogICAgIHsKLSAgICAgICAgdmFyIHNjcmlwdCA9IG5ldyBXZWJJbnNwZWN0b3IuU2Ny aXB0KHNvdXJjZUlkLCBzb3VyY2VVUkwsIHN0YXJ0TGluZSwgc3RhcnRDb2x1bW4sIGVuZExpbmUs IGVuZENvbHVtbiwgdW5kZWZpbmVkLCB1bmRlZmluZWQsIGlzQ29udGVudFNjcmlwdCk7Ci0gICAg ICAgIHRoaXMuX3NjcmlwdHNbc291cmNlSWRdID0gc2NyaXB0OworICAgICAgICB2YXIgc2NyaXB0 ID0gbmV3IFdlYkluc3BlY3Rvci5TY3JpcHQoc291cmNlSUQsIHNvdXJjZVVSTCwgc3RhcnRMaW5l LCBzdGFydENvbHVtbiwgZW5kTGluZSwgZW5kQ29sdW1uLCB1bmRlZmluZWQsIHVuZGVmaW5lZCwg aXNDb250ZW50U2NyaXB0KTsKKyAgICAgICAgdGhpcy5fc2NyaXB0c1tzb3VyY2VJRF0gPSBzY3Jp cHQ7CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5E ZWJ1Z2dlck1vZGVsLkV2ZW50cy5QYXJzZWRTY3JpcHRTb3VyY2UsIHNjcmlwdCk7CiAgICAgfSwK IApAQCAtMjI3LDkgKzIyNyw5IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlckRpc3BhdGNoZXIucHJv dG90eXBlID0gewogICAgICAgICB0aGlzLl9kZWJ1Z2dlck1vZGVsLl9kZWJ1Z2dlcldhc0Rpc2Fi bGVkKCk7CiAgICAgfSwKIAotICAgIHNjcmlwdFBhcnNlZDogZnVuY3Rpb24oc291cmNlSWQsIHNv dXJjZVVSTCwgc3RhcnRMaW5lLCBzdGFydENvbHVtbiwgZW5kTGluZSwgZW5kQ29sdW1uLCBpc0Nv bnRlbnRTY3JpcHQpCisgICAgc2NyaXB0UGFyc2VkOiBmdW5jdGlvbihzb3VyY2VJRCwgc291cmNl VVJMLCBzdGFydExpbmUsIHN0YXJ0Q29sdW1uLCBlbmRMaW5lLCBlbmRDb2x1bW4sIGlzQ29udGVu dFNjcmlwdCkKICAgICB7Ci0gICAgICAgIHRoaXMuX2RlYnVnZ2VyTW9kZWwuX3BhcnNlZFNjcmlw dFNvdXJjZShzb3VyY2VJZCwgc291cmNlVVJMLCBzdGFydExpbmUsIHN0YXJ0Q29sdW1uLCBlbmRM aW5lLCBlbmRDb2x1bW4sIGlzQ29udGVudFNjcmlwdCk7CisgICAgICAgIHRoaXMuX2RlYnVnZ2Vy TW9kZWwuX3BhcnNlZFNjcmlwdFNvdXJjZShzb3VyY2VJRCwgc291cmNlVVJMLCBzdGFydExpbmUs IHN0YXJ0Q29sdW1uLCBlbmRMaW5lLCBlbmRDb2x1bW4sIGlzQ29udGVudFNjcmlwdCk7CiAgICAg fSwKIAogICAgIHNjcmlwdEZhaWxlZFRvUGFyc2U6IGZ1bmN0aW9uKHNvdXJjZVVSTCwgc291cmNl LCBzdGFydGluZ0xpbmUsIGVycm9yTGluZSwgZXJyb3JNZXNzYWdlKQpAQCAtMjM3LDggKzIzNyw4 IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlckRpc3BhdGNoZXIucHJvdG90eXBlID0gewogICAgICAg ICB0aGlzLl9kZWJ1Z2dlck1vZGVsLl9mYWlsZWRUb1BhcnNlU2NyaXB0U291cmNlKHNvdXJjZVVS TCwgc291cmNlLCBzdGFydGluZ0xpbmUsIGVycm9yTGluZSwgZXJyb3JNZXNzYWdlKTsKICAgICB9 LAogCi0gICAgYnJlYWtwb2ludFJlc29sdmVkOiBmdW5jdGlvbihicmVha3BvaW50SWQsIHNvdXJj ZUlkLCBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIpCisgICAgYnJlYWtwb2ludFJlc29sdmVkOiBm dW5jdGlvbihicmVha3BvaW50SWQsIHNvdXJjZUlELCBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIp CiAgICAgewotICAgICAgICB0aGlzLl9kZWJ1Z2dlck1vZGVsLl9icmVha3BvaW50UmVzb2x2ZWQo YnJlYWtwb2ludElkLCBzb3VyY2VJZCwgbGluZU51bWJlciwgY29sdW1uTnVtYmVyKTsKKyAgICAg ICAgdGhpcy5fZGVidWdnZXJNb2RlbC5fYnJlYWtwb2ludFJlc29sdmVkKGJyZWFrcG9pbnRJZCwg c291cmNlSUQsIGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlcik7CiAgICAgfQogfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlv bk1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclBy ZXNlbnRhdGlvbk1vZGVsLmpzCmluZGV4IDdkMWE4MzE5YTNhNzA5NGNjNTI2Njg1ZWVlNGNjYTgx ZGI5MjE0MzUuLmU4MTBmYzU4MTg3NTFiODFhNDc1NjZmNWYyZjE0NjY4YWMxODVkOGEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50 YXRpb25Nb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Rl YnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKQEAgLTk3LDcgKzk3LDcgQEAgV2ViSW5zcGVjdG9y LkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0gewogCiAgICAgX2FkZFNjcmlw dDogZnVuY3Rpb24oc2NyaXB0KQogICAgIHsKLSAgICAgICAgdmFyIHNvdXJjZUZpbGVJZCA9IHRo aXMuX2NyZWF0ZVNvdXJjZUZpbGVJZChzY3JpcHQuc291cmNlVVJMLCBzY3JpcHQuc291cmNlSWQp OworICAgICAgICB2YXIgc291cmNlRmlsZUlkID0gdGhpcy5fY3JlYXRlU291cmNlRmlsZUlkKHNj cmlwdC5zb3VyY2VVUkwsIHNjcmlwdC5zb3VyY2VJRCk7CiAgICAgICAgIHZhciBzb3VyY2VGaWxl ID0gdGhpcy5fc291cmNlRmlsZXNbc291cmNlRmlsZUlkXTsKICAgICAgICAgaWYgKHNvdXJjZUZp bGUpIHsKICAgICAgICAgICAgIHNvdXJjZUZpbGUuYWRkU2NyaXB0KHNjcmlwdCk7CkBAIC0xNjYs NyArMTY2LDcgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90 eXBlID0gewogICAgICAgICB2YXIgb2xkU291cmNlID0gc291cmNlRmlsZS5yZXF1ZXN0Q29udGVu dChkaWRSZWNlaXZlU291cmNlLmJpbmQodGhpcykpOwogICAgICAgICBmdW5jdGlvbiBkaWRSZWNl aXZlU291cmNlKG9sZFNvdXJjZSkKICAgICAgICAgewotICAgICAgICAgICAgV2ViSW5zcGVjdG9y LmRlYnVnZ2VyTW9kZWwuZWRpdFNjcmlwdFNvdXJjZShzY3JpcHQuc291cmNlSWQsIG5ld1NvdXJj ZSwgZGlkRWRpdFNjcmlwdFNvdXJjZS5iaW5kKHRoaXMsIG9sZFNvdXJjZSkpOworICAgICAgICAg ICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuZWRpdFNjcmlwdFNvdXJjZShzY3JpcHQuc291 cmNlSUQsIG5ld1NvdXJjZSwgZGlkRWRpdFNjcmlwdFNvdXJjZS5iaW5kKHRoaXMsIG9sZFNvdXJj ZSkpOwogICAgICAgICB9CiAgICAgfSwKIApAQCAtMzM1LDExICszMzUsMTEgQEAgV2ViSW5zcGVj dG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0gewogICAgICAgICBmdW5j dGlvbiBkaWRSZXF1ZXN0U291cmNlTWFwcGluZyhtYXBwaW5nKQogICAgICAgICB7CiAgICAgICAg ICAgICB2YXIgbG9jYXRpb24gPSBtYXBwaW5nLnNvdXJjZUxpbmVUb1NjcmlwdExvY2F0aW9uKGJy ZWFrcG9pbnQubGluZU51bWJlcik7Ci0gICAgICAgICAgICB2YXIgc2NyaXB0ID0gV2ViSW5zcGVj dG9yLmRlYnVnZ2VyTW9kZWwuc2NyaXB0Rm9yU291cmNlSUQobG9jYXRpb24uc291cmNlSWQpOwor ICAgICAgICAgICAgdmFyIHNjcmlwdCA9IFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLnNjcmlw dEZvclNvdXJjZUlEKGxvY2F0aW9uLnNvdXJjZUlEKTsKICAgICAgICAgICAgIGlmIChzY3JpcHQu c291cmNlVVJMKQogICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLnNl dEJyZWFrcG9pbnQoc2NyaXB0LnNvdXJjZVVSTCwgbG9jYXRpb24ubGluZU51bWJlciwgbG9jYXRp b24uY29sdW1uTnVtYmVyLCBicmVha3BvaW50LmNvbmRpdGlvbiwgZGlkU2V0QnJlYWtwb2ludC5i aW5kKHRoaXMpKTsKICAgICAgICAgICAgIGVsc2UgewotICAgICAgICAgICAgICAgIGxvY2F0aW9u LnNvdXJjZUlkID0gc2NyaXB0LnNvdXJjZUlkOworICAgICAgICAgICAgICAgIGxvY2F0aW9uLnNv dXJjZUlEID0gc2NyaXB0LnNvdXJjZUlEOwogICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5k ZWJ1Z2dlck1vZGVsLnNldEJyZWFrcG9pbnRCeVNvdXJjZUlkKGxvY2F0aW9uLCBicmVha3BvaW50 LmNvbmRpdGlvbiwgZGlkU2V0QnJlYWtwb2ludC5iaW5kKHRoaXMpKTsKICAgICAgICAgICAgIH0K ICAgICAgICAgfQpAQCAtNTIwLDkgKzUyMCw5IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNl bnRhdGlvbk1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBj YWxsRnJhbWVzLmxlbmd0aDsgKytpKSB7CiAgICAgICAgICAgICB2YXIgY2FsbEZyYW1lID0gY2Fs bEZyYW1lc1tpXTsKICAgICAgICAgICAgIHZhciBzb3VyY2VGaWxlOwotICAgICAgICAgICAgdmFy IHNjcmlwdCA9IFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLnNjcmlwdEZvclNvdXJjZUlEKGNh bGxGcmFtZS5sb2NhdGlvbi5zb3VyY2VJZCk7CisgICAgICAgICAgICB2YXIgc2NyaXB0ID0gV2Vi SW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuc2NyaXB0Rm9yU291cmNlSUQoY2FsbEZyYW1lLmxvY2F0 aW9uLnNvdXJjZUlEKTsKICAgICAgICAgICAgIGlmIChzY3JpcHQpCi0gICAgICAgICAgICAgICAg c291cmNlRmlsZSA9IHRoaXMuX3NvdXJjZUZpbGVGb3JTY3JpcHQoc2NyaXB0LnNvdXJjZVVSTCwg c2NyaXB0LnNvdXJjZUlkKTsKKyAgICAgICAgICAgICAgICBzb3VyY2VGaWxlID0gdGhpcy5fc291 cmNlRmlsZUZvclNjcmlwdChzY3JpcHQuc291cmNlVVJMLCBzY3JpcHQuc291cmNlSUQpOwogICAg ICAgICAgICAgdGhpcy5fcHJlc2VudGF0aW9uQ2FsbEZyYW1lcy5wdXNoKG5ldyBXZWJJbnNwZWN0 b3IuUHJlc2VuYXRpb25DYWxsRnJhbWUoY2FsbEZyYW1lLCBpLCBzb3VyY2VGaWxlKSk7CiAgICAg ICAgIH0KICAgICAgICAgdmFyIGRldGFpbHMgPSBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5k ZWJ1Z2dlclBhdXNlZERldGFpbHM7CkBAIC01NTAsMjQgKzU1MCwyNCBAQCBXZWJJbnNwZWN0b3Iu RGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0 aGlzLl9wcmVzZW50YXRpb25DYWxsRnJhbWVzW3RoaXMuX3NlbGVjdGVkQ2FsbEZyYW1lSW5kZXhd OwogICAgIH0sCiAKLSAgICBfc291cmNlRmlsZUZvclNjcmlwdDogZnVuY3Rpb24oc291cmNlVVJM LCBzb3VyY2VJZCkKKyAgICBfc291cmNlRmlsZUZvclNjcmlwdDogZnVuY3Rpb24oc291cmNlVVJM LCBzb3VyY2VJRCkKICAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl9zb3VyY2VGaWxlc1t0aGlz Ll9jcmVhdGVTb3VyY2VGaWxlSWQoc291cmNlVVJMLCBzb3VyY2VJZCldOworICAgICAgICByZXR1 cm4gdGhpcy5fc291cmNlRmlsZXNbdGhpcy5fY3JlYXRlU291cmNlRmlsZUlkKHNvdXJjZVVSTCwg c291cmNlSUQpXTsKICAgICB9LAogCiAgICAgX3NjcmlwdEZvclNvdXJjZUZpbGVJZDogZnVuY3Rp b24oc291cmNlRmlsZUlkKQogICAgIHsKICAgICAgICAgZnVuY3Rpb24gZmlsdGVyKHNjcmlwdCkK ICAgICAgICAgewotICAgICAgICAgICAgcmV0dXJuIHRoaXMuX2NyZWF0ZVNvdXJjZUZpbGVJZChz Y3JpcHQuc291cmNlVVJMLCBzY3JpcHQuc291cmNlSWQpID09PSBzb3VyY2VGaWxlSWQ7CisgICAg ICAgICAgICByZXR1cm4gdGhpcy5fY3JlYXRlU291cmNlRmlsZUlkKHNjcmlwdC5zb3VyY2VVUkws IHNjcmlwdC5zb3VyY2VJRCkgPT09IHNvdXJjZUZpbGVJZDsKICAgICAgICAgfQogICAgICAgICBy ZXR1cm4gV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwucXVlcnlTY3JpcHRzKGZpbHRlci5iaW5k KHRoaXMpKVswXTsKICAgICB9LAogCi0gICAgX2NyZWF0ZVNvdXJjZUZpbGVJZDogZnVuY3Rpb24o c291cmNlVVJMLCBzb3VyY2VJZCkKKyAgICBfY3JlYXRlU291cmNlRmlsZUlkOiBmdW5jdGlvbihz b3VyY2VVUkwsIHNvdXJjZUlEKQogICAgIHsKICAgICAgICAgdmFyIHByZWZpeCA9IHRoaXMuX2Zv cm1hdFNvdXJjZUZpbGVzID8gImRlb2JmdXNjYXRlZDoiIDogIiI7Ci0gICAgICAgIHJldHVybiBw cmVmaXggKyAoc291cmNlVVJMIHx8IHNvdXJjZUlkKTsKKyAgICAgICAgcmV0dXJuIHByZWZpeCAr IChzb3VyY2VVUkwgfHwgc291cmNlSUQpOwogICAgIH0sCiAKICAgICBfcmVzZXQ6IGZ1bmN0aW9u KCkKQEAgLTY1NCw3ICs2NTQsNyBAQCBXZWJJbnNwZWN0b3IuUHJlc2VuYXRpb25DYWxsRnJhbWUg PSBmdW5jdGlvbihjYWxsRnJhbWUsIGluZGV4LCBzb3VyY2VGaWxlKQogICAgIHRoaXMuX2NhbGxG cmFtZSA9IGNhbGxGcmFtZTsKICAgICB0aGlzLl9pbmRleCA9IGluZGV4OwogICAgIHRoaXMuX3Nv dXJjZUZpbGUgPSBzb3VyY2VGaWxlOwotICAgIHRoaXMuX3NjcmlwdCA9IFdlYkluc3BlY3Rvci5k ZWJ1Z2dlck1vZGVsLnNjcmlwdEZvclNvdXJjZUlEKGNhbGxGcmFtZS5sb2NhdGlvbi5zb3VyY2VJ ZCk7CisgICAgdGhpcy5fc2NyaXB0ID0gV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuc2NyaXB0 Rm9yU291cmNlSUQoY2FsbEZyYW1lLmxvY2F0aW9uLnNvdXJjZUlEKTsKIH0KIAogV2ViSW5zcGVj dG9yLlByZXNlbmF0aW9uQ2FsbEZyYW1lLnByb3RvdHlwZSA9IHsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzCmluZGV4IDM2Yjll ZTA0ZDJkMzhiMDZiYTZiOTc2YzFjNGQzMWJmMTFlYzRmNTUuLjZhYWU2NmFmMTJkY2QzNWNiM2I0 YWY0ZDc3NTM4NmE0OTVlMjBiZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcwpAQCAtOTgsNyArOTgsNyBAQCBXZWJJbnNw ZWN0b3IuTmV0d29ya0Rpc3BhdGNoZXIucHJvdG90eXBlID0gewogICAgICAgICAgICAgcmVzb3Vy Y2UucmVxdWVzdEhlYWRlcnNUZXh0ID0gcmVzcG9uc2UucmVxdWVzdEhlYWRlcnNUZXh0OwogCiAg ICAgICAgIHJlc291cmNlLmNvbm5lY3Rpb25SZXVzZWQgPSByZXNwb25zZS5jb25uZWN0aW9uUmV1 c2VkOwotICAgICAgICByZXNvdXJjZS5jb25uZWN0aW9uSWQgPSByZXNwb25zZS5jb25uZWN0aW9u SWQ7CisgICAgICAgIHJlc291cmNlLmNvbm5lY3Rpb25JRCA9IHJlc3BvbnNlLmNvbm5lY3Rpb25J RDsKIAogICAgICAgICBpZiAocmVzcG9uc2UuZnJvbURpc2tDYWNoZSkKICAgICAgICAgICAgIHJl c291cmNlLmNhY2hlZCA9IHRydWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NjcmlwdC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2NyaXB0LmpzCmluZGV4IDZlZTY4ZmNkMjMwOGM0YWU2ZGIxNWYwZTdhZDE3NzBkMjc4NTM1 NzIuLjJjZmE0ODNmZTI2YzY2Njk1NWUzYTE2MDAzNzBlMjEzNDIwM2UxMzQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0LmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0LmpzCkBAIC0yMyw5ICsyMyw5IEBA CiAgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZ IE9GIFNVQ0ggREFNQUdFLgogICovCiAKLVdlYkluc3BlY3Rvci5TY3JpcHQgPSBmdW5jdGlvbihz b3VyY2VJZCwgc291cmNlVVJMLCBzdGFydExpbmUsIHN0YXJ0Q29sdW1uLCBlbmRMaW5lLCBlbmRD b2x1bW4sIGVycm9yTGluZSwgZXJyb3JNZXNzYWdlLCBpc0NvbnRlbnRTY3JpcHQpCitXZWJJbnNw ZWN0b3IuU2NyaXB0ID0gZnVuY3Rpb24oc291cmNlSUQsIHNvdXJjZVVSTCwgc3RhcnRMaW5lLCBz dGFydENvbHVtbiwgZW5kTGluZSwgZW5kQ29sdW1uLCBlcnJvckxpbmUsIGVycm9yTWVzc2FnZSwg aXNDb250ZW50U2NyaXB0KQogewotICAgIHRoaXMuc291cmNlSWQgPSBzb3VyY2VJZDsKKyAgICB0 aGlzLnNvdXJjZUlEID0gc291cmNlSUQ7CiAgICAgdGhpcy5zb3VyY2VVUkwgPSBzb3VyY2VVUkw7 CiAgICAgdGhpcy5saW5lT2Zmc2V0ID0gc3RhcnRMaW5lOwogICAgIHRoaXMuY29sdW1uT2Zmc2V0 ID0gc3RhcnRDb2x1bW47CkBAIC00OSw3ICs0OSw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHQucHJv dG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5fc291cmNlID0gc291cmNlOwogICAgICAgICAg ICAgY2FsbGJhY2sodGhpcy5fc291cmNlKTsKICAgICAgICAgfQotICAgICAgICBEZWJ1Z2dlckFn ZW50LmdldFNjcmlwdFNvdXJjZSh0aGlzLnNvdXJjZUlkLCBkaWRHZXRTY3JpcHRTb3VyY2UuYmlu ZCh0aGlzKSk7CisgICAgICAgIERlYnVnZ2VyQWdlbnQuZ2V0U2NyaXB0U291cmNlKHRoaXMuc291 cmNlSUQsIGRpZEdldFNjcmlwdFNvdXJjZS5iaW5kKHRoaXMpKTsKICAgICB9LAogCiAgICAgZWRp dFNvdXJjZTogZnVuY3Rpb24obmV3U291cmNlLCBjYWxsYmFjaykKQEAgLTYwLDYgKzYwLDYgQEAg V2ViSW5zcGVjdG9yLlNjcmlwdC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgdGhpcy5f c291cmNlID0gbmV3U291cmNlOwogICAgICAgICAgICAgY2FsbGJhY2soZXJyb3IsIGNhbGxGcmFt ZXMpOwogICAgICAgICB9Ci0gICAgICAgIERlYnVnZ2VyQWdlbnQuZWRpdFNjcmlwdFNvdXJjZSh0 aGlzLnNvdXJjZUlkLCBuZXdTb3VyY2UsIGRpZEVkaXRTY3JpcHRTb3VyY2UuYmluZCh0aGlzKSk7 CisgICAgICAgIERlYnVnZ2VyQWdlbnQuZWRpdFNjcmlwdFNvdXJjZSh0aGlzLnNvdXJjZUlELCBu ZXdTb3VyY2UsIGRpZEVkaXRTY3JpcHRTb3VyY2UuYmluZCh0aGlzKSk7CiAgICAgfQogfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGaWxlLmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGaWxlLmpzCmluZGV4 IGVkZTAzNzA2MGZmNDgzYTU5ODUwNWFjNzk3ODk1YzUxNjEyYmMzYjIuLmI5MzY5NDY0ZDQzZDcz YWYwOWQyOWY0Zjk3Njk1MDA2NmE5NGI4NDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU291cmNlRmlsZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZpbGUuanMKQEAgLTkzLDEwICs5MywxMCBAQCBXZWJJbnNw ZWN0b3IuU291cmNlRmlsZS5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgaWYgKCF0aGlzLl9jb25j YXRlbmF0ZWRTY3JpcHRzKQogICAgICAgICAgICAgdGhpcy5fY29uY2F0ZW5hdGVkU2NyaXB0cyA9 IHt9OwotICAgICAgICBpZiAodGhpcy5fY29uY2F0ZW5hdGVkU2NyaXB0c1tzY3JpcHQuc291cmNl SWRdKQorICAgICAgICBpZiAodGhpcy5fY29uY2F0ZW5hdGVkU2NyaXB0c1tzY3JpcHQuc291cmNl SURdKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRo aXMuX3NjcmlwdHMubGVuZ3RoOyArK2kpCi0gICAgICAgICAgICB0aGlzLl9jb25jYXRlbmF0ZWRT Y3JpcHRzW3RoaXMuX3NjcmlwdHNbaV0uc291cmNlSWRdID0gdHJ1ZTsKKyAgICAgICAgICAgIHRo aXMuX2NvbmNhdGVuYXRlZFNjcmlwdHNbdGhpcy5fc2NyaXB0c1tpXS5zb3VyY2VJRF0gPSB0cnVl OwogCiAgICAgICAgIHRoaXMucmVsb2FkKCk7CiAKQEAgLTE5Miw3ICsxOTIsNyBAQCBXZWJJbnNw ZWN0b3IuU291cmNlRmlsZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB9CiAgICAgICAgICAg ICB2YXIgZW5kID0geyBsaW5lTnVtYmVyOiBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXI6IGNvbHVt bk51bWJlciB9OwogICAgICAgICAgICAgaWYgKHNjcmlwdCkKLSAgICAgICAgICAgICAgICBzY3Jp cHRSYW5nZXMucHVzaCh7IHN0YXJ0OiBzdGFydCwgZW5kOiBlbmQsIHNvdXJjZUlkOiBzY3JpcHQu c291cmNlSWQgfSk7CisgICAgICAgICAgICAgICAgc2NyaXB0UmFuZ2VzLnB1c2goeyBzdGFydDog c3RhcnQsIGVuZDogZW5kLCBzb3VyY2VJRDogc2NyaXB0LnNvdXJjZUlEIH0pOwogICAgICAgICB9 CiAKICAgICAgICAgdmFyIHNjcmlwdE9wZW5UYWcgPSAiPHNjcmlwdD4iOwpAQCAtMjg5LDcgKzI4 OSw3IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VNYXBwaW5nLnByb3RvdHlwZSA9IHsKICAgICAgICAg ICAgICAgICBicmVhazsKICAgICAgICAgICAgIGNsb3Nlc3RTY3JpcHQgPSBzY3JpcHQ7CiAgICAg ICAgIH0KLSAgICAgICAgcmV0dXJuIHsgc291cmNlSWQ6IGNsb3Nlc3RTY3JpcHQuc291cmNlSWQs IGxpbmVOdW1iZXI6IGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlcjogY29sdW1uTnVtYmVyIH07Cisg ICAgICAgIHJldHVybiB7IHNvdXJjZUlEOiBjbG9zZXN0U2NyaXB0LnNvdXJjZUlELCBsaW5lTnVt YmVyOiBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXI6IGNvbHVtbk51bWJlciB9OwogICAgIH0KIH0K IAo=