67636 2011-09-06 04:50:32 -0700 REGRESSION(r94560): It made inspector/debugger/script-formatter.html flakey (Requested by Ossy on #webkit). 2011-09-06 04:57:25 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 67609 1 webkit.review.bot webkit.review.bot podivilov yurys oldest_to_newest 462464 0 webkit.review.bot 2011-09-06 04:50:32 -0700 http://trac.webkit.org/changeset/94560 broke the build: It made inspector/debugger/script-formatter.html flakey (Requested by Ossy 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 462465 1 106407 webkit.review.bot 2011-09-06 04:51:01 -0700 Created attachment 106407 ROLLOUT of r94560 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. 462467 2 106407 yurys 2011-09-06 04:57:16 -0700 Comment on attachment 106407 ROLLOUT of r94560 Clearing flags on attachment: 106407 Committed r94562: <http://trac.webkit.org/changeset/94562> 462468 3 yurys 2011-09-06 04:57:25 -0700 All reviewed patches have been landed. Closing bug. 106407 2011-09-06 04:51:01 -0700 2011-09-06 04:57:16 -0700 ROLLOUT of r94560 bug-67636-20110906115007.patch text/plain 26163 webkit.review.bot U3VidmVyc2lvbiBSZXZpc2lvbjogOTQ1NjEKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBiN2U0ODUzZjBlMzRkOTkxNDQxZTI0 YmI0NWM3MGVhYTlkNDExZGVlLi4xNzdiM2UzMDVhNDFlODk3OGY3MWUzODk0ZTczMTRhZTA2MDYx ZDcyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDktMDYgIFNoZXJpZmYgQm90ICA8d2Vi a2l0LnJldmlldy5ib3RAZ21haWwuY29tPgorCisgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcg b3V0IHI5NDU2MC4KKyAgICAgICAgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvOTQ1 NjAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY3NjM2 CisKKyAgICAgICAgSXQgbWFkZSBpbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0LWZvcm1hdHRlci5o dG1sIGZsYWtleQorICAgICAgICAoUmVxdWVzdGVkIGJ5IE9zc3kgb24gI3dlYmtpdCkuCisKKyAg ICAgICAgKiBpbnNwZWN0b3IvZGVidWdnZXIvY29udGVudC1wcm92aWRlcnMtZXhwZWN0ZWQudHh0 OgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9jb250ZW50LXByb3ZpZGVycy5odG1sOgor ICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBhbmVsLmh0bWw6CisgICAgICAg ICogaW5zcGVjdG9yL2RlYnVnZ2VyL3NvdXJjZS1mcmFtZS1jb3VudC5odG1sOgorCiAyMDExLTA5 LTA1ICBQYXZlbCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IHJlLWltcGxlbWVudCBSYXdTb3VyY2VDb2RlLgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2NvbnRlbnQtcHJvdmlkZXJzLWV4cGVjdGVk LnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9jb250ZW50LXByb3ZpZGVycy1l eHBlY3RlZC50eHQKaW5kZXggM2VjNzEwMzk4MDMxMzM3NTk0MjNhMjFiYmQwYWE0YmVlNjA5MDNh NC4uYTliYjQxNDIwYTMyY2JiNjU4NDZkOTRlMjVmYjUyZDExNThlNjU0OSAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2NvbnRlbnQtcHJvdmlkZXJzLWV4cGVjdGVk LnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvY29udGVudC1wcm92aWRl cnMtZXhwZWN0ZWQudHh0CkBAIC0yMSwzICsyMSw1IEBAIGZ1bmN0aW9uIGJheigpCiBSdW5uaW5n OiB0ZXN0UmVzb3VyY2VDb250ZW50UHJvdmlkZXIKIFJlcXVlc3QgcmVzb3VyY2UgY29udGVudC4K IAorUnVubmluZzogdGVzdEZvcm1hdHRlZENvbnRlbnRQcm92aWRlcgorCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvY29udGVudC1wcm92aWRlcnMuaHRtbCBiL0xh eW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9jb250ZW50LXByb3ZpZGVycy5odG1sCmluZGV4 IGFhNTE0NmRjNjEwMDIyNjA2NmFlY2M2NGYzMmEzYTRlMmFiMmQ5NTcuLjExZWExMjBjODJjZTYx NjVkMmY0NjgzYjA1MGVkN2Q2YWZkYTQ5YjcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9kZWJ1Z2dlci9jb250ZW50LXByb3ZpZGVycy5odG1sCisrKyBiL0xheW91dFRlc3RzL2lu c3BlY3Rvci9kZWJ1Z2dlci9jb250ZW50LXByb3ZpZGVycy5odG1sCkBAIC02OSw2ICs2OSwyOCBA QCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgICAgICAgICBuZXh0KCk7CiAgICAgICAgICAgICB9 CiAgICAgICAgICAgICBjb250ZW50UHJvdmlkZXIucmVxdWVzdENvbnRlbnQoZGlkUmVxdWVzdENv bnRlbnQpOworICAgICAgICB9LAorCisgICAgICAgIGZ1bmN0aW9uIHRlc3RGb3JtYXR0ZWRDb250 ZW50UHJvdmlkZXIobmV4dCkKKyAgICAgICAgeworICAgICAgICAgICAgdmFyIG1hcHBpbmcgPSB7 fTsKKyAgICAgICAgICAgIHZhciBmb3JtYXR0ZXIgPSB7CisgICAgICAgICAgICAgICAgZm9ybWF0 Q29udGVudDogZnVuY3Rpb24obWltZVR5cGUsIGNvbnRlbnQsIGNhbGxiYWNrKQorICAgICAgICAg ICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgc2V0VGltZW91dChjYWxsYmFjay5iaW5kKG51 bGwsICI8Zm9ybWF0dGVkPiAiICsgY29udGVudCwgbWFwcGluZyksIDApOworICAgICAgICAgICAg ICAgIH0KKyAgICAgICAgICAgIH07CisgICAgICAgICAgICB2YXIgcmVzb3VyY2UgPSB7IHR5cGU6 IFdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBlLkRvY3VtZW50LCByZXF1ZXN0Q29udGVudDogZnVu Y3Rpb24oY2FsbGJhY2spIHsgY2FsbGJhY2soIjxyZXNvdXJjZSBjb250ZW50PiIpOyB9IH07Cisg ICAgICAgICAgICB2YXIgY29udGVudFByb3ZpZGVyID0gbmV3IFdlYkluc3BlY3Rvci5SZXNvdXJj ZUNvbnRlbnRQcm92aWRlcihyZXNvdXJjZSk7CisgICAgICAgICAgICB2YXIgZm9ybWF0dGVkQ29u dGVudFByb3ZpZGVyID0gbmV3IFdlYkluc3BlY3Rvci5Gb3JtYXR0ZWRDb250ZW50UHJvdmlkZXIo Y29udGVudFByb3ZpZGVyLCBmb3JtYXR0ZXIpOworICAgICAgICAgICAgZnVuY3Rpb24gZGlkUmVx dWVzdENvbnRlbnQobWltZVR5cGUsIGNvbnRlbnQpCisgICAgICAgICAgICB7CisgICAgICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRFcXVhbHMoInRleHQvaHRtbCIsIG1pbWVUeXBlKTsK KyAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydEVxdWFscygiPGZvcm1hdHRlZD4g PHJlc291cmNlIGNvbnRlbnQ+IiwgY29udGVudCk7CisgICAgICAgICAgICAgICAgSW5zcGVjdG9y VGVzdC5hc3NlcnRFcXVhbHMobWFwcGluZywgZm9ybWF0dGVkQ29udGVudFByb3ZpZGVyLm1hcHBp bmcpOworICAgICAgICAgICAgICAgIG5leHQoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAg IGZvcm1hdHRlZENvbnRlbnRQcm92aWRlci5yZXF1ZXN0Q29udGVudChkaWRSZXF1ZXN0Q29udGVu dCk7CiAgICAgICAgIH0KICAgICBdKTsKIH07CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1wYW5lbC5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2RlYnVnZ2VyL3NjcmlwdHMtcGFuZWwuaHRtbAppbmRleCAwNTVhOGRjYWNlZDAxOGIzNzU0MzAx MzM3NWEyNGY1MmRmZGVjMjNjLi42ZmU1ZDYzOTQ5NGFlMzZkMGFkOGQ2MGFhZGRlZGUyY2Q0OGQ0 MmFmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1w YW5lbC5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBh bmVsLmh0bWwKQEAgLTEwLDcgKzEwLDYgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgewogICAgICAg ICB2YXIgbW9kZWwgPSBuZXcgV2ViSW5zcGVjdG9yLk9iamVjdCgpOwogICAgICAgICBtb2RlbC5i cmVha3BvaW50c0ZvclVJU291cmNlQ29kZSA9IGZ1bmN0aW9uKCkgeyByZXR1cm4gW107IH07Ci0g ICAgICAgIG1vZGVsLm1lc3NhZ2VzRm9yVUlTb3VyY2VDb2RlID0gZnVuY3Rpb24oKSB7IHJldHVy biBbXTsgfTsKICAgICAgICAgcmV0dXJuIG1vZGVsOwogICAgIH0KICAgICBmdW5jdGlvbiBhZGRV SVNvdWNlQ29kZShtb2RlbCwgdXJsKQpAQCAtMTYyLDcgKzE2MSw3IEBAIGZ1bmN0aW9uIHRlc3Qo KQogCiAgICAgICAgICAgICBhZGRVSVNvdWNlQ29kZShtb2RlbCwgImZvby5qcyIpOwogICAgICAg ICAgICAgdmFyIHVpU291cmNlQ29kZSA9IGFkZFVJU291Y2VDb2RlKG1vZGVsLCAiYmFyLmpzIik7 Ci0gICAgICAgICAgICBwYW5lbC5fdWlTb3VyY2VDb2RlUmVwbGFjZWQoeyBkYXRhOiB7IG9sZFVJ U291cmNlQ29kZTogdWlTb3VyY2VDb2RlLCB1aVNvdXJjZUNvZGU6IHVpU291cmNlQ29kZSB9fSk7 CisgICAgICAgICAgICBwYW5lbC5fdWlTb3VyY2VDb2RlUmVwbGFjZWQoeyBkYXRhOiB7IG9sZFNv dXJjZUNvZGU6IHVpU291cmNlQ29kZSwgc291cmNlQ29kZTogdWlTb3VyY2VDb2RlIH19KTsKICAg ICAgICAgICAgIHNob3dTb3VyY2VGcmFtZShwYW5lbCwgImJhci5qcyIpOwogICAgICAgICAgICAg bmV4dCgpOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVi dWdnZXIvc291cmNlLWZyYW1lLWNvdW50Lmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVi dWdnZXIvc291cmNlLWZyYW1lLWNvdW50Lmh0bWwKaW5kZXggNzVmMmVlN2EwZjNlNTgxY2M2NDNj ODhjMTg2OTlkNzlmOWIyMmFiOC4uODlkYTI5YjM5YWIwNTg4ZDRlMDU0Njk1YTNlNmRlN2YzMDU4 NDYwNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NvdXJjZS1m cmFtZS1jb3VudC5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zb3Vy Y2UtZnJhbWUtY291bnQuaHRtbApAQCAtMzEsMTMgKzMxLDggQEAgZnVuY3Rpb24gdGVzdCgpCiAK ICAgICAgICAgICAgIGZ1bmN0aW9uIGRpZFJlbG9hZCgpCiAgICAgICAgICAgICB7Ci0gICAgICAg ICAgICAgICAgSW5zcGVjdG9yVGVzdC5zaG93U2NyaXB0U291cmNlKCJzb3VyY2UtZnJhbWUtY291 bnQuaHRtbCIsIGRpZFNob3dTY3JpcHRTb3VyY2VBZ2Fpbik7Ci0gICAgICAgICAgICB9Ci0KLSAg ICAgICAgICAgIGZ1bmN0aW9uIGRpZFNob3dTY3JpcHRTb3VyY2VBZ2FpbigpCi0gICAgICAgICAg ICB7CiAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRUcnVlKHNlbGVjdFtzZWxl Y3Quc2VsZWN0ZWRJbmRleF0udGV4dC5pbmRleE9mKCJzb3VyY2UtZnJhbWUtY291bnQuaHRtbCIp ICE9PSAtMSk7Ci0gICAgICAgICAgICAgICAgLy8gVGhlcmUgc2hvdWxkIGJlIG1heGltdW0gMiBz b3VyY2UgZnJhbWVzOiBmaXJzdCBvbmUgaXMgdGhlIGZpcnN0IHNob3duLCBzZWNvbmQgb25lIGlz IHRoZSBsYXN0IHZpZXdlZCAoInNvdXJjZS1mcmFtZS1jb3VudC5odG1sIikuCisgICAgICAgICAg ICAgICAgLy8gVGhlcmUgc2hvdWxkIGJlIG1heGltdW0gMiBzb3VyY2UgZnJhbWVzOiBmaXJzdCBv bmUgaXMgdGhlIGZpcnN0IHNob3duLCBzZWNvbmQgb25lIGlzIHRoZSBsYXN0IHZpZXdlZCAoInNj cmlwdHMtcGFuZWwuaHRtbCIpLgogICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0 RXF1YWxzKHRydWUsIHNvdXJjZUZyYW1lQ291bnQgPD0gMiwgInRvbyBtYW55IHNvdXJjZSBmcmFt ZXMgY3JlYXRlZCBhZnRlciBwYWdlIHJlbG9hZCIpOwogICAgICAgICAgICAgICAgIG5leHQoKTsK ICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhNjdhZGMwZWZlYjhhNzNlYzc2OGUxMjQ5NDli ZWU1MGYyNWU3NGYwLi41NTFkM2NkZGEwZmU5Y2EyOGFiYmM0MWU3YjkyNmE3YmFlODM0YmU1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsNDUgQEAKKzIwMTEtMDktMDYgIFNoZXJpZmYgQm90ICA8d2Vi a2l0LnJldmlldy5ib3RAZ21haWwuY29tPgorCisgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcg b3V0IHI5NDU2MC4KKyAgICAgICAgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvOTQ1 NjAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY3NjM2 CisKKyAgICAgICAgSXQgbWFkZSBpbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0LWZvcm1hdHRlci5o dG1sIGZsYWtleQorICAgICAgICAoUmVxdWVzdGVkIGJ5IE9zc3kgb24gI3dlYmtpdCkuCisKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRNYW5hZ2VyLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyLnByb3RvdHlwZS5zZXQgcmVzZXQpOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3Rv dHlwZS5fYWRkU2NyaXB0LmRpZENyZWF0ZVNvdXJjZU1hcHBpbmcpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLl9hZGRTY3JpcHQpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBl Ll91aVNvdXJjZUNvZGVSZXBsYWNlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQ cmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuc2V0Rm9ybWF0U291cmNlKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZS5fYWRkQ29uc29s ZU1lc3NhZ2UuZGlkR2V0VUlMb2NhdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdn ZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuX2FkZENvbnNvbGVNZXNzYWdlKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5QcmVzZW5hdGlvbkNhbGxGcmFtZS5wcm90b3R5cGUuc2VsZWN0KToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl91aVNvdXJjZUNvZGVSZXBsYWNl ZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fc291cmNl RnJhbWVMb2FkZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRmlsZS5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5SYXdTb3VyY2VDb2RlLnByb3RvdHlwZS5hZGRTY3JpcHQpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlJhd1NvdXJjZUNvZGUucHJvdG90eXBlLmNvbnRlbnRFZGl0ZWQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlJhd1NvdXJjZUNvZGUucHJvdG90eXBlLnJlcXVlc3RDb250ZW50KToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlLnByb3RvdHlwZS5jcmVhdGVTb3Vy Y2VNYXBwaW5nSWZOZWVkZWQuZGlkUmVxdWVzdENvbnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlJhd1NvdXJjZUNvZGUucHJvdG90eXBlLmNyZWF0ZVNvdXJjZU1hcHBpbmdJZk5lZWRlZCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZS5wcm90b3R5cGUuX3NldENvbnRl bnRQcm92aWRlcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZS5wcm90b3R5 cGUuZm9yY2VMb2FkQ29udGVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29k ZS5wcm90b3R5cGUuX3JlbG9hZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29k ZS5wcm90b3R5cGUuX3JlcXVlc3RDb250ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SYXdT b3VyY2VDb2RlLnByb3RvdHlwZS5fbG9hZFJlc291cmNlQ29udGVudCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuUmF3U291cmNlQ29kZS5wcm90b3R5cGUuX2xvYWRTY3JpcHRDb250ZW50KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlLnByb3RvdHlwZS5fbG9hZEFuZENvbmNh dGVuYXRlU2NyaXB0c0NvbnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJhd1NvdXJjZUNv ZGUucHJvdG90eXBlLl9kaWRSZXF1ZXN0Q29udGVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu UmF3U291cmNlQ29kZS5wcm90b3R5cGUuX2hhc1BlbmRpbmdSZXNvdXJjZSk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuRm9ybWF0dGVkQ29udGVudFByb3ZpZGVyKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5Gb3JtYXR0ZWRDb250ZW50UHJvdmlkZXIucHJvdG90eXBlLnJlcXVlc3RDb250ZW50LmRp ZFJlcXVlc3RDb250ZW50LmRpZEZvcm1hdENvbnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkZvcm1hdHRlZENvbnRlbnRQcm92aWRlci5wcm90b3R5cGUucmVxdWVzdENvbnRlbnQpOgorCiAy MDExLTA5LTA2ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njc0ODAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludE1hbmFnZXIuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRNYW5hZ2VyLmpz CmluZGV4IDkyODllOTUxMWM5Yzk4YTlmY2ZmZjdiYzg1YWJhZDliN2U2N2Q0MmUuLjBhZWM2ZTAx MmM4N2U3NTcyNjM1NGExMGU0OWExMzM5Zjk2ZTMwOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludE1hbmFnZXIuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50TWFuYWdlci5qcwpAQCAtMjE0 LDYgKzIxNCw3IEBAIFdlYkluc3BlY3Rvci5CcmVha3BvaW50TWFuYWdlci5wcm90b3R5cGUgPSB7 CiAgICAgewogICAgICAgICBmdW5jdGlvbiByZXNldEJyZWFrcG9pbnQoYnJlYWtwb2ludCkKICAg ICAgICAgeworICAgICAgICAgICAgZGVsZXRlIGJyZWFrcG9pbnQudWlTb3VyY2VDb2RlOwogICAg ICAgICAgICAgdGhpcy5fcmVtb3ZlQnJlYWtwb2ludEZyb21EZWJ1Z2dlcihicmVha3BvaW50KTsK ICAgICAgICAgfQogICAgICAgICB0aGlzLl9mb3JFYWNoQnJlYWtwb2ludChyZXNldEJyZWFrcG9p bnQuYmluZCh0aGlzKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKaW5kZXggNjY3ODNj NGU2MGI2NjQ1NjFmZTg5Yjk3YmIwMDY2Y2RiODNmZWExYi4uZjJkNDA1OTM2NWM4ZTI5NGNlM2M3 MjU0NzUxNDM4ZGY0YmEzY2YwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcwpAQCAt MTU3LDM5ICsxNTcsMjcgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwu cHJvdG90eXBlID0gewogCiAgICAgICAgIHJhd1NvdXJjZUNvZGUgPSBuZXcgV2ViSW5zcGVjdG9y LlJhd1NvdXJjZUNvZGUocmF3U291cmNlQ29kZUlkLCBzY3JpcHQsIHRoaXMuX2Zvcm1hdHRlciwg dGhpcy5fZm9ybWF0U291cmNlKTsKICAgICAgICAgdGhpcy5fcmF3U291cmNlQ29kZVtyYXdTb3Vy Y2VDb2RlSWRdID0gcmF3U291cmNlQ29kZTsKLSAgICAgICAgcmF3U291cmNlQ29kZS5hZGRFdmVu dExpc3RlbmVyKFdlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlLkV2ZW50cy5Tb3VyY2VNYXBwaW5n VXBkYXRlZCwgdGhpcy5fc291cmNlTWFwcGluZ1VwZGF0ZWQsIHRoaXMpOwotICAgIH0sCisgICAg ICAgIHJhd1NvdXJjZUNvZGUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUmF3U291cmNl Q29kZS5FdmVudHMuVUlTb3VyY2VDb2RlUmVwbGFjZWQsIHRoaXMuX3VpU291cmNlQ29kZVJlcGxh Y2VkLCB0aGlzKTsKIAotICAgIF9zb3VyY2VNYXBwaW5nVXBkYXRlZDogZnVuY3Rpb24oZXZlbnQp Ci0gICAgewotICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX3NvdXJjZU1hcHBpbmdM aXN0ZW5lcnMubGVuZ3RoOyArK2kpCi0gICAgICAgICAgICB0aGlzLl9zb3VyY2VNYXBwaW5nTGlz dGVuZXJzW2ldKCk7CisgICAgICAgIGZ1bmN0aW9uIGRpZENyZWF0ZVNvdXJjZU1hcHBpbmcoKQor ICAgICAgICB7CisgICAgICAgICAgICB0aGlzLl9icmVha3BvaW50TWFuYWdlci51aVNvdXJjZUNv ZGVBZGRlZChyYXdTb3VyY2VDb2RlLnVpU291cmNlQ29kZSk7CisgICAgICAgICAgICB2YXIgYnJl YWtwb2ludHMgPSB0aGlzLl9icmVha3BvaW50TWFuYWdlci5icmVha3BvaW50c0ZvclVJU291cmNl Q29kZShyYXdTb3VyY2VDb2RlLnVpU291cmNlQ29kZSk7CisgICAgICAgICAgICBmb3IgKHZhciBs aW5lTnVtYmVyIGluIGJyZWFrcG9pbnRzKQorICAgICAgICAgICAgICAgIHRoaXMuX2JyZWFrcG9p bnRBZGRlZChicmVha3BvaW50c1tsaW5lTnVtYmVyXSk7CisgICAgICAgIH0KKyAgICAgICAgLy8g RklYTUU6IGZvcmNlIHNvdXJjZSBmb3JtYXR0aW5nIGlmIG5lZWRlZC4gVGhpcyB3aWxsIGdvIGF3 YXkgb25jZSBmb3JtYXR0aW5nCisgICAgICAgIC8vIGlzIGZ1bGx5IGVuY2Fwc3VsYXRlZCBpbiBS YXdTb3VyY2VDb2RlIGNsYXNzLgorICAgICAgICByYXdTb3VyY2VDb2RlLmNyZWF0ZVNvdXJjZU1h cHBpbmdJZk5lZWRlZChkaWRDcmVhdGVTb3VyY2VNYXBwaW5nLmJpbmQodGhpcykpOwogCi0gICAg ICAgIHZhciByYXdTb3VyY2VDb2RlID0gZXZlbnQudGFyZ2V0OwotICAgICAgICB2YXIgb2xkVUlT b3VyY2VDb2RlID0gZXZlbnQuZGF0YS5vbGRVSVNvdXJjZUNvZGU7CiAgICAgICAgIHZhciB1aVNv dXJjZUNvZGUgPSByYXdTb3VyY2VDb2RlLnVpU291cmNlQ29kZTsKLQotICAgICAgICBpZiAoIW9s ZFVJU291cmNlQ29kZSkKLSAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJz KFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLkV2ZW50cy5VSVNvdXJjZUNv ZGVBZGRlZCwgdWlTb3VyY2VDb2RlKTsKLSAgICAgICAgZWxzZSB7Ci0gICAgICAgICAgICB2YXIg YnJlYWtwb2ludHMgPSB0aGlzLl9icmVha3BvaW50TWFuYWdlci5icmVha3BvaW50c0ZvclVJU291 cmNlQ29kZShvbGRVSVNvdXJjZUNvZGUpOwotICAgICAgICAgICAgZm9yICh2YXIgbGluZU51bWJl ciBpbiBicmVha3BvaW50cykgewotICAgICAgICAgICAgICAgIHZhciBicmVha3BvaW50ID0gYnJl YWtwb2ludHNbbGluZU51bWJlcl07Ci0gICAgICAgICAgICAgICAgdGhpcy5fYnJlYWtwb2ludFJl bW92ZWQoYnJlYWtwb2ludCk7Ci0gICAgICAgICAgICAgICAgZGVsZXRlIGJyZWFrcG9pbnQudWlT b3VyY2VDb2RlOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgdmFyIGV2ZW50RGF0YSA9IHsg dWlTb3VyY2VDb2RlOiB1aVNvdXJjZUNvZGUsIG9sZFVJU291cmNlQ29kZTogb2xkVUlTb3VyY2VD b2RlIH07Ci0gICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNw ZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMuVUlTb3VyY2VDb2RlUmVwbGFj ZWQsIGV2ZW50RGF0YSk7Ci0gICAgICAgIH0KLSAgICAgICAgdGhpcy5fcmVzdG9yZUJyZWFrcG9p bnRzKHVpU291cmNlQ29kZSk7CisgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJz KFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLkV2ZW50cy5VSVNvdXJjZUNv ZGVBZGRlZCwgdWlTb3VyY2VDb2RlKTsKICAgICB9LAogCi0gICAgX3Jlc3RvcmVCcmVha3BvaW50 czogZnVuY3Rpb24odWlTb3VyY2VDb2RlKQorICAgIF91aVNvdXJjZUNvZGVSZXBsYWNlZDogZnVu Y3Rpb24oZXZlbnQpCiAgICAgewotICAgICAgICB0aGlzLl9icmVha3BvaW50TWFuYWdlci51aVNv dXJjZUNvZGVBZGRlZCh1aVNvdXJjZUNvZGUpOwotICAgICAgICB2YXIgYnJlYWtwb2ludHMgPSB0 aGlzLl9icmVha3BvaW50TWFuYWdlci5icmVha3BvaW50c0ZvclVJU291cmNlQ29kZSh1aVNvdXJj ZUNvZGUpOwotICAgICAgICBmb3IgKHZhciBsaW5lTnVtYmVyIGluIGJyZWFrcG9pbnRzKQotICAg ICAgICAgICAgdGhpcy5fYnJlYWtwb2ludEFkZGVkKGJyZWFrcG9pbnRzW2xpbmVOdW1iZXJdKTsK KyAgICAgICAgLy8gRklYTUU6IHJlc3RvcmUgYnJlYWtwb2ludHMgaW4gbmV3IHNvdXJjZSBjb2Rl IChjdXJyZW50bHkgd2UganVzdCByZWNyZWF0ZSBldmVyeXRoaW5nIHdoZW4gc3dpdGNoaW5nIHRv IHByZXR0eS1wcmludCBtb2RlKS4KKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5l cnMoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzLlVJU291cmNl Q29kZVJlcGxhY2VkLCBldmVudC5kYXRhKTsKICAgICB9LAogCiAgICAgY2FuRWRpdFNjcmlwdFNv dXJjZTogZnVuY3Rpb24odWlTb3VyY2VDb2RlKQpAQCAtMjYyLDggKzI1MCw2IEBAIFdlYkluc3Bl Y3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhp cy5fZm9ybWF0U291cmNlID0gZm9ybWF0U291cmNlOwogCiAgICAgICAgIHRoaXMuX2JyZWFrcG9p bnRNYW5hZ2VyLnJlc2V0KCk7Ci0gICAgICAgIGZvciAodmFyIGlkIGluIHRoaXMuX3Jhd1NvdXJj ZUNvZGUpCi0gICAgICAgICAgICB0aGlzLl9yYXdTb3VyY2VDb2RlW2lkXS5yZW1vdmVFdmVudExp c3RlbmVyKFdlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlLkV2ZW50cy5Tb3VyY2VNYXBwaW5nVXBk YXRlZCwgdGhpcy5fc291cmNlTWFwcGluZ1VwZGF0ZWQsIHRoaXMpOwogICAgICAgICB0aGlzLl9y YXdTb3VyY2VDb2RlID0ge307CiAgICAgICAgIHZhciBtZXNzYWdlcyA9IHRoaXMuX21lc3NhZ2Vz OwogICAgICAgICB0aGlzLl9tZXNzYWdlcyA9IFtdOwpAQCAtMzA0LDcgKzI5MCw3IEBAIFdlYklu c3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAg ICAgIHByZXNlbnRhdGlvbk1lc3NhZ2UudWlTb3VyY2VDb2RlID0gdWlTb3VyY2VDb2RlOwogICAg ICAgICAgICAgcHJlc2VudGF0aW9uTWVzc2FnZS5saW5lTnVtYmVyID0gbGluZU51bWJlcjsKICAg ICAgICAgICAgIHByZXNlbnRhdGlvbk1lc3NhZ2Uub3JpZ2luYWxNZXNzYWdlID0gbWVzc2FnZTsK LSAgICAgICAgICAgIHJhd1NvdXJjZUNvZGUubWVzc2FnZXMucHVzaChwcmVzZW50YXRpb25NZXNz YWdlKTsKKyAgICAgICAgICAgIHVpU291cmNlQ29kZS5tZXNzYWdlcy5wdXNoKHByZXNlbnRhdGlv bk1lc3NhZ2UpOwogICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2Vi SW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzLkNvbnNvbGVNZXNzYWdl QWRkZWQsIHByZXNlbnRhdGlvbk1lc3NhZ2UpOwogICAgICAgICB9CiAgICAgICAgIC8vIEZJWE1F KDYyNzI1KTogc3RhY2sgdHJhY2UgbGluZS9jb2x1bW4gbnVtYmVycyBhcmUgb25lLWJhc2VkLgpA QCAtMzM5LDEyICszMjUsNiBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2Rl bC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiBicmVha3BvaW50c0xpc3Q7CiAgICAgfSwK IAotICAgIG1lc3NhZ2VzRm9yVUlTb3VyY2VDb2RlOiBmdW5jdGlvbih1aVNvdXJjZUNvZGUpCi0g ICAgewotICAgICAgICB2YXIgcmF3U291cmNlQ29kZSA9IHVpU291cmNlQ29kZS5yYXdTb3VyY2VD b2RlOwotICAgICAgICByZXR1cm4gcmF3U291cmNlQ29kZS5tZXNzYWdlczsKLSAgICB9LAotCiAg ICAgc2V0QnJlYWtwb2ludDogZnVuY3Rpb24odWlTb3VyY2VDb2RlLCBsaW5lTnVtYmVyLCBjb25k aXRpb24sIGVuYWJsZWQpCiAgICAgewogICAgICAgICB0aGlzLl9icmVha3BvaW50TWFuYWdlci5z ZXRCcmVha3BvaW50KHVpU291cmNlQ29kZSwgbGluZU51bWJlciwgY29uZGl0aW9uLCBlbmFibGVk KTsKQEAgLTUxNSw3ICs0OTUsNyBAQCBXZWJJbnNwZWN0b3IuUHJlc2VuYXRpb25DYWxsRnJhbWUu cHJvdG90eXBlID0gewogICAgIHNlbGVjdDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgaWYg KHRoaXMuX3VpU291cmNlQ29kZSkKLSAgICAgICAgICAgIHRoaXMuX3VpU291cmNlQ29kZS5yYXdT b3VyY2VDb2RlLmZvcmNlVXBkYXRlU291cmNlTWFwcGluZygpOworICAgICAgICAgICAgdGhpcy5f dWlTb3VyY2VDb2RlLmZvcmNlTG9hZENvbnRlbnQodGhpcy5fc2NyaXB0KTsKICAgICB9LAogCiAg ICAgZXZhbHVhdGU6IGZ1bmN0aW9uKGNvZGUsIG9iamVjdEdyb3VwLCBpbmNsdWRlQ29tbWFuZExp bmVBUEksIHJldHVybkJ5VmFsdWUsIGNhbGxiYWNrKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwppbmRleCBiMzA3YWZmMjg0NGJhMTZk ZDNhMjNkNzcyYTAxNWQyMDZjYzgxMmI1Li5iYjhkMzlmNTk2OWFmNWE0MzFlYThmZjI5OTY3YzEz ZmZkMDVjOGI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NjcmlwdHNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NjcmlwdHNQYW5lbC5qcwpAQCAtNjcxLDEzICs2NzEsMTEgQEAgV2ViSW5zcGVjdG9yLlNjcmlw dHNQYW5lbC5wcm90b3R5cGUgPSB7CiAKICAgICBfdWlTb3VyY2VDb2RlUmVwbGFjZWQ6IGZ1bmN0 aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgdmFyIG9sZFVJU291cmNlQ29kZSA9IGV2ZW50LmRh dGEub2xkVUlTb3VyY2VDb2RlOwotICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gZXZlbnQuZGF0 YS51aVNvdXJjZUNvZGU7CisgICAgICAgIHZhciBvbGRVSVNvdXJjZUNvZGUgPSBldmVudC5kYXRh Lm9sZFNvdXJjZUNvZGU7CisgICAgICAgIHZhciB1aVNvdXJjZUNvZGUgPSBldmVudC5kYXRhLnNv dXJjZUNvZGU7CiAKICAgICAgICAgLy8gUmUtYmluZCBmaWxlIHNlbGVjdCBvcHRpb24gZnJvbSBv bGQgc291cmNlIGZpbGUgdG8gbmV3IG9uZS4KICAgICAgICAgdmFyIG9wdGlvbiA9IG9sZFVJU291 cmNlQ29kZS5fb3B0aW9uOwotICAgICAgICBpZiAoIW9wdGlvbikKLSAgICAgICAgICAgIHJldHVy bjsKICAgICAgICAgZGVsZXRlIG9sZFVJU291cmNlQ29kZS5fb3B0aW9uOwogICAgICAgICBvcHRp b24uX3VpU291cmNlQ29kZSA9IHVpU291cmNlQ29kZTsKICAgICAgICAgdWlTb3VyY2VDb2RlLl9v cHRpb24gPSBvcHRpb247CkBAIC02OTMsNyArNjkxLDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQ YW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBzb3VyY2VGcmFtZSA9IGV2ZW50LnRhcmdl dDsKICAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9IHNvdXJjZUZyYW1lLl91aVNvdXJjZUNvZGU7 CiAKLSAgICAgICAgdmFyIG1lc3NhZ2VzID0gdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwubWVzc2Fn ZXNGb3JVSVNvdXJjZUNvZGUodWlTb3VyY2VDb2RlKTsKKyAgICAgICAgdmFyIG1lc3NhZ2VzID0g dWlTb3VyY2VDb2RlLm1lc3NhZ2VzOwogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IG1lc3Nh Z2VzLmxlbmd0aDsgKytpKSB7CiAgICAgICAgICAgICB2YXIgbWVzc2FnZSA9IG1lc3NhZ2VzW2ld OwogICAgICAgICAgICAgc291cmNlRnJhbWUuYWRkTWVzc2FnZVRvU291cmNlKG1lc3NhZ2UubGlu ZU51bWJlciwgbWVzc2FnZS5vcmlnaW5hbE1lc3NhZ2UpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGaWxlLmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGaWxlLmpzCmluZGV4IDEzNmZhMDM2OGNkYzVlMjc1 ZWEwOThmZGM2NTU5YzMyYzFlN2I3ZTAuLjBiZmRhYzgwZGNhNDhhNGVkY2Q4NTBiMTlkMGZlYjE1 NjBlZTFiOGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U291cmNlRmlsZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nv dXJjZUZpbGUuanMKQEAgLTQzLDI5ICs0MywyNSBAQCBXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29k ZSA9IGZ1bmN0aW9uKGlkLCBzY3JpcHQsIGZvcm1hdHRlciwgZm9ybWF0dGVkKQogCiAgICAgaWYg KHNjcmlwdC5zb3VyY2VVUkwpCiAgICAgICAgIHRoaXMuX3Jlc291cmNlID0gV2ViSW5zcGVjdG9y Lm5ldHdvcmtNYW5hZ2VyLmluZmxpZ2h0UmVzb3VyY2VGb3JVUkwoc2NyaXB0LnNvdXJjZVVSTCkg fHwgV2ViSW5zcGVjdG9yLnJlc291cmNlRm9yVVJMKHNjcmlwdC5zb3VyY2VVUkwpOworICAgIHRo aXMuX3JlcXVlc3RDb250ZW50Q2FsbGJhY2tzID0gW107CiAKICAgICB0aGlzLmlkID0gaWQ7CiAg ICAgdGhpcy51cmwgPSBzY3JpcHQuc291cmNlVVJMOwogICAgIHRoaXMuaXNDb250ZW50U2NyaXB0 ID0gc2NyaXB0LmlzQ29udGVudFNjcmlwdDsKICAgICB0aGlzLm1lc3NhZ2VzID0gW107CiAKLSAg ICB0aGlzLl91c2VUZW1wb3JhcnlDb250ZW50ID0gdGhpcy5fcmVzb3VyY2UgJiYgIXRoaXMuX3Jl c291cmNlLmZpbmlzaGVkOwotICAgIHRoaXMuX2hhc05ld1NjcmlwdHMgPSB0cnVlOwotICAgIGlm ICghdGhpcy5fdXNlVGVtcG9yYXJ5Q29udGVudCkKLSAgICAgICAgdGhpcy5fdXBkYXRlU291cmNl TWFwcGluZygpOwotICAgIGVsc2UgaWYgKHRoaXMuX3Jlc291cmNlKQotICAgICAgICB0aGlzLl9y ZXNvdXJjZS5hZGRFdmVudExpc3RlbmVyKCJmaW5pc2hlZCIsIHRoaXMuX3Jlc291cmNlRmluaXNo ZWQuYmluZCh0aGlzKSk7CisgICAgaWYgKHRoaXMuX2hhc1BlbmRpbmdSZXNvdXJjZSgpKQorICAg ICAgICB0aGlzLl9yZXNvdXJjZS5hZGRFdmVudExpc3RlbmVyKCJmaW5pc2hlZCIsIHRoaXMuX3Jl bG9hZC5iaW5kKHRoaXMpKTsKIH0KIAogV2ViSW5zcGVjdG9yLlJhd1NvdXJjZUNvZGUuRXZlbnRz ID0gewotICAgIFNvdXJjZU1hcHBpbmdVcGRhdGVkOiAic291cmNlLW1hcHBpbmctdXBkYXRlZCIK KyAgICBVSVNvdXJjZUNvZGVSZXBsYWNlZDogInVpLXNvdXJjZS1jb2RlLXJlcGxhY2VkIgogfQog CiBXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZS5wcm90b3R5cGUgPSB7CiAgICAgYWRkU2NyaXB0 OiBmdW5jdGlvbihzY3JpcHQpCiAgICAgewogICAgICAgICB0aGlzLl9zY3JpcHRzLnB1c2goc2Ny aXB0KTsKLSAgICAgICAgdGhpcy5faGFzTmV3U2NyaXB0cyA9IHRydWU7CiAgICAgfSwKIAogICAg IGdldCB1aVNvdXJjZUNvZGUoKQpAQCAtODIsMTMgKzc4LDcgQEAgV2ViSW5zcGVjdG9yLlJhd1Nv dXJjZUNvZGUucHJvdG90eXBlID0gewogCiAgICAgY29udGVudEVkaXRlZDogZnVuY3Rpb24oKQog ICAgIHsKLSAgICAgICAgdGhpcy5fdXBkYXRlU291cmNlTWFwcGluZygpOwotICAgIH0sCi0KLSAg ICBfcmVzb3VyY2VGaW5pc2hlZDogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgdGhpcy5fdXNl VGVtcG9yYXJ5Q29udGVudCA9IGZhbHNlOwotICAgICAgICB0aGlzLl91cGRhdGVTb3VyY2VNYXBw aW5nKCk7CisgICAgICAgIHRoaXMuX3JlbG9hZCgpOwogICAgIH0sCiAKICAgICByYXdMb2NhdGlv blRvVUlMb2NhdGlvbjogZnVuY3Rpb24ocmF3TG9jYXRpb24pCkBAIC0xMjIsOTMgKzExMiwxMjYg QEAgV2ViSW5zcGVjdG9yLlJhd1NvdXJjZUNvZGUucHJvdG90eXBlID0gewogCiAgICAgcmVxdWVz dENvbnRlbnQ6IGZ1bmN0aW9uKGNhbGxiYWNrKQogICAgIHsKLSAgICAgICAgLy8gRklYTUU6IHJl bW92ZSB0aGlzLgotICAgICAgICB0aGlzLl91aVNvdXJjZUNvZGUucmVxdWVzdENvbnRlbnQoY2Fs bGJhY2spOworICAgICAgICBpZiAodGhpcy5fY29udGVudExvYWRlZCkgeworICAgICAgICAgICAg Y2FsbGJhY2sodGhpcy5fbWltZVR5cGUsIHRoaXMuX2NvbnRlbnQpOworICAgICAgICAgICAgcmV0 dXJuOworICAgICAgICB9CisKKyAgICAgICAgdGhpcy5fcmVxdWVzdENvbnRlbnRDYWxsYmFja3Mu cHVzaChjYWxsYmFjayk7CisgICAgICAgIHRoaXMuX3JlcXVlc3RDb250ZW50KCk7CiAgICAgfSwK IAogICAgIGNyZWF0ZVNvdXJjZU1hcHBpbmdJZk5lZWRlZDogZnVuY3Rpb24oY2FsbGJhY2spCiAg ICAgewotICAgICAgICAvLyBGSVhNRTogcmVtb3ZlIGNyZWF0ZVNvdXJjZU1hcHBpbmdJZk5lZWRl ZCwgY2xpZW50IHNob3VsZCBsaXN0ZW4gdG8gU291cmNlTWFwcGluZ1VwZGF0ZWQgZXZlbnQgaW5z dGVhZC4KLSAgICAgICAgaWYgKHRoaXMuX3VpU291cmNlQ29kZSAmJiAhdGhpcy5fdXBkYXRpbmdT b3VyY2VNYXBwaW5nKSB7CisgICAgICAgIGlmICghdGhpcy5fZm9ybWF0dGVkKSB7CiAgICAgICAg ICAgICBjYWxsYmFjaygpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAg ICAgZnVuY3Rpb24gc291cmNlTWFwcGluZ1VwZGF0ZWQoKQorICAgICAgICBmdW5jdGlvbiBkaWRS ZXF1ZXN0Q29udGVudCgpCiAgICAgICAgIHsKLSAgICAgICAgICAgIHRoaXMucmVtb3ZlRXZlbnRM aXN0ZW5lcihXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZS5FdmVudHMuU291cmNlTWFwcGluZ1Vw ZGF0ZWQsIHNvdXJjZU1hcHBpbmdVcGRhdGVkLCB0aGlzKTsKICAgICAgICAgICAgIGNhbGxiYWNr KCk7CiAgICAgICAgIH0KLSAgICAgICAgdGhpcy5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rv ci5SYXdTb3VyY2VDb2RlLkV2ZW50cy5Tb3VyY2VNYXBwaW5nVXBkYXRlZCwgc291cmNlTWFwcGlu Z1VwZGF0ZWQsIHRoaXMpOworICAgICAgICAvLyBGb3JjZSBjb250ZW50IGZvcm1hdHRpbmcgdG8g b2J0YWluIHRoZSBtYXBwaW5nLgorICAgICAgICB0aGlzLnJlcXVlc3RDb250ZW50KGRpZFJlcXVl c3RDb250ZW50LmJpbmQodGhpcykpOwogICAgIH0sCiAKLSAgICBmb3JjZVVwZGF0ZVNvdXJjZU1h cHBpbmc6IGZ1bmN0aW9uKHNjcmlwdCkKKyAgICBfc2V0Q29udGVudFByb3ZpZGVyOiBmdW5jdGlv bihjb250ZW50UHJvdmlkZXIpCiAgICAgewotICAgICAgICBpZiAoIXRoaXMuX3VzZVRlbXBvcmFy eUNvbnRlbnQgfHwgIXRoaXMuX2hhc05ld1NjcmlwdHMpCi0gICAgICAgICAgICByZXR1cm47Ci0g ICAgICAgIHRoaXMuX2hhc05ld1NjcmlwdHMgPSBmYWxzZTsKLSAgICAgICAgdGhpcy5fdXBkYXRl U291cmNlTWFwcGluZygpOworICAgICAgICBpZiAodGhpcy5fZm9ybWF0dGVkKQorICAgICAgICAg ICAgdGhpcy5fY29udGVudFByb3ZpZGVyID0gbmV3IFdlYkluc3BlY3Rvci5Gb3JtYXR0ZWRDb250 ZW50UHJvdmlkZXIoY29udGVudFByb3ZpZGVyLCB0aGlzLl9mb3JtYXR0ZXIpOworICAgICAgICBl bHNlCisgICAgICAgICAgICB0aGlzLl9jb250ZW50UHJvdmlkZXIgPSBjb250ZW50UHJvdmlkZXI7 CiAgICAgfSwKIAotICAgIF91cGRhdGVTb3VyY2VNYXBwaW5nOiBmdW5jdGlvbigpCisgICAgZm9y Y2VMb2FkQ29udGVudDogZnVuY3Rpb24oc2NyaXB0KQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMu X3VwZGF0aW5nU291cmNlTWFwcGluZykgewotICAgICAgICAgICAgdGhpcy5fdXBkYXRlTmVlZGVk ID0gdHJ1ZTsKKyAgICAgICAgaWYgKCF0aGlzLl9oYXNQZW5kaW5nUmVzb3VyY2UoKSkKICAgICAg ICAgICAgIHJldHVybjsKLSAgICAgICAgfQotICAgICAgICB0aGlzLl91cGRhdGluZ1NvdXJjZU1h cHBpbmcgPSB0cnVlOwotICAgICAgICB0aGlzLl91cGRhdGVOZWVkZWQgPSBmYWxzZTsKIAotICAg ICAgICB2YXIgb3JpZ2luYWxDb250ZW50UHJvdmlkZXIgPSB0aGlzLl9jcmVhdGVDb250ZW50UHJv dmlkZXIoKTsKLSAgICAgICAgdGhpcy5fY3JlYXRlU291cmNlTWFwcGluZyhvcmlnaW5hbENvbnRl bnRQcm92aWRlciwgZGlkQ3JlYXRlU291cmNlTWFwcGluZy5iaW5kKHRoaXMpKTsKKyAgICAgICAg aWYgKCF0aGlzLl9jb25jYXRlbmF0ZWRTY3JpcHRzKQorICAgICAgICAgICAgdGhpcy5fY29uY2F0 ZW5hdGVkU2NyaXB0cyA9IHt9OworICAgICAgICBpZiAodGhpcy5fY29uY2F0ZW5hdGVkU2NyaXB0 c1tzY3JpcHQuc2NyaXB0SWRdKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBmb3IgKHZh ciBpID0gMDsgaSA8IHRoaXMuX3NjcmlwdHMubGVuZ3RoOyArK2kpCisgICAgICAgICAgICB0aGlz Ll9jb25jYXRlbmF0ZWRTY3JpcHRzW3RoaXMuX3NjcmlwdHNbaV0uc2NyaXB0SWRdID0gdHJ1ZTsK IAotICAgICAgICBmdW5jdGlvbiBkaWRDcmVhdGVTb3VyY2VNYXBwaW5nKGNvbnRlbnRQcm92aWRl ciwgbWFwcGluZykKLSAgICAgICAgewotICAgICAgICAgICAgdGhpcy5fdXBkYXRpbmdTb3VyY2VN YXBwaW5nID0gZmFsc2U7Ci0gICAgICAgICAgICBpZiAoIXRoaXMuX3VwZGF0ZU5lZWRlZCkKLSAg ICAgICAgICAgICAgICB0aGlzLl9zYXZlU291cmNlTWFwcGluZyhjb250ZW50UHJvdmlkZXIsIG1h cHBpbmcpOwotICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIHRoaXMuX3VwZGF0ZVNv dXJjZU1hcHBpbmcoKTsKKyAgICAgICAgdGhpcy5fcmVsb2FkKCk7CisKKyAgICAgICAgaWYgKCF0 aGlzLl9jb250ZW50UmVxdWVzdGVkKSB7CisgICAgICAgICAgICB0aGlzLl9jb250ZW50UmVxdWVz dGVkID0gdHJ1ZTsKKyAgICAgICAgICAgIHRoaXMuX2xvYWRBbmRDb25jYXRlbmF0ZVNjcmlwdHND b250ZW50KCk7CiAgICAgICAgIH0KICAgICB9LAogCi0gICAgX2NyZWF0ZUNvbnRlbnRQcm92aWRl cjogZnVuY3Rpb24oKQorICAgIF9yZWxvYWQ6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIGlm ICh0aGlzLl9yZXNvdXJjZSAmJiB0aGlzLl9yZXNvdXJjZS5maW5pc2hlZCkKLSAgICAgICAgICAg IHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLlJlc291cmNlQ29udGVudFByb3ZpZGVyKHRoaXMuX3Jl c291cmNlKTsKLSAgICAgICAgaWYgKHRoaXMuX3NjcmlwdHMubGVuZ3RoID09PSAxICYmICF0aGlz Ll9zY3JpcHRzWzBdLmxpbmVPZmZzZXQgJiYgIXRoaXMuX3NjcmlwdHNbMF0uY29sdW1uT2Zmc2V0 KQotICAgICAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuU2NyaXB0Q29udGVudFByb3Zp ZGVyKHRoaXMuX3NjcmlwdHNbMF0pOwotICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5D b25jYXRlbmF0ZWRTY3JpcHRzQ29udGVudFByb3ZpZGVyKHRoaXMuX3NjcmlwdHMpOworICAgICAg ICBpZiAodGhpcy5fY29udGVudExvYWRlZCkgeworICAgICAgICAgICAgdGhpcy5fY29udGVudExv YWRlZCA9IGZhbHNlOworICAgICAgICAgICAgLy8gRklYTUU6IGNyZWF0ZSBhbm90aGVyIFVJU291 cmNlQ29kZSBpbnN0YW5jZSBoZXJlLCBVSVNvdXJjZUNvZGUgc2hvdWxkIGJlIGltbXV0YWJsZS4K KyAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5S YXdTb3VyY2VDb2RlLkV2ZW50cy5VSVNvdXJjZUNvZGVSZXBsYWNlZCwgeyBvbGRTb3VyY2VDb2Rl OiB0aGlzLCBzb3VyY2VDb2RlOiB0aGlzIH0pOworICAgICAgICB9IGVsc2UgaWYgKHRoaXMuX2Nv bnRlbnRSZXF1ZXN0ZWQpCisgICAgICAgICAgICB0aGlzLl9yZWxvYWRDb250ZW50ID0gdHJ1ZTsK KyAgICAgICAgZWxzZSBpZiAodGhpcy5fcmVxdWVzdENvbnRlbnRDYWxsYmFja3MubGVuZ3RoKQor ICAgICAgICAgICAgdGhpcy5fcmVxdWVzdENvbnRlbnQoKTsKICAgICB9LAogCi0gICAgX2NyZWF0 ZVNvdXJjZU1hcHBpbmc6IGZ1bmN0aW9uKG9yaWdpbmFsQ29udGVudFByb3ZpZGVyLCBjYWxsYmFj aykKKyAgICBfcmVxdWVzdENvbnRlbnQ6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIGlmICgh dGhpcy5fZm9ybWF0dGVkKSB7Ci0gICAgICAgICAgICBzZXRUaW1lb3V0KGNhbGxiYWNrLmJpbmQo bnVsbCwgb3JpZ2luYWxDb250ZW50UHJvdmlkZXIsIG51bGwpLCAwKTsKKyAgICAgICAgaWYgKHRo aXMuX2NvbnRlbnRSZXF1ZXN0ZWQpCiAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KIAot ICAgICAgICBmdW5jdGlvbiBkaWRSZXF1ZXN0Q29udGVudChtaW1lVHlwZSwgY29udGVudCkKLSAg ICAgICAgewotICAgICAgICAgICAgZnVuY3Rpb24gZGlkRm9ybWF0Q29udGVudChmb3JtYXR0ZWRD b250ZW50LCBtYXBwaW5nKQotICAgICAgICAgICAgewotICAgICAgICAgICAgICAgIHZhciBjb250 ZW50UHJvdmlkZXIgPSBuZXcgV2ViSW5zcGVjdG9yLlN0YXRpY0NvbnRlbnRQcm92aWRlcihtaW1l VHlwZSwgZm9ybWF0dGVkQ29udGVudCkKLSAgICAgICAgICAgICAgICBjYWxsYmFjayhjb250ZW50 UHJvdmlkZXIsIG1hcHBpbmcpOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgdGhpcy5fZm9y bWF0dGVyLmZvcm1hdENvbnRlbnQobWltZVR5cGUsIGNvbnRlbnQsIGRpZEZvcm1hdENvbnRlbnQu YmluZCh0aGlzKSk7Ci0gICAgICAgIH0KLSAgICAgICAgb3JpZ2luYWxDb250ZW50UHJvdmlkZXIu cmVxdWVzdENvbnRlbnQoZGlkUmVxdWVzdENvbnRlbnQuYmluZCh0aGlzKSk7CisgICAgICAgIHRo aXMuX2NvbnRlbnRSZXF1ZXN0ZWQgPSB0cnVlOworICAgICAgICBpZiAodGhpcy5fcmVzb3VyY2Ug JiYgdGhpcy5fcmVzb3VyY2UuZmluaXNoZWQpCisgICAgICAgICAgICB0aGlzLl9sb2FkUmVzb3Vy Y2VDb250ZW50KHRoaXMuX3Jlc291cmNlKTsKKyAgICAgICAgZWxzZSBpZiAoIXRoaXMuX3Jlc291 cmNlKQorICAgICAgICAgICAgdGhpcy5fbG9hZFNjcmlwdENvbnRlbnQoKTsKKyAgICAgICAgZWxz ZSBpZiAodGhpcy5fY29uY2F0ZW5hdGVkU2NyaXB0cykKKyAgICAgICAgICAgIHRoaXMuX2xvYWRB bmRDb25jYXRlbmF0ZVNjcmlwdHNDb250ZW50KCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAg IHRoaXMuX2NvbnRlbnRSZXF1ZXN0ZWQgPSBmYWxzZTsKKyAgICB9LAorCisgICAgX2xvYWRSZXNv dXJjZUNvbnRlbnQ6IGZ1bmN0aW9uKHJlc291cmNlKQorICAgIHsKKyAgICAgICAgdGhpcy5fc2V0 Q29udGVudFByb3ZpZGVyKG5ldyBXZWJJbnNwZWN0b3IuUmVzb3VyY2VDb250ZW50UHJvdmlkZXIo cmVzb3VyY2UpKTsKKyAgICAgICAgdGhpcy5fY29udGVudFByb3ZpZGVyLnJlcXVlc3RDb250ZW50 KHRoaXMuX2RpZFJlcXVlc3RDb250ZW50LmJpbmQodGhpcykpOworICAgIH0sCisKKyAgICBfbG9h ZFNjcmlwdENvbnRlbnQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX3NldENvbnRl bnRQcm92aWRlcihuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdENvbnRlbnRQcm92aWRlcih0aGlzLl9z Y3JpcHRzWzBdKSk7CisgICAgICAgIHRoaXMuX2NvbnRlbnRQcm92aWRlci5yZXF1ZXN0Q29udGVu dCh0aGlzLl9kaWRSZXF1ZXN0Q29udGVudC5iaW5kKHRoaXMpKTsKKyAgICB9LAorCisgICAgX2xv YWRBbmRDb25jYXRlbmF0ZVNjcmlwdHNDb250ZW50OiBmdW5jdGlvbigpCisgICAgeworICAgICAg ICBpZiAodGhpcy5fc2NyaXB0cy5sZW5ndGggPT09IDEgJiYgIXRoaXMuX3NjcmlwdHNbMF0ubGlu ZU9mZnNldCAmJiAhdGhpcy5fc2NyaXB0c1swXS5jb2x1bW5PZmZzZXQpCisgICAgICAgICAgICB0 aGlzLl9zZXRDb250ZW50UHJvdmlkZXIobmV3IFdlYkluc3BlY3Rvci5TY3JpcHRDb250ZW50UHJv dmlkZXIodGhpcy5fc2NyaXB0c1swXSkpOworICAgICAgICBlbHNlCisgICAgICAgICAgICB0aGlz Ll9zZXRDb250ZW50UHJvdmlkZXIobmV3IFdlYkluc3BlY3Rvci5Db25jYXRlbmF0ZWRTY3JpcHRz Q29udGVudFByb3ZpZGVyKHRoaXMuX3NjcmlwdHMpKTsKKyAgICAgICAgdGhpcy5fY29udGVudFBy b3ZpZGVyLnJlcXVlc3RDb250ZW50KHRoaXMuX2RpZFJlcXVlc3RDb250ZW50LmJpbmQodGhpcykp OwogICAgIH0sCiAKLSAgICBfc2F2ZVNvdXJjZU1hcHBpbmc6IGZ1bmN0aW9uKGNvbnRlbnRQcm92 aWRlciwgbWFwcGluZykKKyAgICBfZGlkUmVxdWVzdENvbnRlbnQ6IGZ1bmN0aW9uKG1pbWVUeXBl LCBjb250ZW50KQogICAgIHsKLSAgICAgICAgdmFyIG9sZFVJU291cmNlQ29kZTsKLSAgICAgICAg aWYgKHRoaXMuX3VpU291cmNlQ29kZSkKLSAgICAgICAgICAgIG9sZFVJU291cmNlQ29kZSA9IHRo aXM7Ci0gICAgICAgIHZhciB1aVNvdXJjZUNvZGVJZCA9ICh0aGlzLl9mb3JtYXR0ZWQgPyAiZGVv YmZ1c2NhdGVkOiIgOiAiIikgKyAodGhpcy5fc2NyaXB0c1swXS5zb3VyY2VVUkwgfHwgdGhpcy5f c2NyaXB0c1swXS5zY3JpcHRJZCk7Ci0gICAgICAgIHRoaXMuX3VpU291cmNlQ29kZSA9IG5ldyBX ZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlKHVpU291cmNlQ29kZUlkLCB0aGlzLnVybCwgdGhpcy5p c0NvbnRlbnRTY3JpcHQsIHRoaXMsIGNvbnRlbnRQcm92aWRlcik7Ci0gICAgICAgIHRoaXMuX21h cHBpbmcgPSBtYXBwaW5nOwotICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhX ZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZS5FdmVudHMuU291cmNlTWFwcGluZ1VwZGF0ZWQsIHsg b2xkVUlTb3VyY2VDb2RlOiBvbGRVSVNvdXJjZUNvZGUgfSk7CisgICAgICAgIHRoaXMuX2NvbnRl bnRMb2FkZWQgPSB0cnVlOworICAgICAgICB0aGlzLl9jb250ZW50UmVxdWVzdGVkID0gZmFsc2U7 CisgICAgICAgIHRoaXMuX21pbWVUeXBlID0gbWltZVR5cGU7CisgICAgICAgIHRoaXMuX2NvbnRl bnQgPSBjb250ZW50OworICAgICAgICB0aGlzLl9tYXBwaW5nID0gdGhpcy5fY29udGVudFByb3Zp ZGVyLm1hcHBpbmc7CisKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0aGlzLl9yZXF1ZXN0 Q29udGVudENhbGxiYWNrcy5sZW5ndGg7ICsraSkKKyAgICAgICAgICAgIHRoaXMuX3JlcXVlc3RD b250ZW50Q2FsbGJhY2tzW2ldKG1pbWVUeXBlLCBjb250ZW50KTsKKyAgICAgICAgdGhpcy5fcmVx dWVzdENvbnRlbnRDYWxsYmFja3MgPSBbXTsKKworICAgICAgICBpZiAodGhpcy5fcmVsb2FkQ29u dGVudCkKKyAgICAgICAgICAgIHRoaXMuX3JlbG9hZCgpOworICAgIH0sCisKKyAgICBfaGFzUGVu ZGluZ1Jlc291cmNlOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fcmVz b3VyY2UgJiYgIXRoaXMuX3Jlc291cmNlLmZpbmlzaGVkOwogICAgIH0KIH0KIApAQCAtMzQxLDE3 ICszNjQsMjYgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlQ29udGVudFByb3ZpZGVyLnByb3RvdHlw ZSA9IHsKIFdlYkluc3BlY3Rvci5SZXNvdXJjZUNvbnRlbnRQcm92aWRlci5wcm90b3R5cGUuX19w cm90b19fID0gV2ViSW5zcGVjdG9yLkNvbnRlbnRQcm92aWRlci5wcm90b3R5cGU7CiAKIAotV2Vi SW5zcGVjdG9yLlN0YXRpY0NvbnRlbnRQcm92aWRlciA9IGZ1bmN0aW9uKG1pbWVUeXBlLCBjb250 ZW50KQorV2ViSW5zcGVjdG9yLkZvcm1hdHRlZENvbnRlbnRQcm92aWRlciA9IGZ1bmN0aW9uKGNv bnRlbnRQcm92aWRlciwgZm9ybWF0dGVyKQogewotICAgIHRoaXMuX21pbWVUeXBlID0gbWltZVR5 cGU7Ci0gICAgdGhpcy5fY29udGVudCA9IGNvbnRlbnQ7CisgICAgdGhpcy5fY29udGVudFByb3Zp ZGVyID0gY29udGVudFByb3ZpZGVyOworICAgIHRoaXMuX2Zvcm1hdHRlciA9IGZvcm1hdHRlcjsK IH07CiAKLVdlYkluc3BlY3Rvci5TdGF0aWNDb250ZW50UHJvdmlkZXIucHJvdG90eXBlID0gewor V2ViSW5zcGVjdG9yLkZvcm1hdHRlZENvbnRlbnRQcm92aWRlci5wcm90b3R5cGUgPSB7CiAgICAg cmVxdWVzdENvbnRlbnQ6IGZ1bmN0aW9uKGNhbGxiYWNrKQogICAgIHsKLSAgICAgICAgY2FsbGJh Y2sodGhpcy5fbWltZVR5cGUsIHRoaXMuX2NvbnRlbnQpOworICAgICAgICBmdW5jdGlvbiBkaWRS ZXF1ZXN0Q29udGVudChtaW1lVHlwZSwgY29udGVudCkKKyAgICAgICAgeworICAgICAgICAgICAg ZnVuY3Rpb24gZGlkRm9ybWF0Q29udGVudChmb3JtYXR0ZWRDb250ZW50LCBtYXBwaW5nKQorICAg ICAgICAgICAgeworICAgICAgICAgICAgICAgIHRoaXMubWFwcGluZyA9IG1hcHBpbmc7CisgICAg ICAgICAgICAgICAgY2FsbGJhY2sobWltZVR5cGUsIGZvcm1hdHRlZENvbnRlbnQpOworICAgICAg ICAgICAgfQorICAgICAgICAgICAgdGhpcy5fZm9ybWF0dGVyLmZvcm1hdENvbnRlbnQobWltZVR5 cGUsIGNvbnRlbnQsIGRpZEZvcm1hdENvbnRlbnQuYmluZCh0aGlzKSk7CisgICAgICAgIH0KKyAg ICAgICAgdGhpcy5fY29udGVudFByb3ZpZGVyLnJlcXVlc3RDb250ZW50KGRpZFJlcXVlc3RDb250 ZW50LmJpbmQodGhpcykpOwogICAgIH0KIH0KIAotV2ViSW5zcGVjdG9yLlN0YXRpY0NvbnRlbnRQ cm92aWRlci5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLkNvbnRlbnRQcm92aWRl ci5wcm90b3R5cGU7CitXZWJJbnNwZWN0b3IuRm9ybWF0dGVkQ29udGVudFByb3ZpZGVyLnByb3Rv dHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuQ29udGVudFByb3ZpZGVyLnByb3RvdHlwZTsK