56313 2011-03-14 09:40:36 -0700 REGRESSION(r81026): Breaks gtk 64-bit tests (Requested by podivilov on #webkit). 2011-03-14 09:43:29 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 56252 1 webkit.review.bot webkit.review.bot podivilov yurys oldest_to_newest 367018 0 webkit.review.bot 2011-03-14 09:40:36 -0700 http://trac.webkit.org/changeset/81026 broke the build: Breaks gtk 64-bit tests (Requested by podivilov 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 367019 1 85685 webkit.review.bot 2011-03-14 09:40:59 -0700 Created attachment 85685 ROLLOUT of r81026 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. 367020 2 85685 podivilov 2011-03-14 09:43:21 -0700 Comment on attachment 85685 ROLLOUT of r81026 Clearing flags on attachment: 85685 Committed r81030: <http://trac.webkit.org/changeset/81030> 367021 3 podivilov 2011-03-14 09:43:29 -0700 All reviewed patches have been landed. Closing bug. 85685 2011-03-14 09:40:59 -0700 2011-03-14 09:43:21 -0700 ROLLOUT of r81026 bug-56313-20110314163920.patch text/plain 35617 webkit.review.bot U3VidmVyc2lvbiBSZXZpc2lvbjogODEwMjkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA1OGQyYzE1NTFmYzE3NGM0ZmRiNTM3 NzNmMTNmZDU0MjcxYWFmYzJjLi5jY2IxOTM2NDc0MjEwZWU5MWRmNmZhY2UyZGNlZDY4YTc4YjMy ZGU2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDMtMTQgIFNoZXJpZmYgQm90ICA8d2Vi a2l0LnJldmlldy5ib3RAZ21haWwuY29tPgorCisgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcg b3V0IHI4MTAyNi4KKyAgICAgICAgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvODEw MjYKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU2MzEz CisKKyAgICAgICAgQnJlYWtzIGd0ayA2NC1iaXQgdGVzdHMgKFJlcXVlc3RlZCBieSBwb2Rpdmls b3Ygb24gI3dlYmtpdCkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZGVidWdnZXIveGhyLWJyZWFr cG9pbnRzLWV4cGVjdGVkLnR4dDogUmVtb3ZlZC4KKyAgICAgICAgKiBpbnNwZWN0b3IvZGVidWdn ZXIveGhyLWJyZWFrcG9pbnRzLmh0bWw6IFJlbW92ZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3Rr L1NraXBwZWQ6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1NraXBwZWQ6CisgICAgICAgICogcGxh dGZvcm0vcXQvU2tpcHBlZDoKKyAgICAgICAgKiBwbGF0Zm9ybS93aW4vU2tpcHBlZDoKKwogMjAx MS0wMy0xNCAgTWlraGFpbCBOYWdhbm92ICA8bW5hZ2Fub3ZAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IFBhdmVsIEZlbGRtYW4uCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvZGVidWdnZXIveGhyLWJyZWFrcG9pbnRzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9kZWJ1Z2dlci94aHItYnJlYWtwb2ludHMtZXhwZWN0ZWQudHh0CmRlbGV0 ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBhMDNhMjBjYjIxNjY5YTRhMmNjMTU3Y2FmMGM4MzM5 ZWU1NmExZDQ4Li4wMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCi0tLSBh L0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci94aHItYnJlYWtwb2ludHMtZXhwZWN0ZWQu dHh0CisrKyAvZGV2L251bGwKQEAgLTEsMTQgKzAsMCBAQAotVGVzdHMgWEhSIGJyZWFrcG9pbnRz LgotCi1EZWJ1Z2dlciB3YXMgZW5hYmxlZC4KLQotUnVubmluZzogdGVzdFhIUkJyZWFrcG9pbnQK LVNjcmlwdCBleGVjdXRpb24gcGF1c2VkLgotQ2FsbCBzdGFjazoKLSAgICAwKSBzZW5kUmVxdWVz dCAoeGhyLWJyZWFrcG9pbnRzLmh0bWw6MTEpCi0gICAgMSkgICg6MSkKLVNjcmlwdCBleGVjdXRp b24gcmVzdW1lZC4KLQotUnVubmluZzogdGVzdFBhdXNlT25BbnlYSFIKLURlYnVnZ2VyIHdhcyBk aXNhYmxlZC4KLQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3ho ci1icmVha3BvaW50cy5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3hoci1i cmVha3BvaW50cy5odG1sCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAyZTlkMmI2MWFi YzI4ZWRiN2JhMjk0YjViYjJlZjFiZDBkZTVmZmVlLi4wMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwCi0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci94aHIt YnJlYWtwb2ludHMuaHRtbAorKysgL2Rldi9udWxsCkBAIC0xLDc4ICswLDAgQEAKLTxodG1sPgot PGhlYWQ+Ci08c2NyaXB0IHNyYz0iLi4vLi4vaHR0cC90ZXN0cy9pbnNwZWN0b3IvaW5zcGVjdG9y LXRlc3QuanMiPjwvc2NyaXB0PgotPHNjcmlwdCBzcmM9Ii4uLy4uL2h0dHAvdGVzdHMvaW5zcGVj dG9yL2RlYnVnZ2VyLXRlc3QuanMiPjwvc2NyaXB0PgotPHNjcmlwdD4KLQotZnVuY3Rpb24gc2Vu ZFJlcXVlc3QodXJsKQotewotICAgIHZhciByZXF1ZXN0ID0gbmV3IFhNTEh0dHBSZXF1ZXN0KCk7 Ci0gICAgcmVxdWVzdC5vcGVuKCJHRVQiLCB1cmwsIHRydWUpOwotICAgIHJlcXVlc3Quc2VuZCgp Ci19Ci0KLWZ1bmN0aW9uIHRlc3QoKQotewotICAgIHZhciBwYW5lID0gV2ViSW5zcGVjdG9yLnBh bmVscy5zY3JpcHRzLnNpZGViYXJQYW5lcy54aHJCcmVha3BvaW50czsKLSAgICBJbnNwZWN0b3JU ZXN0LnJ1bkRlYnVnZ2VyVGVzdFN1aXRlKFsKLSAgICAgICAgZnVuY3Rpb24gdGVzdFhIUkJyZWFr cG9pbnQobmV4dCkKLSAgICAgICAgewotICAgICAgICAgICAgcGFuZS5fc2V0QnJlYWtwb2ludCgi Zm9vIiwgdHJ1ZSk7Ci0gICAgICAgICAgICBJbnNwZWN0b3JUZXN0LndhaXRVbnRpbFBhdXNlZChz dGVwMSk7Ci0gICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV2YWx1YXRlSW5QYWdlV2l0aFRpbWVv dXQoInNlbmRSZXF1ZXN0KCcvZm9vP2E9YicpIik7Ci0KLSAgICAgICAgICAgIGZ1bmN0aW9uIHN0 ZXAxKGNhbGxGcmFtZXMpCi0gICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgSW5zcGVjdG9y VGVzdC5jYXB0dXJlU3RhY2tUcmFjZShjYWxsRnJhbWVzKTsKLSAgICAgICAgICAgICAgICBJbnNw ZWN0b3JUZXN0LnJlc3VtZUV4ZWN1dGlvbihzdGVwMik7Ci0gICAgICAgICAgICB9Ci0KLSAgICAg ICAgICAgIGZ1bmN0aW9uIHN0ZXAyKCkKLSAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICBJ bnNwZWN0b3JUZXN0LmV2YWx1YXRlSW5QYWdlKCJzZW5kUmVxdWVzdCgnL2Jhcj9hPWInKSIsIHN0 ZXAzKTsKLSAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgZnVuY3Rpb24gc3RlcDMoKQotICAg ICAgICAgICAgewotICAgICAgICAgICAgICAgIHBhbmUuX3JlbW92ZUJyZWFrcG9pbnQoImZvbyIp OwotICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXZhbHVhdGVJblBhZ2UoInNlbmRSZXF1 ZXN0KCcvZm9vP2E9YicpIiwgbmV4dCk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0sCi0KLSAg ICAgICAgZnVuY3Rpb24gdGVzdFBhdXNlT25BbnlYSFIobmV4dCkKLSAgICAgICAgewotICAgICAg ICAgICAgcGFuZS5fc2V0QnJlYWtwb2ludCgiIik7Ci0gICAgICAgICAgICBJbnNwZWN0b3JUZXN0 LmV2YWx1YXRlSW5QYWdlKCJzZW5kUmVxdWVzdCgnL2Zvbz9hPWInKSIsIHBhdXNlZEZvbyk7Ci0K LSAgICAgICAgICAgIGZ1bmN0aW9uIHBhdXNlZEZvbyhjYWxsRnJhbWVzKQotICAgICAgICAgICAg ewotICAgICAgICAgICAgICAgIGZ1bmN0aW9uIHJlc3VtZWQoKQotICAgICAgICAgICAgICAgIHsK LSAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUluUGFnZSgic2VuZFJl cXVlc3QoJy9iYXI/YT1iJykiLCBwYXVzZWRCYXIpOwotICAgICAgICAgICAgICAgIH0KLSAgICAg ICAgICAgICAgICBJbnNwZWN0b3JUZXN0LnJlc3VtZUV4ZWN1dGlvbihyZXN1bWVkKTsKLSAgICAg ICAgICAgIH0KLQotICAgICAgICAgICAgZnVuY3Rpb24gcGF1c2VkQmFyKGNhbGxGcmFtZXMpCi0g ICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgZnVuY3Rpb24gcmVzdW1lZCgpCi0gICAgICAg ICAgICAgICAgewotICAgICAgICAgICAgICAgICAgICBwYW5lLl9yZW1vdmVCcmVha3BvaW50KCIi KTsKLSAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUluUGFnZSgic2Vu ZFJlcXVlc3QoJy9iYXo/YT1iJykiLCBuZXh0KTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAg ICAgICAgICAgSW5zcGVjdG9yVGVzdC5yZXN1bWVFeGVjdXRpb24ocmVzdW1lZCk7Ci0gICAgICAg ICAgICB9Ci0gICAgICAgIH0KLSAgICBdKTsKLX0KLQotPC9zY3JpcHQ+Ci08L2hlYWQ+Ci0KLTxi b2R5IG9ubG9hZD0icnVuVGVzdCgpIj4KLTxwPgotVGVzdHMgWEhSIGJyZWFrcG9pbnRzLgotPC9w PgotCi08L2JvZHk+Ci08L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9n dGsvU2tpcHBlZCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkCmluZGV4IDIxYTY1 ZTkwNTFkMDlmY2ZlN2ZmNmNjN2IwZWVlZGFjNWFlNTZmYTMuLjhhNzM4MWQ0MGRkMDVlNjZmYWI2 YzRmN2VhNzMzZDliMmNkODQzOTMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0 ay9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkCkBAIC0xMTgz LDcgKzExODMsNiBAQCBzcHV0bmlrL1VuaWNvZGUvVW5pY29kZV81MTAvUzcuNl9BNS4zX1QyLmh0 bWwKIAogIyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDMzMzIKIGlu c3BlY3Rvci9kZWJ1Z2dlci9kb20tYnJlYWtwb2ludHMuaHRtbAotaW5zcGVjdG9yL2RlYnVnZ2Vy L3hoci1icmVha3BvaW50cy5odG1sCiAKICMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQwMzAwCiBpbnNwZWN0b3IvZGVidWdnZXIvbGl2ZS1lZGl0Lmh0bWwKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxh dGZvcm0vbWFjL1NraXBwZWQKaW5kZXggOWFjNTk5ZGE4ZDYwN2I3YzhlOTMyNjg3ZjNlZmY2N2Zl YWE2YmMwNC4uNzIxMWQ4YTQ0NDc4ZDljZjRkNDY5YTkzOGNiOTAwYmIwODFiM2E4YSAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMv cGxhdGZvcm0vbWFjL1NraXBwZWQKQEAgLTIzMyw3ICsyMzMsNiBAQCBhbmltYXRpb25zL3BsYXkt c3RhdGUuaHRtbAogCiAjIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00 MzMzMgogaW5zcGVjdG9yL2RlYnVnZ2VyL2RvbS1icmVha3BvaW50cy5odG1sCi1pbnNwZWN0b3Iv ZGVidWdnZXIveGhyLWJyZWFrcG9pbnRzLmh0bWwKIAogIyBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDAzMDAKIGluc3BlY3Rvci9kZWJ1Z2dlci9saXZlLWVkaXQuaHRt bApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZCBiL0xheW91dFRl c3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKaW5kZXggMmVlNGU2YjQwMWU1YzdlYTM3NzMxZjQ0Zjg3 MGUwMzlhMjFhNTE1OC4uYjRkYjJiZDM2ZjhhZjE5Mjg1MDdlNWM1Yzk3YzcyZDAyZGY3NzNmMyAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAorKysgYi9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCkBAIC0xMDQsNyArMTA0LDYgQEAgZmFzdC90ZXh0L2h5 cGhlbnMuaHRtbAogCiAjIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00 MzMzMgogaW5zcGVjdG9yL2RlYnVnZ2VyL2RvbS1icmVha3BvaW50cy5odG1sCi1pbnNwZWN0b3Iv ZGVidWdnZXIveGhyLWJyZWFrcG9pbnRzLmh0bWwKIAogIyBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDAzMDAKIGluc3BlY3Rvci9kZWJ1Z2dlci9saXZlLWVkaXQuaHRt bApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luL1NraXBwZWQgYi9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS93aW4vU2tpcHBlZAppbmRleCBjODc4YzQ5NGZlYTFiYzI0NzA1YTlhNjEw ZjIyYmY4MTNkZjcxOWNlLi5iMzYxYzYyNTlmOWExMDBmMDY5YWU5Y2FhMTBhNzgzYzU2NDhiNmMz IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vU2tpcHBlZAorKysgYi9MYXlv dXRUZXN0cy9wbGF0Zm9ybS93aW4vU2tpcHBlZApAQCAtMTA5Miw3ICsxMDkyLDYgQEAgaHR0cC90 ZXN0cy9hcHBjYWNoZS9vcmlnaW4tcXVvdGEuaHRtbAogCiAjIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD00MzMzMgogaW5zcGVjdG9yL2RlYnVnZ2VyL2RvbS1icmVha3Bv aW50cy5odG1sCi1pbnNwZWN0b3IvZGVidWdnZXIveGhyLWJyZWFrcG9pbnRzLmh0bWwKIAogIyBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDAzMDAKIGluc3BlY3Rvci9k ZWJ1Z2dlci9saXZlLWVkaXQuaHRtbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGM4MTcwNTE0ZWI5YmQzYWE5NjBh Mzg1YjIyZDczODQ5N2JmYjUxMDYuLjMyYmY5MjUyNjZkMTBhYjU3ZTVlYTFlYjBhN2Y0MjQ2N2Ez YzJlODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw1NyBAQAorMjAxMS0wMy0xNCAgU2hlcmlmZiBC b3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CisKKyAgICAgICAgVW5yZXZpZXdlZCwg cm9sbGluZyBvdXQgcjgxMDI2LgorICAgICAgICBodHRwOi8vdHJhYy53ZWJraXQub3JnL2NoYW5n ZXNldC84MTAyNgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NTYzMTMKKworICAgICAgICBCcmVha3MgZ3RrIDY0LWJpdCB0ZXN0cyAoUmVxdWVzdGVkIGJ5 IHBvZGl2aWxvdiBvbiAjd2Via2l0KS4KKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JC cm93c2VyRGVidWdnZXJBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JCcm93 c2VyRGVidWdnZXJBZ2VudDo6SW5zcGVjdG9yQnJvd3NlckRlYnVnZ2VyQWdlbnQpOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yQnJvd3NlckRlYnVnZ2VyQWdlbnQ6Omluc3BlY3RlZFVSTENo YW5nZWQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQnJvd3NlckRlYnVnZ2VyQWdlbnQ6 OnJlc3RvcmVTdGlja3lCcmVha3BvaW50KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckJy b3dzZXJEZWJ1Z2dlckFnZW50OjpzZXRYSFJCcmVha3BvaW50KToKKyAgICAgICAgKFdlYkNvcmU6 Okluc3BlY3RvckJyb3dzZXJEZWJ1Z2dlckFnZW50OjpyZW1vdmVYSFJCcmVha3BvaW50KToKKyAg ICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckJyb3dzZXJEZWJ1Z2dlckFnZW50Ojp3aWxsU2VuZFhN TEh0dHBSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckJyb3dzZXJEZWJ1Z2dl ckFnZW50OjpjbGVhcik6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckJyb3dzZXJEZWJ1 Z2dlckFnZW50Lmg6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50TWFu YWdlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CcmVha3BvaW50TWFuYWdlci5wcm90b3R5 cGUuY3JlYXRlWEhSQnJlYWtwb2ludCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQnJlYWtwb2lu dE1hbmFnZXIucHJvdG90eXBlLl9jcmVhdGVYSFJCcmVha3BvaW50KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5CcmVha3BvaW50TWFuYWdlci5wcm90b3R5cGUuYnJlYWtwb2ludFZpZXdGb3JFdmVu dERhdGEpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyLnByb3RvdHlw ZS5fcHJvamVjdENoYW5nZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5h Z2VyLnByb3RvdHlwZS5fdmFsaWRhdGVCcmVha3BvaW50cyk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuQnJlYWtwb2ludE1hbmFnZXIucHJvdG90eXBlLl9jcmVhdGVFdmVudExpc3RlbmVyQnJlYWtw b2ludElkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CcmVha3BvaW50TWFuYWdlci5wcm90b3R5 cGUuX2NyZWF0ZVhIUkJyZWFrcG9pbnRJZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuWEhSQnJl YWtwb2ludCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuWEhSQnJlYWtwb2ludC5wcm90b3R5cGUu X2VuYWJsZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuWEhSQnJlYWtwb2ludC5wcm90b3R5cGUu X2Rpc2FibGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlhIUkJyZWFrcG9pbnQucHJvdG90eXBl Ll9zZXJpYWxpemVUb0pTT04pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlhIUkJyZWFrcG9pbnRW aWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5YSFJCcmVha3BvaW50Vmlldy5wcm90b3R5cGUu Y29tcGFyZVRvKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5YSFJCcmVha3BvaW50Vmlldy5wcm90 b3R5cGUucG9wdWxhdGVFZGl0RWxlbWVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuWEhSQnJl YWtwb2ludFZpZXcucHJvdG90eXBlLnBvcHVsYXRlTGFiZWxFbGVtZW50KToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5YSFJCcmVha3BvaW50Vmlldy5wcm90b3R5cGUucG9wdWxhdGVTdGF0dXNNZXNz YWdlRWxlbWVudCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50c1Np ZGViYXJQYW5lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlhIUkJyZWFrcG9pbnRzU2lkZWJh clBhbmUuYWRkQnV0dG9uQ2xpY2tlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuWEhSQnJlYWtw b2ludHNTaWRlYmFyUGFuZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuWEhSQnJlYWtwb2ludHNT aWRlYmFyUGFuZS5wcm90b3R5cGUuYWRkQnJlYWtwb2ludEl0ZW0pOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlhIUkJyZWFrcG9pbnRzU2lkZWJhclBhbmUucHJvdG90eXBlLl9zdGFydEVkaXRpbmdC cmVha3BvaW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5YSFJCcmVha3BvaW50c1NpZGViYXJQ YW5lLnByb3RvdHlwZS5faGlkZUVkaXRCcmVha3BvaW50RGlhbG9nKToKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL0NhbGxTdGFja1NpZGViYXJQYW5lLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkNhbGxTdGFja1NpZGViYXJQYW5lLnByb3RvdHlwZS51cGRhdGUpOgorICAgICAgICAq IGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlNjcmlwdHNQYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnBy b3RvdHlwZS5fZGVidWdnZXJQYXVzZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQ YW5lbC5wcm90b3R5cGUuX2NsZWFySW50ZXJmYWNlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL1NldHRpbmdzLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNldHRpbmdzKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5yZXNldEZvY3VzRWxlbWVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuY3JlYXRl WEhSQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5icmVha3BvaW50QWRkZWQpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLmNyZWF0ZVhIUkJyZWFrcG9pbnRzU2lkZWJhclBhbmUpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLnNldCBhdHRhY2hlZCk6CisKIDIwMTEtMDMtMTQgIE1pa2hhaWwgTmFnYW5vdiAg PG1uYWdhbm92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxk bWFuLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckJyb3dz ZXJEZWJ1Z2dlckFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JC cm93c2VyRGVidWdnZXJBZ2VudC5jcHAKaW5kZXggMDUzNmNkZGY2MDJlNjc3MWQ4NzUzMWFlNmVi MDQ3YTU5NzAwNDlmYi4uZTdiNWVlNzI0ZmJiMDEwZmZlZTA0MjcwZDVmZDk5YTYwMGNlZTk1YiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckJyb3dzZXJEZWJ1 Z2dlckFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQnJv d3NlckRlYnVnZ2VyQWdlbnQuY3BwCkBAIC02NSw4ICs2NSw2IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIAogbmFtZXNwYWNlIEJyb3dzZXJEZWJ1Z2dlckFnZW50U3RhdGUgewogc3RhdGljIGNvbnN0 IGNoYXIgYnJvd3NlckJyZWFrcG9pbnRzW10gPSAiYnJvd3NlckJyZWFrcG9pbnRzIjsKLXN0YXRp YyBjb25zdCBjaGFyIHBhdXNlT25BbGxYSFJzW10gPSAicGF1c2VPbkFsbFhIUnMiOwotc3RhdGlj IGNvbnN0IGNoYXIgeGhyQnJlYWtwb2ludHNbXSA9ICJ4aHJCcmVha3BvaW50cyI7CiB9CiAKIFBh c3NPd25QdHI8SW5zcGVjdG9yQnJvd3NlckRlYnVnZ2VyQWdlbnQ+IEluc3BlY3RvckJyb3dzZXJE ZWJ1Z2dlckFnZW50OjpjcmVhdGUoSW5zdHJ1bWVudGluZ0FnZW50cyogaW5zdHJ1bWVudGluZ0Fn ZW50cywgSW5zcGVjdG9yU3RhdGUqIGluc3BlY3RvclN0YXRlLCBJbnNwZWN0b3JET01BZ2VudCog ZG9tQWdlbnQsIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQqIGRlYnVnZ2VyQWdlbnQsIEluc3BlY3Rv ckFnZW50KiBpbnNwZWN0b3JBZ2VudCkKQEAgLTgwLDYgKzc4LDcgQEAgSW5zcGVjdG9yQnJvd3Nl ckRlYnVnZ2VyQWdlbnQ6Okluc3BlY3RvckJyb3dzZXJEZWJ1Z2dlckFnZW50KEluc3RydW1lbnRp bmdBZ2VudHMKICAgICAsIG1fZG9tQWdlbnQoZG9tQWdlbnQpCiAgICAgLCBtX2RlYnVnZ2VyQWdl bnQoZGVidWdnZXJBZ2VudCkKICAgICAsIG1faW5zcGVjdG9yQWdlbnQoaW5zcGVjdG9yQWdlbnQp CisgICAgLCBtX2hhc1hIUkJyZWFrcG9pbnRXaXRoRW1wdHlVUkwoZmFsc2UpCiB7CiAgICAgbV9k ZWJ1Z2dlckFnZW50LT5zZXRMaXN0ZW5lcih0aGlzKTsKIH0KQEAgLTEyOSw2ICsxMjgsOCBAQCB2 b2lkIEluc3BlY3RvckJyb3dzZXJEZWJ1Z2dlckFnZW50OjpzZXRBbGxCcm93c2VyQnJlYWtwb2lu dHMoRXJyb3JTdHJpbmcqLCBQYXNzUgogdm9pZCBJbnNwZWN0b3JCcm93c2VyRGVidWdnZXJBZ2Vu dDo6aW5zcGVjdGVkVVJMQ2hhbmdlZChjb25zdCBTdHJpbmcmIHVybCkKIHsKICAgICBtX2V2ZW50 TGlzdGVuZXJCcmVha3BvaW50cy5jbGVhcigpOworICAgIG1fWEhSQnJlYWtwb2ludHMuY2xlYXIo KTsKKyAgICBtX2hhc1hIUkJyZWFrcG9pbnRXaXRoRW1wdHlVUkwgPSBmYWxzZTsKIAogICAgIFJl ZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGFsbEJyZWFrcG9pbnRzID0gbV9pbnNwZWN0b3JTdGF0ZS0+ Z2V0T2JqZWN0KEJyb3dzZXJEZWJ1Z2dlckFnZW50U3RhdGU6OmJyb3dzZXJCcmVha3BvaW50cyk7 CiAgICAgUmVmUHRyPEluc3BlY3RvckFycmF5PiBicmVha3BvaW50cyA9IGFsbEJyZWFrcG9pbnRz LT5nZXRBcnJheSh1cmwpOwpAQCAtMTYwLDYgKzE2MSwxMyBAQCB2b2lkIEluc3BlY3RvckJyb3dz ZXJEZWJ1Z2dlckFnZW50OjpyZXN0b3JlU3RpY2t5QnJlYWtwb2ludChQYXNzUmVmUHRyPEluc3Bl Y3RvcgogICAgICAgICBpZiAoIWNvbmRpdGlvbi0+Z2V0U3RyaW5nKCJldmVudE5hbWUiLCAmZXZl bnROYW1lKSkKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgc2V0RXZlbnRMaXN0ZW5lckJy ZWFrcG9pbnQoJmVycm9yLCBldmVudE5hbWUpOworICAgIH0gZWxzZSBpZiAodHlwZSA9PSB4aHJO YXRpdmVCcmVha3BvaW50VHlwZSkgeworICAgICAgICBpZiAoIWVuYWJsZWQpCisgICAgICAgICAg ICByZXR1cm47CisgICAgICAgIFN0cmluZyB1cmw7CisgICAgICAgIGlmICghY29uZGl0aW9uLT5n ZXRTdHJpbmcoInVybCIsICZ1cmwpKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBzZXRY SFJCcmVha3BvaW50KCZlcnJvciwgdXJsKTsKICAgICB9CiB9CiAKQEAgLTM2MiwyNiArMzcwLDE4 IEBAIHZvaWQgSW5zcGVjdG9yQnJvd3NlckRlYnVnZ2VyQWdlbnQ6OnBhdXNlT25OYXRpdmVFdmVu dElmTmVlZGVkKGNvbnN0IFN0cmluZyYgY2F0CiAKIHZvaWQgSW5zcGVjdG9yQnJvd3NlckRlYnVn Z2VyQWdlbnQ6OnNldFhIUkJyZWFrcG9pbnQoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHVy bCkKIHsKLSAgICBpZiAodXJsLmlzRW1wdHkoKSkgewotICAgICAgICBtX2luc3BlY3RvclN0YXRl LT5zZXRCb29sZWFuKEJyb3dzZXJEZWJ1Z2dlckFnZW50U3RhdGU6OnBhdXNlT25BbGxYSFJzLCB0 cnVlKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIFJlZlB0cjxJbnNwZWN0b3JPYmpl Y3Q+IHhockJyZWFrcG9pbnRzID0gbV9pbnNwZWN0b3JTdGF0ZS0+Z2V0T2JqZWN0KEJyb3dzZXJE ZWJ1Z2dlckFnZW50U3RhdGU6OnhockJyZWFrcG9pbnRzKTsKLSAgICB4aHJCcmVha3BvaW50cy0+ c2V0Qm9vbGVhbih1cmwsIHRydWUpOwotICAgIG1faW5zcGVjdG9yU3RhdGUtPnNldE9iamVjdChC cm93c2VyRGVidWdnZXJBZ2VudFN0YXRlOjp4aHJCcmVha3BvaW50cywgeGhyQnJlYWtwb2ludHMp OworICAgIGlmICh1cmwuaXNFbXB0eSgpKQorICAgICAgICBtX2hhc1hIUkJyZWFrcG9pbnRXaXRo RW1wdHlVUkwgPSB0cnVlOworICAgIGVsc2UKKyAgICAgICAgbV9YSFJCcmVha3BvaW50cy5hZGQo dXJsKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JCcm93c2VyRGVidWdnZXJBZ2VudDo6cmVtb3ZlWEhS QnJlYWtwb2ludChFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgdXJsKQogewotICAgIGlmICh1 cmwuaXNFbXB0eSgpKSB7Ci0gICAgICAgIG1faW5zcGVjdG9yU3RhdGUtPnNldEJvb2xlYW4oQnJv d3NlckRlYnVnZ2VyQWdlbnRTdGF0ZTo6cGF1c2VPbkFsbFhIUnMsIGZhbHNlKTsKLSAgICAgICAg cmV0dXJuOwotICAgIH0KLQotICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHhockJyZWFrcG9p bnRzID0gbV9pbnNwZWN0b3JTdGF0ZS0+Z2V0T2JqZWN0KEJyb3dzZXJEZWJ1Z2dlckFnZW50U3Rh dGU6OnhockJyZWFrcG9pbnRzKTsKLSAgICB4aHJCcmVha3BvaW50cy0+cmVtb3ZlKHVybCk7Ci0g ICAgbV9pbnNwZWN0b3JTdGF0ZS0+c2V0T2JqZWN0KEJyb3dzZXJEZWJ1Z2dlckFnZW50U3RhdGU6 OnhockJyZWFrcG9pbnRzLCB4aHJCcmVha3BvaW50cyk7CisgICAgaWYgKHVybC5pc0VtcHR5KCkp CisgICAgICAgIG1faGFzWEhSQnJlYWtwb2ludFdpdGhFbXB0eVVSTCA9IGZhbHNlOworICAgIGVs c2UKKyAgICAgICAgbV9YSFJCcmVha3BvaW50cy5yZW1vdmUodXJsKTsKIH0KIAogdm9pZCBJbnNw ZWN0b3JCcm93c2VyRGVidWdnZXJBZ2VudDo6d2lsbFNlbmRYTUxIdHRwUmVxdWVzdChjb25zdCBT dHJpbmcmIHVybCkKQEAgLTM5MSwxMyArMzkxLDEyIEBAIHZvaWQgSW5zcGVjdG9yQnJvd3NlckRl YnVnZ2VyQWdlbnQ6OndpbGxTZW5kWE1MSHR0cFJlcXVlc3QoY29uc3QgU3RyaW5nJiB1cmwpCiAg ICAgICAgIHJldHVybjsKIAogICAgIFN0cmluZyBicmVha3BvaW50VVJMOwotICAgIGlmIChtX2lu c3BlY3RvclN0YXRlLT5nZXRCb29sZWFuKEJyb3dzZXJEZWJ1Z2dlckFnZW50U3RhdGU6OnBhdXNl T25BbGxYSFJzKSkKKyAgICBpZiAobV9oYXNYSFJCcmVha3BvaW50V2l0aEVtcHR5VVJMKQogICAg ICAgICBicmVha3BvaW50VVJMID0gIiI7CiAgICAgZWxzZSB7Ci0gICAgICAgIFJlZlB0cjxJbnNw ZWN0b3JPYmplY3Q+IHhockJyZWFrcG9pbnRzID0gbV9pbnNwZWN0b3JTdGF0ZS0+Z2V0T2JqZWN0 KEJyb3dzZXJEZWJ1Z2dlckFnZW50U3RhdGU6OnhockJyZWFrcG9pbnRzKTsKLSAgICAgICAgZm9y IChJbnNwZWN0b3JPYmplY3Q6Oml0ZXJhdG9yIGl0ID0geGhyQnJlYWtwb2ludHMtPmJlZ2luKCk7 IGl0ICE9IHhockJyZWFrcG9pbnRzLT5lbmQoKTsgKytpdCkgewotICAgICAgICAgICAgaWYgKHVy bC5jb250YWlucyhpdC0+Zmlyc3QpKSB7Ci0gICAgICAgICAgICAgICAgYnJlYWtwb2ludFVSTCA9 IGl0LT5maXJzdDsKKyAgICAgICAgZm9yIChIYXNoU2V0PFN0cmluZz46Oml0ZXJhdG9yIGl0ID0g bV9YSFJCcmVha3BvaW50cy5iZWdpbigpOyBpdCAhPSBtX1hIUkJyZWFrcG9pbnRzLmVuZCgpOyAr K2l0KSB7CisgICAgICAgICAgICBpZiAodXJsLmNvbnRhaW5zKCppdCkpIHsKKyAgICAgICAgICAg ICAgICBicmVha3BvaW50VVJMID0gKml0OwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAg ICAgICAgfQogICAgICAgICB9CkBAIC00MTcsNiArNDE2LDggQEAgdm9pZCBJbnNwZWN0b3JCcm93 c2VyRGVidWdnZXJBZ2VudDo6Y2xlYXIoKQogewogICAgIG1fZG9tQnJlYWtwb2ludHMuY2xlYXIo KTsKICAgICBtX2V2ZW50TGlzdGVuZXJCcmVha3BvaW50cy5jbGVhcigpOworICAgIG1fWEhSQnJl YWtwb2ludHMuY2xlYXIoKTsKKyAgICBtX2hhc1hIUkJyZWFrcG9pbnRXaXRoRW1wdHlVUkwgPSBm YWxzZTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckJyb3dzZXJEZWJ1Z2dlckFnZW50LmggYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQnJvd3NlckRlYnVnZ2VyQWdlbnQuaAppbmRleCA3 ZmQyZjUwZmMxYTY5ZDY3ZDA0MjJlYWE3MjU1OWM3MmM3MWJjYTM0Li43YzBiYzhkOGYwZmI4YmMy ZjFlMTMxZmNiMjkyNTYzNjFhODg0NzhkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yQnJvd3NlckRlYnVnZ2VyQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yQnJvd3NlckRlYnVnZ2VyQWdlbnQuaApAQCAtMTA5LDYgKzEw OSw4IEBAIHByaXZhdGU6CiAgICAgSW5zcGVjdG9yQWdlbnQqIG1faW5zcGVjdG9yQWdlbnQ7CiAg ICAgSGFzaE1hcDxOb2RlKiwgdWludDMyX3Q+IG1fZG9tQnJlYWtwb2ludHM7CiAgICAgSGFzaFNl dDxTdHJpbmc+IG1fZXZlbnRMaXN0ZW5lckJyZWFrcG9pbnRzOworICAgIEhhc2hTZXQ8U3RyaW5n PiBtX1hIUkJyZWFrcG9pbnRzOworICAgIGJvb2wgbV9oYXNYSFJCcmVha3BvaW50V2l0aEVtcHR5 VVJMOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50TWFuYWdlci5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludE1hbmFnZXIuanMKaW5kZXggNjdh Y2U2YmExY2VkNWE4NDgxZDI4ODEzNDgyYzljYWIxMjI2N2NkNy4uZDkzOGU4ZGMxMzRjMDk3ODc4 ZTlkMGYwZjRjOTgwNjNhNzZlNjkyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9CcmVha3BvaW50TWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRNYW5hZ2VyLmpzCkBAIC01Miw2ICs1Miw3IEBA IFdlYkluc3BlY3Rvci5CcmVha3BvaW50TWFuYWdlci5CcmVha3BvaW50VHlwZXMgPSB7CiBXZWJJ bnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIuRXZlbnRzID0gewogICAgIERPTUJyZWFrcG9pbnRB ZGRlZDogImRvbS1icmVha3BvaW50LWFkZGVkIiwKICAgICBFdmVudExpc3RlbmVyQnJlYWtwb2lu dEFkZGVkOiAiZXZlbnQtbGlzdGVuZXItYnJlYWtwb2ludC1hZGRlZCIsCisgICAgWEhSQnJlYWtw b2ludEFkZGVkOiAieGhyLWJyZWFrcG9pbnQtYWRkZWQiLAogICAgIFByb2plY3RDaGFuZ2VkOiAi cHJvamVjdC1jaGFuZ2VkIgogfQogCkBAIC05OCwxNCArOTksMjIgQEAgV2ViSW5zcGVjdG9yLkJy ZWFrcG9pbnRNYW5hZ2VyLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50 VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyLkV2ZW50cy5FdmVudExp c3RlbmVyQnJlYWtwb2ludEFkZGVkLCBicmVha3BvaW50LnZpZXcpOwogICAgIH0sCiAKLSAgICBz ZXRYSFJCcmVha3BvaW50OiBmdW5jdGlvbih1cmwpCisgICAgY3JlYXRlWEhSQnJlYWtwb2ludDog ZnVuY3Rpb24odXJsKQogICAgIHsKLSAgICAgICAgQnJvd3NlckRlYnVnZ2VyQWdlbnQuc2V0WEhS QnJlYWtwb2ludCh1cmwpOworICAgICAgICB0aGlzLl9jcmVhdGVYSFJCcmVha3BvaW50KHVybCwg dHJ1ZSwgZmFsc2UpOwogICAgIH0sCiAKLSAgICByZW1vdmVYSFJCcmVha3BvaW50OiBmdW5jdGlv bih1cmwpCisgICAgX2NyZWF0ZVhIUkJyZWFrcG9pbnQ6IGZ1bmN0aW9uKHVybCwgZW5hYmxlZCwg cmVzdG9yZWQpCiAgICAgewotICAgICAgICBCcm93c2VyRGVidWdnZXJBZ2VudC5yZW1vdmVYSFJC cmVha3BvaW50KHVybCk7CisgICAgICAgIHZhciBicmVha3BvaW50SWQgPSB0aGlzLl9jcmVhdGVY SFJCcmVha3BvaW50SWQodXJsKTsKKyAgICAgICAgaWYgKGJyZWFrcG9pbnRJZCBpbiB0aGlzLl9i cmVha3BvaW50cykKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICB2YXIgYnJlYWtwb2lu dCA9IG5ldyBXZWJJbnNwZWN0b3IuWEhSQnJlYWtwb2ludCh1cmwpOworICAgICAgICB0aGlzLl9z ZXRCcmVha3BvaW50KGJyZWFrcG9pbnRJZCwgYnJlYWtwb2ludCwgZW5hYmxlZCwgcmVzdG9yZWQp OworCisgICAgICAgIGJyZWFrcG9pbnQudmlldyA9IG5ldyBXZWJJbnNwZWN0b3IuWEhSQnJlYWtw b2ludFZpZXcodGhpcywgYnJlYWtwb2ludElkLCBlbmFibGVkLCB1cmwpOworICAgICAgICB0aGlz LmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIu RXZlbnRzLlhIUkJyZWFrcG9pbnRBZGRlZCwgYnJlYWtwb2ludC52aWV3KTsKICAgICB9LAogCiAg ICAgX3NldEJyZWFrcG9pbnQ6IGZ1bmN0aW9uKGJyZWFrcG9pbnRJZCwgYnJlYWtwb2ludCwgZW5h YmxlZCwgcmVzdG9yZWQpCkBAIC0xNDgsNiArMTU3LDggQEAgV2ViSW5zcGVjdG9yLkJyZWFrcG9p bnRNYW5hZ2VyLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGJyZWFrcG9pbnRJZCA9IHRoaXMu X2NyZWF0ZURPTUJyZWFrcG9pbnRJZChldmVudERhdGEubm9kZUlkLCBldmVudERhdGEudHlwZSk7 CiAgICAgICAgIGVsc2UgaWYgKGV2ZW50RGF0YS5icmVha3BvaW50VHlwZSA9PT0gV2ViSW5zcGVj dG9yLkJyZWFrcG9pbnRNYW5hZ2VyLkJyZWFrcG9pbnRUeXBlcy5FdmVudExpc3RlbmVyKQogICAg ICAgICAgICAgYnJlYWtwb2ludElkID0gdGhpcy5fY3JlYXRlRXZlbnRMaXN0ZW5lckJyZWFrcG9p bnRJZChldmVudERhdGEuZXZlbnROYW1lKTsKKyAgICAgICAgZWxzZSBpZiAoZXZlbnREYXRhLmJy ZWFrcG9pbnRUeXBlID09PSBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIuQnJlYWtwb2lu dFR5cGVzLlhIUikKKyAgICAgICAgICAgIGJyZWFrcG9pbnRJZCA9IHRoaXMuX2NyZWF0ZVhIUkJy ZWFrcG9pbnRJZChldmVudERhdGEuYnJlYWtwb2ludFVSTCk7CiAgICAgICAgIGVsc2UKICAgICAg ICAgICAgIHJldHVybjsKIApAQCAtMTkxLDYgKzIwMiw4IEBAIFdlYkluc3BlY3Rvci5CcmVha3Bv aW50TWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB2YXIgYnJlYWtwb2ludCA9IGJy ZWFrcG9pbnRzW2ldOwogICAgICAgICAgICAgaWYgKGJyZWFrcG9pbnQudHlwZSA9PT0gV2ViSW5z cGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyLkJyZWFrcG9pbnRUeXBlcy5FdmVudExpc3RlbmVyKQog ICAgICAgICAgICAgICAgIHRoaXMuX2NyZWF0ZUV2ZW50TGlzdGVuZXJCcmVha3BvaW50KGJyZWFr cG9pbnQuY29uZGl0aW9uLmV2ZW50TmFtZSwgYnJlYWtwb2ludC5lbmFibGVkLCB0cnVlKTsKKyAg ICAgICAgICAgIGVsc2UgaWYgKGJyZWFrcG9pbnQudHlwZSA9PT0gV2ViSW5zcGVjdG9yLkJyZWFr cG9pbnRNYW5hZ2VyLkJyZWFrcG9pbnRUeXBlcy5YSFIpCisgICAgICAgICAgICAgICAgdGhpcy5f Y3JlYXRlWEhSQnJlYWtwb2ludChicmVha3BvaW50LmNvbmRpdGlvbi51cmwsIGJyZWFrcG9pbnQu ZW5hYmxlZCwgdHJ1ZSk7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAoIXRoaXMuX2JyZWFrcG9p bnRzUHVzaGVkVG9Gcm9udGVuZCkgewpAQCAtMjc5LDkgKzI5MiwxMiBAQCBXZWJJbnNwZWN0b3Iu QnJlYWtwb2ludE1hbmFnZXIucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIGlmICh0eXBl b2YgY29uZGl0aW9uLmV2ZW50TmFtZSAhPT0gInN0cmluZyIpCiAgICAgICAgICAgICAgICAgICAg IGNvbnRpbnVlOwogICAgICAgICAgICAgICAgIGlkICs9IGNvbmRpdGlvbi5ldmVudE5hbWU7Cisg ICAgICAgICAgICB9IGVsc2UgaWYgKGJyZWFrcG9pbnQudHlwZSA9PT0gV2ViSW5zcGVjdG9yLkJy ZWFrcG9pbnRNYW5hZ2VyLkJyZWFrcG9pbnRUeXBlcy5YSFIpIHsKKyAgICAgICAgICAgICAgICBp ZiAodHlwZW9mIGNvbmRpdGlvbi51cmwgIT09ICJzdHJpbmciKQorICAgICAgICAgICAgICAgICAg ICBjb250aW51ZTsKKyAgICAgICAgICAgICAgICBpZCArPSBjb25kaXRpb24udXJsOwogICAgICAg ICAgICAgfSBlbHNlCiAgICAgICAgICAgICAgICAgY29udGludWU7Ci0KICAgICAgICAgICAgIGlm IChpZCBpbiBicmVha3BvaW50c1NldCkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAg ICAgICAgIGJyZWFrcG9pbnRzU2V0W2lkXSA9IHRydWU7CkBAIC0yOTgsNiArMzE0LDExIEBAIFdl Ykluc3BlY3Rvci5CcmVha3BvaW50TWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgX2NyZWF0ZUV2 ZW50TGlzdGVuZXJCcmVha3BvaW50SWQ6IGZ1bmN0aW9uKGV2ZW50TmFtZSkKICAgICB7CiAgICAg ICAgIHJldHVybiAiZXZlbnRMaXN0bmVyOiIgKyBldmVudE5hbWU7CisgICAgfSwKKworICAgIF9j cmVhdGVYSFJCcmVha3BvaW50SWQ6IGZ1bmN0aW9uKHVybCkKKyAgICB7CisgICAgICAgIHJldHVy biAieGhyOiIgKyB1cmw7CiAgICAgfQogfQogCkBAIC0zNTEsNiArMzcyLDMwIEBAIFdlYkluc3Bl Y3Rvci5FdmVudExpc3RlbmVyQnJlYWtwb2ludC5wcm90b3R5cGUgPSB7CiAgICAgfQogfQogCitX ZWJJbnNwZWN0b3IuWEhSQnJlYWtwb2ludCA9IGZ1bmN0aW9uKHVybCkKK3sKKyAgICB0aGlzLl91 cmwgPSB1cmw7Cit9CisKK1dlYkluc3BlY3Rvci5YSFJCcmVha3BvaW50LnByb3RvdHlwZSA9IHsK KyAgICBfZW5hYmxlOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBCcm93c2VyRGVidWdnZXJB Z2VudC5zZXRYSFJCcmVha3BvaW50KHRoaXMuX3VybCk7CisgICAgfSwKKworICAgIF9kaXNhYmxl OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBCcm93c2VyRGVidWdnZXJBZ2VudC5yZW1vdmVY SFJCcmVha3BvaW50KHRoaXMuX3VybCk7CisgICAgfSwKKworICAgIF9zZXJpYWxpemVUb0pTT046 IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHZhciB0eXBlID0gV2ViSW5zcGVjdG9yLkJyZWFr cG9pbnRNYW5hZ2VyLkJyZWFrcG9pbnRUeXBlcy5YSFI7CisgICAgICAgIHJldHVybiB7IHR5cGU6 IHR5cGUsIGNvbmRpdGlvbjogeyB1cmw6IHRoaXMuX3VybCB9IH07CisgICAgfQorfQorCisKIAog V2ViSW5zcGVjdG9yLk5hdGl2ZUJyZWFrcG9pbnRWaWV3ID0gZnVuY3Rpb24obWFuYWdlciwgaWQs IGVuYWJsZWQpCiB7CkBAIC01MzMsNiArNTc4LDQzIEBAIFdlYkluc3BlY3Rvci5FdmVudExpc3Rl bmVyQnJlYWtwb2ludFZpZXcucHJvdG90eXBlID0gewogCiBXZWJJbnNwZWN0b3IuRXZlbnRMaXN0 ZW5lckJyZWFrcG9pbnRWaWV3LnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuTmF0 aXZlQnJlYWtwb2ludFZpZXcucHJvdG90eXBlOwogCitXZWJJbnNwZWN0b3IuWEhSQnJlYWtwb2lu dFZpZXcgPSBmdW5jdGlvbihtYW5hZ2VyLCBpZCwgZW5hYmxlZCwgdXJsKQoreworICAgIFdlYklu c3BlY3Rvci5OYXRpdmVCcmVha3BvaW50Vmlldy5jYWxsKHRoaXMsIG1hbmFnZXIsIGlkLCBlbmFi bGVkKTsKKyAgICB0aGlzLl91cmwgPSB1cmw7Cit9CisKK1dlYkluc3BlY3Rvci5YSFJCcmVha3Bv aW50Vmlldy5wcm90b3R5cGUgPSB7CisgICAgY29tcGFyZVRvOiBmdW5jdGlvbihvdGhlcikKKyAg ICB7CisgICAgICAgIHJldHVybiB0aGlzLl9jb21wYXJlKHRoaXMuX3VybCwgb3RoZXIuX3VybCk7 CisgICAgfSwKKworICAgIHBvcHVsYXRlRWRpdEVsZW1lbnQ6IGZ1bmN0aW9uKGVsZW1lbnQpCisg ICAgeworICAgICAgICBlbGVtZW50LnRleHRDb250ZW50ID0gdGhpcy5fdXJsOworICAgIH0sCisK KyAgICBwb3B1bGF0ZUxhYmVsRWxlbWVudDogZnVuY3Rpb24oZWxlbWVudCkKKyAgICB7CisgICAg ICAgIHZhciBsYWJlbDsKKyAgICAgICAgaWYgKCF0aGlzLl91cmwubGVuZ3RoKQorICAgICAgICAg ICAgbGFiZWwgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkFueSBYSFIiKTsKKyAgICAgICAgZWxz ZQorICAgICAgICAgICAgbGFiZWwgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlVSTCBjb250YWlu cyBcIiVzXCIiLCB0aGlzLl91cmwpOworICAgICAgICBlbGVtZW50LmFwcGVuZENoaWxkKGRvY3Vt ZW50LmNyZWF0ZVRleHROb2RlKGxhYmVsKSk7CisgICAgICAgIGVsZW1lbnQuYWRkU3R5bGVDbGFz cygiY3Vyc29yLWF1dG8iKTsKKyAgICB9LAorCisgICAgcG9wdWxhdGVTdGF0dXNNZXNzYWdlRWxl bWVudDogZnVuY3Rpb24oZWxlbWVudCkKKyAgICB7CisgICAgICAgIHZhciBzdGF0dXMgPSBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIlBhdXNlZCBvbiBhIFhNTEh0dHBSZXF1ZXN0LiIpOworICAgICAg ICBlbGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKHN0YXR1cykpOwor ICAgIH0KK30KKworV2ViSW5zcGVjdG9yLlhIUkJyZWFrcG9pbnRWaWV3LnByb3RvdHlwZS5fX3By b3RvX18gPSBXZWJJbnNwZWN0b3IuTmF0aXZlQnJlYWtwb2ludFZpZXcucHJvdG90eXBlOworCiBX ZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludFR5cGVzID0gewogICAgIFN1YnRyZWVNb2RpZmllZDog MCwKICAgICBBdHRyaWJ1dGVNb2RpZmllZDogMSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5qcwppbmRl eCAxM2Y2NjhhY2QxMDFjZjUyNjY0NTdjYWNkOGUxMmZhZjFmZTE4NTljLi4wOTkzNjg0MGIyOTQ1 NmQ3ODllNDNjNTA2ZGVkMWFkOTYwOWU0NTNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRzU2lkZWJhclBhbmUuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50c1NpZGViYXJQYW5lLmpzCkBA IC0yNzYsMTc3ICsyNzYsNjEgQEAgV2ViSW5zcGVjdG9yLlhIUkJyZWFrcG9pbnRzU2lkZWJhclBh bmUgPSBmdW5jdGlvbigpCiB7CiAgICAgV2ViSW5zcGVjdG9yLk5hdGl2ZUJyZWFrcG9pbnRzU2lk ZWJhclBhbmUuY2FsbCh0aGlzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlhIUiBCcmVha3BvaW50 cyIpKTsKIAotICAgIHRoaXMuX2JyZWFrcG9pbnRFbGVtZW50cyA9IHt9OworICAgIGZ1bmN0aW9u IGFkZEJ1dHRvbkNsaWNrZWQoZXZlbnQpCisgICAgeworICAgICAgICBldmVudC5zdG9wUHJvcGFn YXRpb24oKTsKKyAgICAgICAgdGhpcy5fc3RhcnRFZGl0aW5nQnJlYWtwb2ludChudWxsKTsKKyAg ICB9CiAKICAgICB2YXIgYWRkQnV0dG9uID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYnV0dG9u Iik7CiAgICAgYWRkQnV0dG9uLmNsYXNzTmFtZSA9ICJhZGQiOwotICAgIGFkZEJ1dHRvbi5hZGRF dmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX2FkZEJ1dHRvbkNsaWNrZWQuYmluZCh0aGlzKSwg ZmFsc2UpOworICAgIGFkZEJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIGFkZEJ1dHRv bkNsaWNrZWQuYmluZCh0aGlzKSwgZmFsc2UpOwogICAgIHRoaXMudGl0bGVFbGVtZW50LmFwcGVu ZENoaWxkKGFkZEJ1dHRvbik7Ci0KLSAgICB0aGlzLl9yZXN0b3JlQnJlYWtwb2ludHMoKTsKIH0K IAogV2ViSW5zcGVjdG9yLlhIUkJyZWFrcG9pbnRzU2lkZWJhclBhbmUucHJvdG90eXBlID0gewot ICAgIF9hZGRCdXR0b25DbGlja2VkOiBmdW5jdGlvbihldmVudCkKLSAgICB7Ci0gICAgICAgIGV2 ZW50LnN0b3BQcm9wYWdhdGlvbigpOwotCi0gICAgICAgIHRoaXMuZXhwYW5kZWQgPSB0cnVlOwot Ci0gICAgICAgIHZhciBpbnB1dEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFu Iik7Ci0gICAgICAgIGlucHV0RWxlbWVudC5jbGFzc05hbWUgPSAiYnJlYWtwb2ludC1jb25kaXRp b24gZWRpdGluZyI7Ci0gICAgICAgIHRoaXMuX2FkZExpc3RFbGVtZW50KGlucHV0RWxlbWVudCwg dGhpcy5saXN0RWxlbWVudC5maXJzdENoaWxkKTsKLQotICAgICAgICBmdW5jdGlvbiBmaW5pc2hF ZGl0aW5nKGFjY2VwdCwgZSwgdGV4dCkKLSAgICAgICAgewotICAgICAgICAgICAgdGhpcy5fcmVt b3ZlTGlzdEVsZW1lbnQoaW5wdXRFbGVtZW50KTsKLSAgICAgICAgICAgIGlmIChhY2NlcHQpIHsK LSAgICAgICAgICAgICAgICB0aGlzLl9zZXRCcmVha3BvaW50KHRleHQsIHRydWUpOwotICAgICAg ICAgICAgICAgIHRoaXMuX3NhdmVCcmVha3BvaW50cygpOwotICAgICAgICAgICAgfQotICAgICAg ICB9Ci0KLSAgICAgICAgV2ViSW5zcGVjdG9yLnN0YXJ0RWRpdGluZyhpbnB1dEVsZW1lbnQsIHsK LSAgICAgICAgICAgIGNvbW1pdEhhbmRsZXI6IGZpbmlzaEVkaXRpbmcuYmluZCh0aGlzLCB0cnVl KSwKLSAgICAgICAgICAgIGNhbmNlbEhhbmRsZXI6IGZpbmlzaEVkaXRpbmcuYmluZCh0aGlzLCBm YWxzZSkKLSAgICAgICAgfSk7Ci0gICAgfSwKLQotICAgIF9zZXRCcmVha3BvaW50OiBmdW5jdGlv bih1cmwsIGVuYWJsZWQpCisgICAgYWRkQnJlYWtwb2ludEl0ZW06IGZ1bmN0aW9uKGJyZWFrcG9p bnRJdGVtKQogICAgIHsKLSAgICAgICAgaWYgKHVybCBpbiB0aGlzLl9icmVha3BvaW50RWxlbWVu dHMpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgdmFyIGVsZW1lbnQgPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJsaSIpOwotICAgICAgICBlbGVtZW50Ll91cmwgPSB1cmw7Ci0gICAg ICAgIGVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY29udGV4dG1lbnUiLCB0aGlzLl9jb250ZXh0 TWVudS5iaW5kKHRoaXMsIHVybCksIHRydWUpOwotCi0gICAgICAgIHZhciBjaGVja2JveEVsZW1l bnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJpbnB1dCIpOwotICAgICAgICBjaGVja2JveEVs ZW1lbnQuY2xhc3NOYW1lID0gImNoZWNrYm94LWVsZW0iOwotICAgICAgICBjaGVja2JveEVsZW1l bnQudHlwZSA9ICJjaGVja2JveCI7Ci0gICAgICAgIGNoZWNrYm94RWxlbWVudC5jaGVja2VkID0g ZW5hYmxlZDsKLSAgICAgICAgY2hlY2tib3hFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNr IiwgdGhpcy5fY2hlY2tib3hDbGlja2VkLmJpbmQodGhpcywgdXJsKSwgZmFsc2UpOwotICAgICAg ICBlbGVtZW50Ll9jaGVja2JveEVsZW1lbnQgPSBjaGVja2JveEVsZW1lbnQ7Ci0gICAgICAgIGVs ZW1lbnQuYXBwZW5kQ2hpbGQoY2hlY2tib3hFbGVtZW50KTsKLQotICAgICAgICB2YXIgbGFiZWxF bGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOwotICAgICAgICBpZiAoIXVy bCkKLSAgICAgICAgICAgIGxhYmVsRWxlbWVudC50ZXh0Q29udGVudCA9IFdlYkluc3BlY3Rvci5V SVN0cmluZygiQW55IFhIUiIpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBsYWJlbEVsZW1l bnQudGV4dENvbnRlbnQgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlVSTCBjb250YWlucyBcIiVz XCIiLCB1cmwpOwotICAgICAgICBsYWJlbEVsZW1lbnQuYWRkU3R5bGVDbGFzcygiY3Vyc29yLWF1 dG8iKTsKLSAgICAgICAgbGFiZWxFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImRibGNsaWNrIiwg dGhpcy5fbGFiZWxDbGlja2VkLmJpbmQodGhpcywgdXJsKSwgZmFsc2UpOwotICAgICAgICBlbGVt ZW50LmFwcGVuZENoaWxkKGxhYmVsRWxlbWVudCk7Ci0KLSAgICAgICAgdmFyIGN1cnJlbnRFbGVt ZW50ID0gdGhpcy5saXN0RWxlbWVudC5maXJzdENoaWxkOwotICAgICAgICB3aGlsZSAoY3VycmVu dEVsZW1lbnQpIHsKLSAgICAgICAgICAgIGlmIChjdXJyZW50RWxlbWVudC5fdXJsICYmIGN1cnJl bnRFbGVtZW50Ll91cmwgPCBlbGVtZW50Ll91cmwpCi0gICAgICAgICAgICAgICAgYnJlYWs7Ci0g ICAgICAgICAgICBjdXJyZW50RWxlbWVudCA9IGN1cnJlbnRFbGVtZW50Lm5leHRTaWJsaW5nOwot ICAgICAgICB9Ci0gICAgICAgIHRoaXMuX2FkZExpc3RFbGVtZW50KGVsZW1lbnQsIGN1cnJlbnRF bGVtZW50KTsKLSAgICAgICAgdGhpcy5fYnJlYWtwb2ludEVsZW1lbnRzW3VybF0gPSBlbGVtZW50 OwotICAgICAgICBpZiAoZW5hYmxlZCkKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5icmVha3Bv aW50TWFuYWdlci5zZXRYSFJCcmVha3BvaW50KHVybCk7CisgICAgICAgIFdlYkluc3BlY3Rvci5O YXRpdmVCcmVha3BvaW50c1NpZGViYXJQYW5lLnByb3RvdHlwZS5hZGRCcmVha3BvaW50SXRlbS5j YWxsKHRoaXMsIGJyZWFrcG9pbnRJdGVtKTsKKyAgICAgICAgYnJlYWtwb2ludEl0ZW0uX2xhYmVs RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJkYmxjbGljayIsIHRoaXMuX3N0YXJ0RWRpdGluZ0Jy ZWFrcG9pbnQuYmluZCh0aGlzLCBicmVha3BvaW50SXRlbSksIGZhbHNlKTsKICAgICB9LAogCi0g ICAgX3JlbW92ZUJyZWFrcG9pbnQ6IGZ1bmN0aW9uKHVybCkKKyAgICBfc3RhcnRFZGl0aW5nQnJl YWtwb2ludDogZnVuY3Rpb24oYnJlYWtwb2ludEl0ZW0pCiAgICAgewotICAgICAgICB2YXIgZWxl bWVudCA9IHRoaXMuX2JyZWFrcG9pbnRFbGVtZW50c1t1cmxdOwotICAgICAgICBpZiAoIWVsZW1l bnQpCisgICAgICAgIGlmICh0aGlzLl9lZGl0aW5nQnJlYWtwb2ludCkKICAgICAgICAgICAgIHJl dHVybjsKKyAgICAgICAgdGhpcy5fZWRpdGluZ0JyZWFrcG9pbnQgPSB0cnVlOwogCi0gICAgICAg IHRoaXMuX3JlbW92ZUxpc3RFbGVtZW50KGVsZW1lbnQpOwotICAgICAgICBkZWxldGUgdGhpcy5f YnJlYWtwb2ludEVsZW1lbnRzW3VybF07Ci0gICAgICAgIGlmIChlbGVtZW50Ll9jaGVja2JveEVs ZW1lbnQuY2hlY2tlZCkKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5icmVha3BvaW50TWFuYWdl ci5yZW1vdmVYSFJCcmVha3BvaW50KHVybCk7Ci0gICAgfSwKLQotICAgIF9jb250ZXh0TWVudTog ZnVuY3Rpb24odXJsLCBldmVudCkKLSAgICB7Ci0gICAgICAgIHZhciBjb250ZXh0TWVudSA9IG5l dyBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUoKTsKLSAgICAgICAgZnVuY3Rpb24gcmVtb3ZlQnJl YWtwb2ludCgpCi0gICAgICAgIHsKLSAgICAgICAgICAgIHRoaXMuX3JlbW92ZUJyZWFrcG9pbnQo dXJsKTsKLSAgICAgICAgICAgIHRoaXMuX3NhdmVCcmVha3BvaW50cygpOwotICAgICAgICB9Ci0g ICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZW1v dmUgQnJlYWtwb2ludCIpLCByZW1vdmVCcmVha3BvaW50LmJpbmQodGhpcykpOwotICAgICAgICBj b250ZXh0TWVudS5zaG93KGV2ZW50KTsKLSAgICB9LAotCi0gICAgX2NoZWNrYm94Q2xpY2tlZDog ZnVuY3Rpb24odXJsLCBldmVudCkKLSAgICB7Ci0gICAgICAgIGlmIChldmVudC50YXJnZXQuY2hl Y2tlZCkKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5icmVha3BvaW50TWFuYWdlci5zZXRYSFJC cmVha3BvaW50KHVybCk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5i cmVha3BvaW50TWFuYWdlci5yZW1vdmVYSFJCcmVha3BvaW50KHVybCk7Ci0gICAgICAgIHRoaXMu X3NhdmVCcmVha3BvaW50cygpOwotICAgIH0sCisgICAgICAgIGlmICghdGhpcy5leHBhbmRlZCkK KyAgICAgICAgICAgIHRoaXMuZXhwYW5kZWQgPSB0cnVlOwogCi0gICAgX2xhYmVsQ2xpY2tlZDog ZnVuY3Rpb24odXJsKQotICAgIHsKLSAgICAgICAgdmFyIGVsZW1lbnQgPSB0aGlzLl9icmVha3Bv aW50RWxlbWVudHNbdXJsXTsKICAgICAgICAgdmFyIGlucHV0RWxlbWVudCA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoInNwYW4iKTsKICAgICAgICAgaW5wdXRFbGVtZW50LmNsYXNzTmFtZSA9ICJi cmVha3BvaW50LWNvbmRpdGlvbiBlZGl0aW5nIjsKLSAgICAgICAgaW5wdXRFbGVtZW50LnRleHRD b250ZW50ID0gdXJsOwotICAgICAgICB0aGlzLmxpc3RFbGVtZW50Lmluc2VydEJlZm9yZShpbnB1 dEVsZW1lbnQsIGVsZW1lbnQpOwotICAgICAgICBlbGVtZW50LmFkZFN0eWxlQ2xhc3MoImhpZGRl biIpOwotCi0gICAgICAgIGZ1bmN0aW9uIGZpbmlzaEVkaXRpbmcoYWNjZXB0LCBlLCB0ZXh0KQot ICAgICAgICB7Ci0gICAgICAgICAgICB0aGlzLl9yZW1vdmVMaXN0RWxlbWVudChpbnB1dEVsZW1l bnQpOwotICAgICAgICAgICAgaWYgKGFjY2VwdCkgewotICAgICAgICAgICAgICAgIHRoaXMuX3Jl bW92ZUJyZWFrcG9pbnQodXJsKTsKLSAgICAgICAgICAgICAgICB0aGlzLl9zZXRCcmVha3BvaW50 KHRleHQsIGVsZW1lbnQuX2NoZWNrYm94RWxlbWVudC5jaGVja2VkKTsKLSAgICAgICAgICAgICAg ICB0aGlzLl9zYXZlQnJlYWtwb2ludHMoKTsKLSAgICAgICAgICAgIH0gZWxzZQotICAgICAgICAg ICAgICAgIGVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygiaGlkZGVuIik7Ci0gICAgICAgIH0KKyAg ICAgICAgaWYgKGJyZWFrcG9pbnRJdGVtKSB7CisgICAgICAgICAgICBicmVha3BvaW50SXRlbS5w b3B1bGF0ZUVkaXRFbGVtZW50KGlucHV0RWxlbWVudCk7CisgICAgICAgICAgICB0aGlzLmxpc3RF bGVtZW50Lmluc2VydEJlZm9yZShpbnB1dEVsZW1lbnQsIGJyZWFrcG9pbnRJdGVtLmVsZW1lbnQp OworICAgICAgICAgICAgYnJlYWtwb2ludEl0ZW0uZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJoaWRk ZW4iKTsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICB0aGlzLl9hZGRMaXN0RWxlbWVudChp bnB1dEVsZW1lbnQsIHRoaXMubGlzdEVsZW1lbnQuZmlyc3RDaGlsZCk7CiAKKyAgICAgICAgdmFy IGNvbW1pdEhhbmRsZXIgPSB0aGlzLl9oaWRlRWRpdEJyZWFrcG9pbnREaWFsb2cuYmluZCh0aGlz LCBpbnB1dEVsZW1lbnQsIHRydWUsIGJyZWFrcG9pbnRJdGVtKTsKKyAgICAgICAgdmFyIGNhbmNl bEhhbmRsZXIgPSB0aGlzLl9oaWRlRWRpdEJyZWFrcG9pbnREaWFsb2cuYmluZCh0aGlzLCBpbnB1 dEVsZW1lbnQsIGZhbHNlLCBicmVha3BvaW50SXRlbSk7CiAgICAgICAgIFdlYkluc3BlY3Rvci5z dGFydEVkaXRpbmcoaW5wdXRFbGVtZW50LCB7Ci0gICAgICAgICAgICBjb21taXRIYW5kbGVyOiBm aW5pc2hFZGl0aW5nLmJpbmQodGhpcywgdHJ1ZSksCi0gICAgICAgICAgICBjYW5jZWxIYW5kbGVy OiBmaW5pc2hFZGl0aW5nLmJpbmQodGhpcywgZmFsc2UpCisgICAgICAgICAgICBjb21taXRIYW5k bGVyOiBjb21taXRIYW5kbGVyLAorICAgICAgICAgICAgY2FuY2VsSGFuZGxlcjogY2FuY2VsSGFu ZGxlcgogICAgICAgICB9KTsKICAgICB9LAogCi0gICAgaGlnaGxpZ2h0QnJlYWtwb2ludDogZnVu Y3Rpb24odXJsKQotICAgIHsKLSAgICAgICAgdmFyIGVsZW1lbnQgPSB0aGlzLl9icmVha3BvaW50 RWxlbWVudHNbdXJsXTsKLSAgICAgICAgaWYgKCFlbGVtZW50KQotICAgICAgICAgICAgcmV0dXJu OwotICAgICAgICB0aGlzLmV4cGFuZGVkID0gdHJ1ZTsKLSAgICAgICAgZWxlbWVudC5hZGRTdHls ZUNsYXNzKCJicmVha3BvaW50LWhpdCIpOwotICAgICAgICB0aGlzLl9oaWdobGlnaHRlZEVsZW1l bnQgPSBlbGVtZW50OwotICAgIH0sCi0KLSAgICBjbGVhckJyZWFrcG9pbnRIaWdobGlnaHQ6IGZ1 bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9oaWdobGlnaHRlZEVsZW1lbnQpIHsK LSAgICAgICAgICAgIHRoaXMuX2hpZ2hsaWdodGVkRWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJi cmVha3BvaW50LWhpdCIpOwotICAgICAgICAgICAgZGVsZXRlIHRoaXMuX2hpZ2hsaWdodGVkRWxl bWVudDsKLSAgICAgICAgfQotICAgIH0sCi0KLSAgICBfc2F2ZUJyZWFrcG9pbnRzOiBmdW5jdGlv bigpCi0gICAgewotICAgICAgICB2YXIgYnJlYWtwb2ludHMgPSBbXTsKLSAgICAgICAgZm9yICh2 YXIgdXJsIGluIHRoaXMuX2JyZWFrcG9pbnRFbGVtZW50cykKLSAgICAgICAgICAgIGJyZWFrcG9p bnRzLnB1c2goeyB1cmw6IHVybCwgZW5hYmxlZDogdGhpcy5fYnJlYWtwb2ludEVsZW1lbnRzW3Vy bF0uX2NoZWNrYm94RWxlbWVudC5jaGVja2VkIH0pOwotICAgICAgICBXZWJJbnNwZWN0b3Iuc2V0 dGluZ3MueGhyQnJlYWtwb2ludHMgPSBicmVha3BvaW50czsKLSAgICB9LAotCi0gICAgX3Jlc3Rv cmVCcmVha3BvaW50czogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgdmFyIGJyZWFrcG9pbnRz ID0gV2ViSW5zcGVjdG9yLnNldHRpbmdzLnhockJyZWFrcG9pbnRzOwotICAgICAgICBmb3IgKHZh ciBpID0gMDsgaSA8IGJyZWFrcG9pbnRzLmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICB2YXIg YnJlYWtwb2ludCA9IGJyZWFrcG9pbnRzW2ldOwotICAgICAgICAgICAgaWYgKGJyZWFrcG9pbnQg JiYgdHlwZW9mIGJyZWFrcG9pbnQudXJsID09PSAic3RyaW5nIikKLSAgICAgICAgICAgICAgICB0 aGlzLl9zZXRCcmVha3BvaW50KGJyZWFrcG9pbnQudXJsLCBicmVha3BvaW50LmVuYWJsZWQpOwot ICAgICAgICB9Ci0gICAgfSwKLQotICAgIF9wcm9qZWN0Q2hhbmdlZDogZnVuY3Rpb24oKQorICAg IF9oaWRlRWRpdEJyZWFrcG9pbnREaWFsb2c6IGZ1bmN0aW9uKGlucHV0RWxlbWVudCwgYWNjZXB0 LCBicmVha3BvaW50SXRlbSkKICAgICB7CisgICAgICAgIHRoaXMuX3JlbW92ZUxpc3RFbGVtZW50 KGlucHV0RWxlbWVudCk7CisgICAgICAgIHRoaXMuX2VkaXRpbmdCcmVha3BvaW50ID0gZmFsc2U7 CisgICAgICAgIGlmIChhY2NlcHQpIHsKKyAgICAgICAgICAgIGlmIChicmVha3BvaW50SXRlbSkK KyAgICAgICAgICAgICAgICBicmVha3BvaW50SXRlbS5yZW1vdmUoKTsKKyAgICAgICAgICAgIFdl Ykluc3BlY3Rvci5icmVha3BvaW50TWFuYWdlci5jcmVhdGVYSFJCcmVha3BvaW50KGlucHV0RWxl bWVudC50ZXh0Q29udGVudC50b0xvd2VyQ2FzZSgpKTsKKyAgICAgICAgfSBlbHNlIGlmIChicmVh a3BvaW50SXRlbSkKKyAgICAgICAgICAgIGJyZWFrcG9pbnRJdGVtLmVsZW1lbnQucmVtb3ZlU3R5 bGVDbGFzcygiaGlkZGVuIik7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NhbGxTdGFja1NpZGViYXJQYW5lLmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DYWxsU3RhY2tTaWRlYmFyUGFuZS5qcwppbmRleCBm YWYyNzk5MWZkMGM2OTFlZmVlZTE5Y2YyOThmZGQwYjZkYzY1NDhlLi45YTg2OTA5ZTk5OGRkZjVm NjRhYWExZDUxM2JjNmEyYmUwNTI1ZTdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0NhbGxTdGFja1NpZGViYXJQYW5lLmpzCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ2FsbFN0YWNrU2lkZWJhclBhbmUuanMKQEAgLTg3LDEy ICs4Nyw4IEBAIFdlYkluc3BlY3Rvci5DYWxsU3RhY2tTaWRlYmFyUGFuZS5wcm90b3R5cGUgPSB7 CiAKICAgICAgICAgaWYgKGRldGFpbHMuYnJlYWtwb2ludCkKICAgICAgICAgICAgIHRoaXMuX3Nj cmlwdEJyZWFrcG9pbnRIaXQoKTsKLSAgICAgICAgZWxzZSBpZiAoZGV0YWlscy5ldmVudFR5cGUg PT09IFdlYkluc3BlY3Rvci5EZWJ1Z2dlckV2ZW50VHlwZXMuTmF0aXZlQnJlYWtwb2ludCkgewot ICAgICAgICAgICAgaWYgKGRldGFpbHMuZXZlbnREYXRhLmJyZWFrcG9pbnRUeXBlID09PSBXZWJJ bnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIuQnJlYWtwb2ludFR5cGVzLlhIUikKLSAgICAgICAg ICAgICAgICB0aGlzLl94aHJCcmVha3BvaW50SGl0KCk7Ci0gICAgICAgICAgICBlbHNlCi0gICAg ICAgICAgICAgICAgdGhpcy5fbmF0aXZlQnJlYWtwb2ludEhpdChkZXRhaWxzLmV2ZW50RGF0YSk7 Ci0gICAgICAgIH0KKyAgICAgICAgZWxzZSBpZiAoZGV0YWlscy5ldmVudFR5cGUgPT09IFdlYklu c3BlY3Rvci5EZWJ1Z2dlckV2ZW50VHlwZXMuTmF0aXZlQnJlYWtwb2ludCkKKyAgICAgICAgICAg IHRoaXMuX25hdGl2ZUJyZWFrcG9pbnRIaXQoZGV0YWlscy5ldmVudERhdGEpOwogICAgIH0sCiAK ICAgICBzZXQgc2VsZWN0ZWRDYWxsRnJhbWUoeCkKQEAgLTE5MCwxNCArMTg2LDYgQEAgV2ViSW5z cGVjdG9yLkNhbGxTdGFja1NpZGViYXJQYW5lLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5i b2R5RWxlbWVudC5hcHBlbmRDaGlsZChzdGF0dXNNZXNzYWdlRWxlbWVudCk7CiAgICAgfSwKIAot ICAgIF94aHJCcmVha3BvaW50SGl0OiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICB2YXIgc3Rh dHVzTWVzc2FnZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICAg ICAgc3RhdHVzTWVzc2FnZUVsZW1lbnQuY2xhc3NOYW1lID0gImluZm8iOwotICAgICAgICBzdGF0 dXNNZXNzYWdlRWxlbWVudC50ZXh0Q29udGVudCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiUGF1 c2VkIG9uIGEgWE1MSHR0cFJlcXVlc3QuIik7Ci0gICAgICAgIHRoaXMuYm9keUVsZW1lbnQuYXBw ZW5kQ2hpbGQoc3RhdHVzTWVzc2FnZUVsZW1lbnQpOwotICAgIH0sCi0KICAgICBfbmF0aXZlQnJl YWtwb2ludEhpdDogZnVuY3Rpb24oZXZlbnREYXRhKQogICAgIHsKICAgICAgICAgdmFyIGJyZWFr cG9pbnQgPSBXZWJJbnNwZWN0b3IuYnJlYWtwb2ludE1hbmFnZXIuYnJlYWtwb2ludFZpZXdGb3JF dmVudERhdGEoZXZlbnREYXRhKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9TY3JpcHRzUGFuZWwuanMKaW5kZXggYjEwNzM0OGUzZmEwMGRjYjNlYTljOTc4M2I2 NjlmMzE4YTI0ZmZiNC4uN2Q3MmZkN2I2MjA3MjU3YTJiY2U3MDk3ZjhhZjRmMmQzMWZmOTkyMiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFu ZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFu ZWwuanMKQEAgLTE0NSw3ICsxNDUsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsID0gZnVu Y3Rpb24oKQogICAgIHRoaXMuc2lkZWJhclBhbmVzLmpzQnJlYWtwb2ludHMgPSBuZXcgV2ViSW5z cGVjdG9yLkphdmFTY3JpcHRCcmVha3BvaW50c1NpZGViYXJQYW5lKHRoaXMuX3ByZXNlbnRhdGlv bk1vZGVsKTsKICAgICBpZiAoUHJlZmVyZW5jZXMubmF0aXZlSW5zdHJ1bWVudGF0aW9uRW5hYmxl ZCkgewogICAgICAgICB0aGlzLnNpZGViYXJQYW5lcy5kb21CcmVha3BvaW50cyA9IFdlYkluc3Bl Y3Rvci5jcmVhdGVET01CcmVha3BvaW50c1NpZGViYXJQYW5lKCk7Ci0gICAgICAgIHRoaXMuc2lk ZWJhclBhbmVzLnhockJyZWFrcG9pbnRzID0gbmV3IFdlYkluc3BlY3Rvci5YSFJCcmVha3BvaW50 c1NpZGViYXJQYW5lKCk7CisgICAgICAgIHRoaXMuc2lkZWJhclBhbmVzLnhockJyZWFrcG9pbnRz ID0gV2ViSW5zcGVjdG9yLmNyZWF0ZVhIUkJyZWFrcG9pbnRzU2lkZWJhclBhbmUoKTsKICAgICAg ICAgdGhpcy5zaWRlYmFyUGFuZXMuZXZlbnRMaXN0ZW5lckJyZWFrcG9pbnRzID0gbmV3IFdlYklu c3BlY3Rvci5FdmVudExpc3RlbmVyQnJlYWtwb2ludHNTaWRlYmFyUGFuZSgpOwogICAgIH0KIApA QCAtNDIxLDggKzQyMSw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0g ewogCiAgICAgX2RlYnVnZ2VyUGF1c2VkOiBmdW5jdGlvbihldmVudCkKICAgICB7Ci0gICAgICAg IHZhciBkZXRhaWxzID0gZXZlbnQuZGF0YTsKLSAgICAgICAgdmFyIGNhbGxGcmFtZXMgPSBkZXRh aWxzLmNhbGxGcmFtZXM7CisgICAgICAgIHZhciBjYWxsRnJhbWVzID0gZXZlbnQuZGF0YS5jYWxs RnJhbWVzOwogCiAgICAgICAgIHRoaXMuX3BhdXNlZCA9IHRydWU7CiAgICAgICAgIHRoaXMuX3dh aXRpbmdUb1BhdXNlID0gZmFsc2U7CkBAIC00MzUsMTMgKzQzNCw4IEBAIFdlYkluc3BlY3Rvci5T Y3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLnNpZGViYXJQYW5lcy5jYWxs c3RhY2sudXBkYXRlKGV2ZW50LmRhdGEpOwogICAgICAgICB0aGlzLnNpZGViYXJQYW5lcy5jYWxs c3RhY2suc2VsZWN0ZWRDYWxsRnJhbWUgPSBjYWxsRnJhbWVzWzBdOwogCi0gICAgICAgIGlmIChk ZXRhaWxzLmV2ZW50VHlwZSA9PT0gV2ViSW5zcGVjdG9yLkRlYnVnZ2VyRXZlbnRUeXBlcy5OYXRp dmVCcmVha3BvaW50KSB7Ci0gICAgICAgICAgICBpZiAoZGV0YWlscy5ldmVudERhdGEuYnJlYWtw b2ludFR5cGUgPT09IFdlYkluc3BlY3Rvci5CcmVha3BvaW50TWFuYWdlci5CcmVha3BvaW50VHlw ZXMuWEhSKQotICAgICAgICAgICAgICAgIHRoaXMuc2lkZWJhclBhbmVzLnhockJyZWFrcG9pbnRz LmhpZ2hsaWdodEJyZWFrcG9pbnQoZGV0YWlscy5ldmVudERhdGEuYnJlYWtwb2ludFVSTCk7Ci0g ICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICB2YXIgc291cmNlTG9jYXRpb24gPSB0aGlzLl9w cmVzZW50YXRpb25Nb2RlbC5zZWxlY3RlZENhbGxGcmFtZS5zb3VyY2VMb2NhdGlvbjsKLSAgICAg ICAgICAgIHRoaXMuc2lkZWJhclBhbmVzLmpzQnJlYWtwb2ludHMuaGlnaGxpZ2h0QnJlYWtwb2lu dChzb3VyY2VMb2NhdGlvbi5zb3VyY2VGaWxlSWQsIHNvdXJjZUxvY2F0aW9uLmxpbmVOdW1iZXIp OwotICAgICAgICB9CisgICAgICAgIHZhciBzb3VyY2VMb2NhdGlvbiA9IHRoaXMuX3ByZXNlbnRh dGlvbk1vZGVsLnNlbGVjdGVkQ2FsbEZyYW1lLnNvdXJjZUxvY2F0aW9uOworICAgICAgICB0aGlz LnNpZGViYXJQYW5lcy5qc0JyZWFrcG9pbnRzLmhpZ2hsaWdodEJyZWFrcG9pbnQoc291cmNlTG9j YXRpb24uc291cmNlRmlsZUlkLCBzb3VyY2VMb2NhdGlvbi5saW5lTnVtYmVyKTsKIAogICAgICAg ICB3aW5kb3cuZm9jdXMoKTsKICAgICAgICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmJyaW5nVG9G cm9udCgpOwpAQCAtODAzLDcgKzc5Nyw2IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJv dG90eXBlID0gewogICAgICAgICB0aGlzLnNpZGViYXJQYW5lcy5jYWxsc3RhY2sudXBkYXRlKG51 bGwpOwogICAgICAgICB0aGlzLnNpZGViYXJQYW5lcy5zY29wZWNoYWluLnVwZGF0ZShudWxsKTsK ICAgICAgICAgdGhpcy5zaWRlYmFyUGFuZXMuanNCcmVha3BvaW50cy5jbGVhckJyZWFrcG9pbnRI aWdobGlnaHQoKTsKLSAgICAgICAgdGhpcy5zaWRlYmFyUGFuZXMueGhyQnJlYWtwb2ludHMuY2xl YXJCcmVha3BvaW50SGlnaGxpZ2h0KCk7CiAKICAgICAgICAgdGhpcy5fY2xlYXJDdXJyZW50RXhl Y3V0aW9uTGluZSgpOwogICAgICAgICB0aGlzLl91cGRhdGVEZWJ1Z2dlckJ1dHRvbnMoKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzCmluZGV4IDE4 OGQ4YmQ3MTRhZjVmZWI1YWU0ZWU3NTFjMWMwM2UyNWFlMDQ4NGMuLmIzMDJhNmRlOWZmYjBjNzdi ZmU1ZTM4NDM0NjM4MmMzNWY4YmY4NGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TZXR0aW5ncy5qcwpAQCAtNzIsNyArNzIsNiBAQCBXZWJJbnNwZWN0b3IuU2V0 dGluZ3MgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5pbnN0YWxsQXBwbGljYXRpb25TZXR0aW5nKCJz aG93VXNlckFnZW50U3R5bGVzIiwgdHJ1ZSk7CiAgICAgdGhpcy5pbnN0YWxsQXBwbGljYXRpb25T ZXR0aW5nKCJ3YXRjaEV4cHJlc3Npb25zIiwgW10pOwogICAgIHRoaXMuaW5zdGFsbEFwcGxpY2F0 aW9uU2V0dGluZygiYnJlYWtwb2ludHMiLCBbXSk7Ci0gICAgdGhpcy5pbnN0YWxsQXBwbGljYXRp b25TZXR0aW5nKCJ4aHJCcmVha3BvaW50cyIsIFtdKTsKIAogICAgIHRoaXMuaW5zdGFsbFByb2pl Y3RTZXR0aW5nKCJuYXRpdmVCcmVha3BvaW50cyIsIFtdKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXggZGFhZTJhMTdiZmZjYmJh YTNjMDVkMTA1YWJjODI1ODVlYzUyNDllYS4uZTI5NDkwY2JjZDUwZGNjZTc2MDU2MzQxZDIyZWNj M2I0ZDU1Njk1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9pbnNwZWN0b3IuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9p bnNwZWN0b3IuanMKQEAgLTE0MSw3ICsxNDEsNyBAQCB2YXIgV2ViSW5zcGVjdG9yID0gewogICAg IHJlc2V0Rm9jdXNFbGVtZW50OiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlzLmN1cnJl bnRGb2N1c0VsZW1lbnQgPSBudWxsOwotICAgICAgICB0aGlzLl9wcmV2aW91c0ZvY3VzRWxlbWVu dCA9IG51bGw7CisgICAgICAgIHRoaXMuX3ByZXZpb3VzRm9jdXNFbGVtZW50ID0gbnVsbDsgICAg ICAgIAogICAgIH0sCiAKICAgICBnZXQgY3VycmVudFBhbmVsKCkKQEAgLTE4Miw2ICsxODIsMTcg QEAgdmFyIFdlYkluc3BlY3RvciA9IHsKICAgICAgICAgcmV0dXJuIHBhbmU7CiAgICAgfSwKIAor ICAgIGNyZWF0ZVhIUkJyZWFrcG9pbnRzU2lkZWJhclBhbmU6IGZ1bmN0aW9uKCkKKyAgICB7Cisg ICAgICAgIHZhciBwYW5lID0gbmV3IFdlYkluc3BlY3Rvci5YSFJCcmVha3BvaW50c1NpZGViYXJQ YW5lKCk7CisgICAgICAgIGZ1bmN0aW9uIGJyZWFrcG9pbnRBZGRlZChldmVudCkKKyAgICAgICAg eworICAgICAgICAgICAgcGFuZS5hZGRCcmVha3BvaW50SXRlbShuZXcgV2ViSW5zcGVjdG9yLkJy ZWFrcG9pbnRJdGVtKGV2ZW50LmRhdGEpKTsKKyAgICAgICAgfQorICAgICAgICBXZWJJbnNwZWN0 b3IuYnJlYWtwb2ludE1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuQnJlYWtw b2ludE1hbmFnZXIuRXZlbnRzLlhIUkJyZWFrcG9pbnRBZGRlZCwgYnJlYWtwb2ludEFkZGVkKTsK KyAgICAgICAgcmV0dXJuIHBhbmU7CisgICAgfSwKKwogICAgIF9jcmVhdGVQYW5lbHM6IGZ1bmN0 aW9uKCkKICAgICB7CiAgICAgICAgIHZhciBoaWRkZW5QYW5lbHMgPSAoSW5zcGVjdG9yRnJvbnRl bmRIb3N0LmhpZGRlblBhbmVscygpIHx8ICIiKS5zcGxpdCgnLCcpOwpAQCAtMjI4LDcgKzIzOSw3 IEBAIHZhciBXZWJJbnNwZWN0b3IgPSB7CiAgICAgICAgICAgICBkb2NrVG9nZ2xlQnV0dG9uLnRp dGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJEb2NrIHRvIG1haW4gd2luZG93LiIpOwogICAg ICAgICB9CiAKLSAgICAgICAgLy8gVGhpcyBtYXkgYmUgY2FsbGVkIGJlZm9yZSBvbkxvYWRlZERv bmUsIGhlbmNlIHRoZSBidWxrIG9mIGluc3BlY3RvciBvYmplY3RzIG1heQorICAgICAgICAvLyBU aGlzIG1heSBiZSBjYWxsZWQgYmVmb3JlIG9uTG9hZGVkRG9uZSwgaGVuY2UgdGhlIGJ1bGsgb2Yg aW5zcGVjdG9yIG9iamVjdHMgbWF5IAogICAgICAgICAvLyBub3QgYmUgY3JlYXRlZCB5ZXQuCiAg ICAgICAgIGlmIChXZWJJbnNwZWN0b3Iuc2VhcmNoQ29udHJvbGxlcikKICAgICAgICAgICAgIFdl Ykluc3BlY3Rvci5zZWFyY2hDb250cm9sbGVyLnVwZGF0ZVNlYXJjaExhYmVsKCk7Cg==