65118 2011-07-25 10:01:55 -0700 REGRESSION(r91665): Breaks inspector tests on JSC (Requested by pfeldman on #webkit). 2011-07-25 10:06:23 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 65103 1 webkit.review.bot webkit.review.bot pfeldman yurys oldest_to_newest 441712 0 webkit.review.bot 2011-07-25 10:01:55 -0700 http://trac.webkit.org/changeset/91665 broke the build: Breaks inspector tests on JSC (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 441713 1 101884 webkit.review.bot 2011-07-25 10:02:23 -0700 Created attachment 101884 ROLLOUT of r91665 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. 441714 2 101884 pfeldman 2011-07-25 10:06:14 -0700 Comment on attachment 101884 ROLLOUT of r91665 Clearing flags on attachment: 101884 Committed r91673: <http://trac.webkit.org/changeset/91673> 441715 3 pfeldman 2011-07-25 10:06:23 -0700 All reviewed patches have been landed. Closing bug. 101884 2011-07-25 10:02:23 -0700 2011-07-25 10:06:14 -0700 ROLLOUT of r91665 bug-65118-20110725170058.patch text/plain 28179 webkit.review.bot U3VidmVyc2lvbiBSZXZpc2lvbjogOTE2NzIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAxMzE1YjRkNGIwMjlkNWNkODZkZWFm N2Q5NzJkODAwMDViYjM1ZDZlLi43MjkxMjRmZTUwMGFhYTk4ZDNiMzU5YTY5OWExYjFkNTc5MTRm MzhhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDUgKzEsMTggQEAKIDIwMTEtMDctMjUgIFNoZXJpZmYgQm90ICA8d2Vi a2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCisgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcg b3V0IHI5MTY2NS4KKyAgICAgICAgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvOTE2 NjUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY1MTE4 CisKKyAgICAgICAgQnJlYWtzIGluc3BlY3RvciB0ZXN0cyBvbiBKU0MgKFJlcXVlc3RlZCBieSBw ZmVsZG1hbiBvbgorICAgICAgICAjd2Via2l0KS4KKworICAgICAgICAqIGluc3BlY3Rvci9wcm90 b2NvbC9jb25zb2xlLWFnZW50LWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBpbnNwZWN0b3IvcHJv dG9jb2wvcnVudGltZS1hZ2VudC1leHBlY3RlZC50eHQ6CisgICAgICAgICogaW5zcGVjdG9yL3J1 bnRpbWUvcnVudGltZS1jYWxsRnVuY3Rpb25Pbi5odG1sOgorCisyMDExLTA3LTI1ICBTaGVyaWZm IEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KKwogICAgICAgICBVbnJldmlld2Vk LCByb2xsaW5nIG91dCByOTE2NjguCiAgICAgICAgIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hh bmdlc2V0LzkxNjY4CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD02NTExNwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Byb3RvY29sL2Nv bnNvbGUtYWdlbnQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Byb3RvY29s L2NvbnNvbGUtYWdlbnQtZXhwZWN0ZWQudHh0CmluZGV4IDliMzAwNmU2NDY1MGMxYjAwYjNjYTQ4 MTk4NjdjNDUxZThiNGQ5MDIuLjg2ZmM4OGRiOTJmMTRiNzQwZmNmOTg5NjA3MWU5YmQ1ZGQ3NWQw YjEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9wcm90b2NvbC9jb25zb2xlLWFn ZW50LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcHJvdG9jb2wvY29u c29sZS1hZ2VudC1leHBlY3RlZC50eHQKQEAgLTY0LDcgKzY0LDcgQEAgZXZlbnQgQ29uc29sZUFn ZW50Lm1lc3NhZ2VBZGRlZAogICAgICAgICAgICAgcGFyYW1ldGVycyA6IFsKICAgICAgICAgICAg ICAgICB7CiAgICAgICAgICAgICAgICAgICAgIHR5cGUgOiAic3RyaW5nIgotICAgICAgICAgICAg ICAgICAgICB2YWx1ZSA6ICJ0ZXN0IgorICAgICAgICAgICAgICAgICAgICBkZXNjcmlwdGlvbiA6 ICJ0ZXN0IgogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIF0KICAgICAgICAgICAgIHN0 YWNrVHJhY2UgOiA8b2JqZWN0PgpAQCAtODUsNiArODUsNyBAQCByZXNwb25zZToKICAgICByZXN1 bHQgOiB7CiAgICAgICAgIHJlc3VsdCA6IHsKICAgICAgICAgICAgIHR5cGUgOiAidW5kZWZpbmVk IgorICAgICAgICAgICAgZGVzY3JpcHRpb24gOiAidW5kZWZpbmVkIgogICAgICAgICB9CiAgICAg fQogICAgIGlkIDogPG51bWJlcj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9w cm90b2NvbC9ydW50aW1lLWFnZW50LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rv ci9wcm90b2NvbC9ydW50aW1lLWFnZW50LWV4cGVjdGVkLnR4dAppbmRleCAwMDVlZTcyOTdjZTJl ZGY1OTgxNWQxNjU4MzMzNmVkYmM0NzAxNTU2Li5lYmE1YmQ4Mzc5N2Q2ZDAwNzBmMTZmZTBmNmYw NWVhMWIzNjIwNjNiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcHJvdG9jb2wv cnVudGltZS1hZ2VudC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3By b3RvY29sL3J1bnRpbWUtYWdlbnQtZXhwZWN0ZWQudHh0CkBAIC0xOCw4ICsxOCw5IEBAIHJlc3Bv bnNlOgogewogICAgIHJlc3VsdCA6IHsKICAgICAgICAgcmVzdWx0IDogewotICAgICAgICAgICAg dHlwZSA6ICJvYmplY3QiCiAgICAgICAgICAgICBvYmplY3RJZCA6IDxzdHJpbmc+CisgICAgICAg ICAgICBoYXNDaGlsZHJlbiA6IHRydWUKKyAgICAgICAgICAgIHR5cGUgOiAib2JqZWN0IgogICAg ICAgICAgICAgY2xhc3NOYW1lIDogPHN0cmluZz4KICAgICAgICAgICAgIGRlc2NyaXB0aW9uIDog IlRlc3RPYmplY3QiCiAgICAgICAgIH0KQEAgLTQ0LDggKzQ1LDkgQEAgcmVzcG9uc2U6CiB7CiAg ICAgcmVzdWx0IDogewogICAgICAgICByZXN1bHQgOiB7Ci0gICAgICAgICAgICB0eXBlIDogIm9i amVjdCIKICAgICAgICAgICAgIG9iamVjdElkIDogPHN0cmluZz4KKyAgICAgICAgICAgIGhhc0No aWxkcmVuIDogdHJ1ZQorICAgICAgICAgICAgdHlwZSA6ICJvYmplY3QiCiAgICAgICAgICAgICBj bGFzc05hbWUgOiA8c3RyaW5nPgogICAgICAgICAgICAgZGVzY3JpcHRpb24gOiAiVGVzdE9iamVj dCIKICAgICAgICAgfQpAQCAtNzEsNyArNzMsNyBAQCByZXNwb25zZToKICAgICByZXN1bHQgOiB7 CiAgICAgICAgIHJlc3VsdCA6IHsKICAgICAgICAgICAgIHR5cGUgOiAic3RyaW5nIgotICAgICAg ICAgICAgdmFsdWUgOiAiY2FsbEZ1bmN0aW9uT24gZnVuY3Rpb24gd29ya3MgZmluZSIKKyAgICAg ICAgICAgIGRlc2NyaXB0aW9uIDogImNhbGxGdW5jdGlvbk9uIGZ1bmN0aW9uIHdvcmtzIGZpbmUi CiAgICAgICAgIH0KICAgICB9CiAgICAgaWQgOiA8bnVtYmVyPgpAQCAtMTQwLDIxICsxNDIsMjIg QEAgcmVzcG9uc2U6CiAgICAgICAgICAgICAgICAgbmFtZSA6ICJhc3NpZ25lZEJ5Q2FsbEZ1bmN0 aW9uT24iCiAgICAgICAgICAgICAgICAgdmFsdWUgOiB7CiAgICAgICAgICAgICAgICAgICAgIHR5 cGUgOiAic3RyaW5nIgotICAgICAgICAgICAgICAgICAgICB2YWx1ZSA6ICJjYWxsRnVuY3Rpb25P biBmdW5jdGlvbiB3b3JrcyBmaW5lIgorICAgICAgICAgICAgICAgICAgICBkZXNjcmlwdGlvbiA6 ICJjYWxsRnVuY3Rpb25PbiBmdW5jdGlvbiB3b3JrcyBmaW5lIgogICAgICAgICAgICAgICAgIH0K ICAgICAgICAgICAgIH0KICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICBuYW1lIDogImFz c2lnbmVkQnlTZXRQcm9wZXJ0eVZhbHVlIgogICAgICAgICAgICAgICAgIHZhbHVlIDogewogICAg ICAgICAgICAgICAgICAgICB0eXBlIDogImJvb2xlYW4iCi0gICAgICAgICAgICAgICAgICAgIHZh bHVlIDogdHJ1ZQorICAgICAgICAgICAgICAgICAgICBkZXNjcmlwdGlvbiA6ICJ0cnVlIgogICAg ICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAgICAgICAgICAgIHsKICAgICAgICAgICAg ICAgICBuYW1lIDogIl9fcHJvdG9fXyIKICAgICAgICAgICAgICAgICB2YWx1ZSA6IHsKLSAgICAg ICAgICAgICAgICAgICAgdHlwZSA6ICJvYmplY3QiCiAgICAgICAgICAgICAgICAgICAgIG9iamVj dElkIDogPHN0cmluZz4KKyAgICAgICAgICAgICAgICAgICAgaGFzQ2hpbGRyZW4gOiB0cnVlCisg ICAgICAgICAgICAgICAgICAgIHR5cGUgOiAib2JqZWN0IgogICAgICAgICAgICAgICAgICAgICBj bGFzc05hbWUgOiA8c3RyaW5nPgogICAgICAgICAgICAgICAgICAgICBkZXNjcmlwdGlvbiA6ICJU ZXN0T2JqZWN0IgogICAgICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2lu c3BlY3Rvci9ydW50aW1lL3J1bnRpbWUtY2FsbEZ1bmN0aW9uT24uaHRtbCBiL0xheW91dFRlc3Rz L2luc3BlY3Rvci9ydW50aW1lL3J1bnRpbWUtY2FsbEZ1bmN0aW9uT24uaHRtbAppbmRleCA3NmY2 MGJjNTMyYzhiMzgxZDJkMDRjMTU0NWI0ZDRkZDJjOWUxMDhlLi4wZTljYzM4NzliMDIzZDZhM2Q0 Zjg2ZmNlZTVjMzQyMDZiZTU5ZTIwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv cnVudGltZS9ydW50aW1lLWNhbGxGdW5jdGlvbk9uLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL3J1bnRpbWUvcnVudGltZS1jYWxsRnVuY3Rpb25Pbi5odG1sCkBAIC0yNiw3ICsyNiw3 IEBAIGZ1bmN0aW9uIHRlc3QoKQogCiAgICAgICAgICAgICBmdW5jdGlvbiBzdGVwMihlcnJvciwg cmVzdWx0LCB3YXNUaHJvd24pCiAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgSW5zcGVj dG9yVGVzdC5hZGRSZXN1bHQocmVzdWx0LnZhbHVlKTsKKyAgICAgICAgICAgICAgICBJbnNwZWN0 b3JUZXN0LmFkZFJlc3VsdChyZXN1bHQuZGVzY3JpcHRpb24pOwogICAgICAgICAgICAgICAgIG5l eHQoKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfSwKQEAgLTQ4LDcgKzQ4LDcgQEAgZnVuY3Rp b24gdGVzdCgpCiAKICAgICAgICAgICAgIGZ1bmN0aW9uIHN0ZXAyKGVycm9yLCByZXN1bHQsIHdh c1Rocm93bikKICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFk ZFJlc3VsdChyZXN1bHQudmFsdWUpOworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRk UmVzdWx0KHJlc3VsdC5kZXNjcmlwdGlvbik7CiAgICAgICAgICAgICAgICAgbmV4dCgpOwogICAg ICAgICAgICAgfQogICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzM0MTEwZWMwYWIyMmU0ZDE4ZDc5 ZGI0NjlkNjFmMGQ3M2IxYjgxYS4uNDYyM2Q2MWJlYWNhZDg0NmUxMDIzYTEyYzFiM2JjZGIzZTMy ODEwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQyIEBACiAyMDExLTA3LTI1ICBTaGVyaWZmIEJv dCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAorICAgICAgICBVbnJldmlld2VkLCBy b2xsaW5nIG91dCByOTE2NjUuCisgICAgICAgIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdl c2V0LzkxNjY1CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02NTExOAorCisgICAgICAgIEJyZWFrcyBpbnNwZWN0b3IgdGVzdHMgb24gSlNDIChSZXF1ZXN0 ZWQgYnkgcGZlbGRtYW4gb24KKyAgICAgICAgI3dlYmtpdCkuCisKKyAgICAgICAgKiBpbnNwZWN0 b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2UuanM6CisgICAgICAgICguKToKKyAgICAgICAgKCk6Cisg ICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uOgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvQ29uc29sZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZVZp ZXcucHJvdG90eXBlLl9mb3JtYXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3 LnByb3RvdHlwZS5fZm9ybWF0QXNBcnJheUVudHJ5KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5D b25zb2xlTWVzc2FnZS5wcm90b3R5cGUuX2Zvcm1hdCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVs ZW1lbnRzVHJlZUVsZW1lbnQucHJvdG90eXBlLl9jcmVhdGVUb29sdGlwRm9yTm9kZS5zZXRUb29s dGlwKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdFByb3BlcnRpZXNTZWN0 aW9uLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk9iamVjdFByb3BlcnR5VHJlZUVsZW1lbnQu cHJvdG90eXBlLnVwZGF0ZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9wZXJ0 aWVzU2lkZWJhclBhbmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvcGVydGllc1NpZGVi YXJQYW5lLnByb3RvdHlwZS51cGRhdGUubm9kZVByb3RvdHlwZXNSZWFkeSk6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9SZW1vdGVPYmplY3QuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuUmVtb3RlT2JqZWN0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QuZnJv bVByaW1pdGl2ZVZhbHVlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QuZnJv bVBheWxvYWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdC5wcm90b3R5cGUu Y2FsbEZ1bmN0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Mb2NhbEpTT05PYmplY3QucHJv dG90eXBlLmdldCB0eXBlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZy YW1lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5fc2hv d1BvcHVwLnNob3dPYmplY3RQb3B1cCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJh bWUucHJvdG90eXBlLl9zaG93UG9wdXApOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv aW5zcGVjdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmxvZy5sb2dNZXNzYWdlKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5sb2cpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmluc3BlY3Qp OgorCisyMDExLTA3LTI1ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNv bT4KKwogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByOTE2NjguCiAgICAgICAgIGh0 dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzkxNjY4CiAgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTExNwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0U291cmNlLmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luamVjdGVkU2NyaXB0U291cmNlLmpzCmluZGV4IDY0NDk3NDdiZTY4ODdhMGYw YWEwODExNDk3MDg4ZjQxNzA0NmQxMzkuLjUwYjMyY2RlZjQ2MmNjZmM5NjhiZTU2N2EwMmJhODI1 OWY2YjgwMjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNj cmlwdFNvdXJjZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3Jp cHRTb3VyY2UuanMKQEAgLTUwLDMxICs1MCwxNCBAQCB2YXIgSW5qZWN0ZWRTY3JpcHQgPSBmdW5j dGlvbigpCiAgICAgdGhpcy5fb2JqZWN0R3JvdXBzID0ge307CiB9CiAKLUluamVjdGVkU2NyaXB0 LnByaW1pdGl2ZVR5cGVzID0gewotICAgIHVuZGVmaW5lZDogdHJ1ZSwKLSAgICBib29sZWFuOiB0 cnVlLAotICAgIG51bWJlcjogdHJ1ZSwKLSAgICBzdHJpbmc6IHRydWUKLX0KLQogSW5qZWN0ZWRT Y3JpcHQucHJvdG90eXBlID0gewotICAgIGlzUHJpbWl0aXZlVmFsdWU6IGZ1bmN0aW9uKG9iamVj dCkKLSAgICB7Ci0gICAgICAgIC8vIEZJWE1FKDMzNzE2KTogdHlwZW9mIGRvY3VtZW50LmFsbCBp cyBhbHdheXMgJ3VuZGVmaW5lZCcuCi0gICAgICAgIHJldHVybiBJbmplY3RlZFNjcmlwdC5wcmlt aXRpdmVUeXBlc1t0eXBlb2Ygb2JqZWN0XSAmJiAhdGhpcy5faXNIVE1MQWxsQ29sbGVjdGlvbihv YmplY3QpOwotICAgIH0sCi0KICAgICB3cmFwT2JqZWN0OiBmdW5jdGlvbihvYmplY3QsIGdyb3Vw TmFtZSwgY2FuQWNjZXNzSW5zcGVjdGVkV2luZG93KQogICAgIHsKICAgICAgICAgaWYgKGNhbkFj Y2Vzc0luc3BlY3RlZFdpbmRvdykKICAgICAgICAgICAgIHJldHVybiB0aGlzLl93cmFwT2JqZWN0 KG9iamVjdCwgZ3JvdXBOYW1lKTsKLQogICAgICAgICB2YXIgcmVzdWx0ID0ge307CiAgICAgICAg IHJlc3VsdC50eXBlID0gdHlwZW9mIG9iamVjdDsKLSAgICAgICAgaWYgKHRoaXMuX2lzUHJpbWl0 aXZlVmFsdWUob2JqZWN0KSkKLSAgICAgICAgICAgIHJlc3VsdC52YWx1ZSA9IG9iamVjdDsKLSAg ICAgICAgZWxzZQotICAgICAgICAgICAgcmVzdWx0LmRlc2NyaXB0aW9uID0gdGhpcy5fdG9TdHJp bmcob2JqZWN0KTsKKyAgICAgICAgcmVzdWx0LmRlc2NyaXB0aW9uID0gdGhpcy5fdG9TdHJpbmco b2JqZWN0KTsKICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICB9LAogCkBAIC0xMTEsMzIgKzk0 LDI0IEBAIEluamVjdGVkU2NyaXB0LnByb3RvdHlwZSA9IHsKICAgICBfd3JhcE9iamVjdDogZnVu Y3Rpb24ob2JqZWN0LCBvYmplY3RHcm91cE5hbWUpCiAgICAgewogICAgICAgICB0cnkgewotICAg ICAgICAgICAgcmV0dXJuIG5ldyBJbmplY3RlZFNjcmlwdC5SZW1vdGVPYmplY3Qob2JqZWN0LCBv YmplY3RHcm91cE5hbWUpOwotICAgICAgICB9IGNhdGNoIChlKSB7Ci0gICAgICAgICAgICB0cnkg ewotICAgICAgICAgICAgICAgIHZhciBkZXNjcmlwdGlvbiA9IGluamVjdGVkU2NyaXB0Ll9kZXNj cmliZShlKTsKLSAgICAgICAgICAgIH0gY2F0Y2ggKGV4KSB7Ci0gICAgICAgICAgICAgICAgdmFy IGRlc2NyaXB0aW9uID0gIjxmYWlsZWQgdG8gY29udmVydCBleGNlcHRpb24gdG8gc3RyaW5nPiI7 Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICByZXR1cm4gbmV3IEluamVjdGVkU2NyaXB0LlJl bW90ZU9iamVjdChkZXNjcmlwdGlvbik7Ci0gICAgICAgIH0KLSAgICB9LAotCi0gICAgX2JpbmQ6 IGZ1bmN0aW9uKG9iamVjdCwgb2JqZWN0R3JvdXBOYW1lKQotICAgIHsKLSAgICAgICAgdmFyIGlk ID0gdGhpcy5fbGFzdEJvdW5kT2JqZWN0SWQrKzsKLSAgICAgICAgdGhpcy5faWRUb1dyYXBwZWRP YmplY3RbaWRdID0gb2JqZWN0OwotICAgICAgICB2YXIgb2JqZWN0SWQgPSAie1wiaW5qZWN0ZWRT Y3JpcHRJZFwiOiIgKyBpbmplY3RlZFNjcmlwdElkICsgIixcImlkXCI6IiArIGlkICsgIn0iOwot ICAgICAgICBpZiAob2JqZWN0R3JvdXBOYW1lKSB7Ci0gICAgICAgICAgICB2YXIgZ3JvdXAgPSB0 aGlzLl9vYmplY3RHcm91cHNbb2JqZWN0R3JvdXBOYW1lXTsKLSAgICAgICAgICAgIGlmICghZ3Jv dXApIHsKLSAgICAgICAgICAgICAgICBncm91cCA9IFtdOwotICAgICAgICAgICAgICAgIHRoaXMu X29iamVjdEdyb3Vwc1tvYmplY3RHcm91cE5hbWVdID0gZ3JvdXA7CisgICAgICAgICAgICBpZiAo dHlwZW9mIG9iamVjdCA9PT0gIm9iamVjdCIgfHwgdHlwZW9mIG9iamVjdCA9PT0gImZ1bmN0aW9u IiB8fCB0aGlzLl9pc0hUTUxBbGxDb2xsZWN0aW9uKG9iamVjdCkpIHsKKyAgICAgICAgICAgICAg ICB2YXIgaWQgPSB0aGlzLl9sYXN0Qm91bmRPYmplY3RJZCsrOworICAgICAgICAgICAgICAgIHRo aXMuX2lkVG9XcmFwcGVkT2JqZWN0W2lkXSA9IG9iamVjdDsKKyAgICAgICAgICAgICAgICB2YXIg b2JqZWN0SWQgPSAie1wiaW5qZWN0ZWRTY3JpcHRJZFwiOiIgKyBpbmplY3RlZFNjcmlwdElkICsg IixcImlkXCI6IiArIGlkICsgIn0iOworICAgICAgICAgICAgICAgIGlmIChvYmplY3RHcm91cE5h bWUpIHsKKyAgICAgICAgICAgICAgICAgICAgdmFyIGdyb3VwID0gdGhpcy5fb2JqZWN0R3JvdXBz W29iamVjdEdyb3VwTmFtZV07CisgICAgICAgICAgICAgICAgICAgIGlmICghZ3JvdXApIHsKKyAg ICAgICAgICAgICAgICAgICAgICAgIGdyb3VwID0gW107CisgICAgICAgICAgICAgICAgICAgICAg ICB0aGlzLl9vYmplY3RHcm91cHNbb2JqZWN0R3JvdXBOYW1lXSA9IGdyb3VwOworICAgICAgICAg ICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgIGdyb3VwLnB1c2goaWQpOworICAgICAg ICAgICAgICAgICAgICB0aGlzLl9pZFRvT2JqZWN0R3JvdXBOYW1lW2lkXSA9IG9iamVjdEdyb3Vw TmFtZTsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBncm91 cC5wdXNoKGlkKTsKLSAgICAgICAgICAgIHRoaXMuX2lkVG9PYmplY3RHcm91cE5hbWVbaWRdID0g b2JqZWN0R3JvdXBOYW1lOworICAgICAgICAgICAgcmV0dXJuIEluamVjdGVkU2NyaXB0LlJlbW90 ZU9iamVjdC5mcm9tT2JqZWN0KG9iamVjdCwgb2JqZWN0SWQpOworICAgICAgICB9IGNhdGNoIChl KSB7CisgICAgICAgICAgICByZXR1cm4gSW5qZWN0ZWRTY3JpcHQuUmVtb3RlT2JqZWN0LmZyb21F eGNlcHRpb24oZSk7CiAgICAgICAgIH0KLSAgICAgICAgcmV0dXJuIG9iamVjdElkOwogICAgIH0s CiAKICAgICBfcGFyc2VPYmplY3RJZDogZnVuY3Rpb24ob2JqZWN0SWQpCkBAIC0zODEsNyArMzU2 LDcgQEAgSW5qZWN0ZWRTY3JpcHQucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgdmFyIHBh cnNlZE9iamVjdElkID0gdGhpcy5fcGFyc2VPYmplY3RJZChvYmplY3RJZCk7CiAgICAgICAgIHZh ciBvYmplY3QgPSB0aGlzLl9vYmplY3RGb3JJZChwYXJzZWRPYmplY3RJZCk7Ci0gICAgICAgIGlm ICghb2JqZWN0IHx8IHRoaXMuX3N1YnR5cGUob2JqZWN0KSAhPT0gIm5vZGUiKQorICAgICAgICBp ZiAoIW9iamVjdCB8fCB0aGlzLl90eXBlKG9iamVjdCkgIT09ICJub2RlIikKICAgICAgICAgICAg IHJldHVybiBudWxsOwogICAgICAgICByZXR1cm4gb2JqZWN0OwogICAgIH0sCkBAIC0zOTcsMTcg KzM3MiwxOCBAQCBJbmplY3RlZFNjcmlwdC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiAo dHlwZW9mIG9iamVjdCA9PT0gInVuZGVmaW5lZCIpICYmIEluamVjdGVkU2NyaXB0SG9zdC5pc0hU TUxBbGxDb2xsZWN0aW9uKG9iamVjdCk7CiAgICAgfSwKIAotICAgIF9zdWJ0eXBlOiBmdW5jdGlv bihvYmopCisgICAgX3R5cGU6IGZ1bmN0aW9uKG9iaikKICAgICB7CiAgICAgICAgIGlmIChvYmog PT09IG51bGwpCiAgICAgICAgICAgICByZXR1cm4gIm51bGwiOwogCiAgICAgICAgIHZhciB0eXBl ID0gdHlwZW9mIG9iajsKLSAgICAgICAgaWYgKHRoaXMuaXNQcmltaXRpdmVWYWx1ZShvYmopKQot ICAgICAgICAgICAgcmV0dXJuIG51bGw7Ci0KLSAgICAgICAgaWYgKHRoaXMuX2lzSFRNTEFsbENv bGxlY3Rpb24ob2JqKSkKLSAgICAgICAgICAgIHJldHVybiAiYXJyYXkiOworICAgICAgICBpZiAo dHlwZSAhPT0gIm9iamVjdCIgJiYgdHlwZSAhPT0gImZ1bmN0aW9uIikgeworICAgICAgICAgICAg Ly8gRklYTUUoMzM3MTYpOiB0eXBlb2YgZG9jdW1lbnQuYWxsIGlzIGFsd2F5cyAndW5kZWZpbmVk Jy4KKyAgICAgICAgICAgIGlmICh0aGlzLl9pc0hUTUxBbGxDb2xsZWN0aW9uKG9iaikpCisgICAg ICAgICAgICAgICAgcmV0dXJuICJhcnJheSI7CisgICAgICAgICAgICByZXR1cm4gdHlwZTsKKyAg ICAgICAgfQogCiAgICAgICAgIHZhciBwcmVjaXNlVHlwZSA9IEluamVjdGVkU2NyaXB0SG9zdC50 eXBlKG9iaik7CiAgICAgICAgIGlmIChwcmVjaXNlVHlwZSkKQEAgLTQyMywzOSArMzk5LDM5IEBA IEluamVjdGVkU2NyaXB0LnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogCiAgICAgICAgIC8vIElm IG93bmluZyBmcmFtZSBoYXMgbmF2aWdhdGVkIHRvIHNvbWV3aGVyZSBlbHNlIHdpbmRvdyBwcm9w ZXJ0aWVzIHdpbGwgYmUgdW5kZWZpbmVkLgotICAgICAgICByZXR1cm4gbnVsbDsKKyAgICAgICAg Ly8gSW4gdGhpcyBjYXNlIGp1c3QgcmV0dXJuIHJlc3VsdCBvZiB0aGUgdHlwZW9mLgorICAgICAg ICByZXR1cm4gdHlwZTsKICAgICB9LAogCiAgICAgX2Rlc2NyaWJlOiBmdW5jdGlvbihvYmopCiAg ICAgewotICAgICAgICBpZiAodGhpcy5pc1ByaW1pdGl2ZVZhbHVlKG9iaikpCi0gICAgICAgICAg ICByZXR1cm4gbnVsbDsKLQotICAgICAgICB2YXIgdHlwZSA9IHR5cGVvZiBvYmo7Ci0gICAgICAg IGlmICh0eXBlID09PSAiZnVuY3Rpb24iKQotICAgICAgICAgICAgcmV0dXJuIHRoaXMuX3RvU3Ry aW5nKG9iaik7Ci0KLSAgICAgICAgLy8gVHlwZSBpcyBvYmplY3QsIGdldCBzdWJ0eXBlLgotICAg ICAgICB2YXIgc3VidHlwZSA9IHRoaXMuX3N1YnR5cGUob2JqKTsKLQotICAgICAgICBpZiAoc3Vi dHlwZSA9PT0gInJlZ2V4cCIpCi0gICAgICAgICAgICByZXR1cm4gdGhpcy5fdG9TdHJpbmcob2Jq KTsKLQotICAgICAgICB2YXIgY2xhc3NOYW1lID0gSW5qZWN0ZWRTY3JpcHRIb3N0LmludGVybmFs Q29uc3RydWN0b3JOYW1lKG9iaik7Ci0gICAgICAgIGlmIChzdWJ0eXBlID09PSAiYXJyYXkiKSB7 CisgICAgICAgIHZhciB0eXBlID0gdGhpcy5fdHlwZShvYmopOworCisgICAgICAgIHN3aXRjaCAo dHlwZSkgeworICAgICAgICBjYXNlICJvYmplY3QiOgorICAgICAgICAgICAgLy8gRmFsbCB0aHJv dWdoLgorICAgICAgICBjYXNlICJub2RlIjoKKyAgICAgICAgICAgIHZhciByZXN1bHQgPSBJbmpl Y3RlZFNjcmlwdEhvc3QuaW50ZXJuYWxDb25zdHJ1Y3Rvck5hbWUob2JqKTsKKyAgICAgICAgICAg IGlmIChyZXN1bHQgPT09ICJPYmplY3QiKSB7CisgICAgICAgICAgICAgICAgLy8gSW4gQ2hyb21p dW0gRE9NIHdyYXBwZXIgcHJvdG90eXBlcyB3aWxsIGhhdmUgT2JqZWN0IGFzIHRoZWlyIGNvbnN0 cnVjdG9yIG5hbWUsCisgICAgICAgICAgICAgICAgLy8gZ2V0IHRoZSByZWFsIERPTSB3cmFwcGVy IG5hbWUgZnJvbSB0aGUgY29uc3RydWN0b3IgcHJvcGVydHkuCisgICAgICAgICAgICAgICAgdmFy IGNvbnN0cnVjdG9yTmFtZSA9IG9iai5jb25zdHJ1Y3RvciAmJiBvYmouY29uc3RydWN0b3IubmFt ZTsKKyAgICAgICAgICAgICAgICBpZiAoY29uc3RydWN0b3JOYW1lKQorICAgICAgICAgICAgICAg ICAgICByZXR1cm4gY29uc3RydWN0b3JOYW1lOworICAgICAgICAgICAgfQorICAgICAgICAgICAg cmV0dXJuIHJlc3VsdDsKKyAgICAgICAgY2FzZSAiYXJyYXkiOgorICAgICAgICAgICAgdmFyIGNs YXNzTmFtZSA9IEluamVjdGVkU2NyaXB0SG9zdC5pbnRlcm5hbENvbnN0cnVjdG9yTmFtZShvYmop OwogICAgICAgICAgICAgaWYgKHR5cGVvZiBvYmoubGVuZ3RoID09PSAibnVtYmVyIikKICAgICAg ICAgICAgICAgICBjbGFzc05hbWUgKz0gIlsiICsgb2JqLmxlbmd0aCArICJdIjsKICAgICAgICAg ICAgIHJldHVybiBjbGFzc05hbWU7CisgICAgICAgIGNhc2UgInN0cmluZyI6CisgICAgICAgICAg ICByZXR1cm4gb2JqOworICAgICAgICBjYXNlICJmdW5jdGlvbiI6CisgICAgICAgICAgICAvLyBG YWxsIHRocm91Z2guCisgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICByZXR1cm4gdGhpcy5f dG9TdHJpbmcob2JqKTsKICAgICAgICAgfQotCi0gICAgICAgIGlmIChjbGFzc05hbWUgPT09ICJP YmplY3QiKSB7Ci0gICAgICAgICAgICAvLyBJbiBDaHJvbWl1bSBET00gd3JhcHBlciBwcm90b3R5 cGVzIHdpbGwgaGF2ZSBPYmplY3QgYXMgdGhlaXIgY29uc3RydWN0b3IgbmFtZSwKLSAgICAgICAg ICAgIC8vIGdldCB0aGUgcmVhbCBET00gd3JhcHBlciBuYW1lIGZyb20gdGhlIGNvbnN0cnVjdG9y IHByb3BlcnR5LgotICAgICAgICAgICAgdmFyIGNvbnN0cnVjdG9yTmFtZSA9IG9iai5jb25zdHJ1 Y3RvciAmJiBvYmouY29uc3RydWN0b3IubmFtZTsKLSAgICAgICAgICAgIGlmIChjb25zdHJ1Y3Rv ck5hbWUpCi0gICAgICAgICAgICAgICAgcmV0dXJuIGNvbnN0cnVjdG9yTmFtZTsKLSAgICAgICAg fQotICAgICAgICByZXR1cm4gY2xhc3NOYW1lOwogICAgIH0sCiAKICAgICBfdG9TdHJpbmc6IGZ1 bmN0aW9uKG9iaikKQEAgLTQ2NywyNCArNDQzLDQwIEBAIEluamVjdGVkU2NyaXB0LnByb3RvdHlw ZSA9IHsKIAogdmFyIGluamVjdGVkU2NyaXB0ID0gbmV3IEluamVjdGVkU2NyaXB0KCk7CiAKLUlu amVjdGVkU2NyaXB0LlJlbW90ZU9iamVjdCA9IGZ1bmN0aW9uKG9iamVjdCwgb2JqZWN0R3JvdXBO YW1lKQorSW5qZWN0ZWRTY3JpcHQuUmVtb3RlT2JqZWN0ID0gZnVuY3Rpb24ob2JqZWN0SWQsIHR5 cGUsIGNsYXNzTmFtZSwgZGVzY3JpcHRpb24sIGhhc0NoaWxkcmVuKQogewotICAgIHRoaXMudHlw ZSA9IHR5cGVvZiBvYmplY3Q7Ci0gICAgaWYgKGluamVjdGVkU2NyaXB0LmlzUHJpbWl0aXZlVmFs dWUob2JqZWN0KSB8fCBvYmplY3QgPT09IG51bGwpIHsKLSAgICAgICAgLy8gV2UgZG9uJ3Qgc2Vu ZCB1bmRlZmluZWQgdmFsdWVzIG92ZXIgSlNPTi4KLSAgICAgICAgaWYgKHR5cGVvZiBvYmplY3Qg IT09ICJ1bmRlZmluZWQiKQotICAgICAgICAgICAgdGhpcy52YWx1ZSA9IG9iamVjdDsKLSAgICAg ICAgaWYgKG9iamVjdCA9PT0gbnVsbCkKLSAgICAgICAgICAgIHRoaXMuc3VidHlwZSA9ICJudWxs IjsKLSAgICAgICAgcmV0dXJuOworICAgIGlmIChvYmplY3RJZCkgeworICAgICAgICB0aGlzLm9i amVjdElkID0gb2JqZWN0SWQ7CisgICAgICAgIHRoaXMuaGFzQ2hpbGRyZW4gPSBoYXNDaGlsZHJl bjsKICAgICB9CisgICAgdGhpcy50eXBlID0gdHlwZTsKKyAgICBpZiAoY2xhc3NOYW1lKQorICAg ICAgICB0aGlzLmNsYXNzTmFtZSA9IGNsYXNzTmFtZTsKKyAgICB0aGlzLmRlc2NyaXB0aW9uID0g ZGVzY3JpcHRpb247Cit9CiAKLSAgICB0aGlzLm9iamVjdElkID0gaW5qZWN0ZWRTY3JpcHQuX2Jp bmQob2JqZWN0LCBvYmplY3RHcm91cE5hbWUpOwotICAgIHZhciBzdWJ0eXBlID0gaW5qZWN0ZWRT Y3JpcHQuX3N1YnR5cGUob2JqZWN0KQotICAgIGlmIChzdWJ0eXBlKQotICAgICAgICB0aGlzLnN1 YnR5cGUgPSBzdWJ0eXBlOwotICAgIHRoaXMuY2xhc3NOYW1lID0gSW5qZWN0ZWRTY3JpcHRIb3N0 LmludGVybmFsQ29uc3RydWN0b3JOYW1lKG9iamVjdCk7Ci0gICAgdGhpcy5kZXNjcmlwdGlvbiA9 IGluamVjdGVkU2NyaXB0Ll9kZXNjcmliZShvYmplY3QpOworSW5qZWN0ZWRTY3JpcHQuUmVtb3Rl T2JqZWN0LmZyb21FeGNlcHRpb24gPSBmdW5jdGlvbihlKQoreworICAgIHRyeSB7CisgICAgICAg IHZhciBkZXNjcmlwdGlvbiA9IGluamVjdGVkU2NyaXB0Ll9kZXNjcmliZShlKTsKKyAgICB9IGNh dGNoIChleCkgeworICAgICAgICB2YXIgZGVzY3JpcHRpb24gPSAiPGZhaWxlZCB0byBjb252ZXJ0 IGV4Y2VwdGlvbiB0byBzdHJpbmc+IjsKKyAgICB9CisgICAgcmV0dXJuIG5ldyBJbmplY3RlZFNj cmlwdC5SZW1vdGVPYmplY3QobnVsbCwgInN0cmluZyIsIG51bGwsICJbIEV4Y2VwdGlvbjogIiAr IGRlc2NyaXB0aW9uICsgIiBdIik7Cit9CisKKy8vIFRoaXMgbWV0aG9kIG1heSB0aHJvdworSW5q ZWN0ZWRTY3JpcHQuUmVtb3RlT2JqZWN0LmZyb21PYmplY3QgPSBmdW5jdGlvbihvYmplY3QsIG9i amVjdElkKQoreworICAgIHZhciB0eXBlID0gaW5qZWN0ZWRTY3JpcHQuX3R5cGUob2JqZWN0KTsK KyAgICB2YXIgcmF3VHlwZSA9IHR5cGVvZiBvYmplY3Q7CisgICAgdmFyIGhhc0NoaWxkcmVuID0g KHJhd1R5cGUgPT09ICJvYmplY3QiICYmIG9iamVjdCAhPT0gbnVsbCAmJiAoISFPYmplY3QuZ2V0 T3duUHJvcGVydHlOYW1lcyhvYmplY3QpLmxlbmd0aCB8fCAhIW9iamVjdC5fX3Byb3RvX18pKSB8 fCByYXdUeXBlID09PSAiZnVuY3Rpb24iOworICAgIHZhciBjbGFzc05hbWU7CisgICAgLy8gQXZv aWQgZXhwbGljaXQgYXNzaWdubWVudCB0byB1bmRlZmluZWQgYXMgaXRzIHZhbHVlIGNhbiBiZSBv dmVycmlkZW4gKHNlZSBjcmJ1Zy5jb20vODg0MTQpLgorICAgIGlmICh0eXBlb2Ygb2JqZWN0ID09 PSAib2JqZWN0IiB8fCB0eXBlb2Ygb2JqZWN0ID09PSAiZnVuY3Rpb24iKQorICAgICAgICBjbGFz c05hbWUgPSBJbmplY3RlZFNjcmlwdEhvc3QuaW50ZXJuYWxDb25zdHJ1Y3Rvck5hbWUob2JqZWN0 KTsKKyAgICB2YXIgZGVzY3JpcHRpb24gPSBpbmplY3RlZFNjcmlwdC5fZGVzY3JpYmUob2JqZWN0 KTsKKyAgICByZXR1cm4gbmV3IEluamVjdGVkU2NyaXB0LlJlbW90ZU9iamVjdChvYmplY3RJZCwg dHlwZSwgY2xhc3NOYW1lLCBkZXNjcmlwdGlvbiwgaGFzQ2hpbGRyZW4pOwogfQogCiBJbmplY3Rl ZFNjcmlwdC5DYWxsRnJhbWVQcm94eSA9IGZ1bmN0aW9uKG9yZGluYWwsIGNhbGxGcmFtZSkKQEAg LTY1Myw3ICs2NDUsNyBAQCBDb21tYW5kTGluZUFQSUltcGwucHJvdG90eXBlID0gewogCiAgICAg Y29weTogZnVuY3Rpb24ob2JqZWN0KQogICAgIHsKLSAgICAgICAgaWYgKGluamVjdGVkU2NyaXB0 Ll9zdWJ0eXBlKG9iamVjdCkgPT09ICJub2RlIikKKyAgICAgICAgaWYgKGluamVjdGVkU2NyaXB0 Ll90eXBlKG9iamVjdCkgPT09ICJub2RlIikKICAgICAgICAgICAgIG9iamVjdCA9IG9iamVjdC5v dXRlckhUTUw7CiAgICAgICAgIEluamVjdGVkU2NyaXB0SG9zdC5jb3B5VGV4dChvYmplY3QpOwog ICAgIH0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpz b24gYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KaW5kZXggMzZmZWFm YTNiY2JmZDRmYWI2NDc0MmQyY2M2NTcwYTVmOTFkMGUzNy4uOGM4YTJiNGM0ZjQwOWQxNmQ0ZjMy OGQ3ZWM3MjZiMjFhNTk4MjU2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3Rvci5qc29uCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3Iu anNvbgpAQCAtMjIyLDEyICsyMjIsMTEgQEAKICAgICAgICAgICAgICAgICAidHlwZSI6ICJvYmpl Y3QiLAogICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJNaXJyb3Igb2JqZWN0IHJlZmVy ZW5jaW5nIG9yaWdpbmFsIEphdmFTY3JpcHQgb2JqZWN0LiIsCiAgICAgICAgICAgICAgICAgInBy b3BlcnRpZXMiOiBbCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidHlwZSIsICJ0eXBl IjogInN0cmluZyIsICJlbnVtIjogWyJvYmplY3QiLCAiZnVuY3Rpb24iLCAidW5kZWZpbmVkIiwg InN0cmluZyIsICJudW1iZXIiLCAiYm9vbGVhbiJdLCAiZGVzY3JpcHRpb24iOiAiT2JqZWN0IHR5 cGUuIiB9LAotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInN1YnR5cGUiLCAidHlwZSI6 ICJzdHJpbmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZW51bSI6IFsiYXJyYXkiLCAibnVsbCIsICJu b2RlIiwgInJlZ2V4cCIsICJkYXRlIl0sICJkZXNjcmlwdGlvbiI6ICJPYmplY3Qgc3VidHlwZSBo aW50LiBTcGVjaWZpZWQgZm9yIDxjb2RlPm9iamVjdDwvY29kZT4gdHlwZSB2YWx1ZXMgb25seS4i IH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiY2xhc3NOYW1lIiwgInR5cGUiOiAi c3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIk9iamVjdCBjbGFzcyAo Y29uc3RydWN0b3IpIG5hbWUuIFNwZWNpZmllZCBmb3IgPGNvZGU+b2JqZWN0PC9jb2RlPiB0eXBl IHZhbHVlcyBvbmx5LiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ2YWx1ZSIs ICJ0eXBlIjogImFueSIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJSZW1vdGUg b2JqZWN0IHZhbHVlIChpbiBjYXNlIG9mIHByaW1pdGl2ZSB2YWx1ZXMpLiIgfSwKLSAgICAgICAg ICAgICAgICAgICAgeyAibmFtZSI6ICJkZXNjcmlwdGlvbiIsICJ0eXBlIjogInN0cmluZyIsICJv cHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJTdHJpbmcgcmVwcmVzZW50YXRpb24gb2Yg dGhlIG9iamVjdC4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAib2JqZWN0SWQi LCAidHlwZSI6ICJzdHJpbmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiVW5p cXVlIG9iamVjdCBpZGVudGlmaWVyIChmb3Igbm9uLXByaW1pdGl2ZSB2YWx1ZXMpLiIgfQorICAg ICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImRlc2NyaXB0aW9uIiwgInR5cGUiOiAic3RyaW5n IiwgImRlc2NyaXB0aW9uIjogIlN0cmluZyByZXByZXNlbnRhdGlvbiBvZiB0aGUgb2JqZWN0LiIg fSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJoYXNDaGlsZHJlbiIsICJ0eXBlIjog ImJvb2xlYW4iLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiVHJ1ZSB3aGVuIHRo aXMgb2JqZWN0IGNhbiBiZSBxdWVyaWVkIGZvciBjaGlsZHJlbi4iIH0sCisgICAgICAgICAgICAg ICAgICAgIHsgIm5hbWUiOiAib2JqZWN0SWQiLCAidHlwZSI6ICJzdHJpbmciLCAib3B0aW9uYWwi OiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiVW5pcXVlIG9iamVjdCBpZGVudGlmaWVyIChmb3Igbm9u LXByaW1pdGl2ZSB2YWx1ZXMpLiIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ0 eXBlIiwgInR5cGUiOiAic3RyaW5nIiwgImVudW0iOiBbIm9iamVjdCIsICJhcnJheSIsICJmdW5j dGlvbiIsICJudWxsIiwgIm5vZGUiLCAidW5kZWZpbmVkIiwgInN0cmluZyIsICJudW1iZXIiLCAi Ym9vbGVhbiIsICJyZWdleHAiLCAiZGF0ZSJdLCAiZGVzY3JpcHRpb24iOiAiT2JqZWN0IHR5cGUu IiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImNsYXNzTmFtZSIsICJ0eXBlIjog InN0cmluZyIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJPYmplY3QgY2xhc3Mg bmFtZS4iIH0KICAgICAgICAgICAgICAgICBdCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAg ewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xl Vmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcu anMKaW5kZXggMmFlZjEzMTUxMGU0ZDE0YTNmM2Q5OTQ4MmE2MjY1MGU3YTFhYmY2Yy4uZmZjMWIy MGExNTIxMDM1ZjMyN2NhMTkwZGE2NWNjYjM3NDEwNDllOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCkBAIC02MTUsMTYgKzYxNSwx MSBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0gewogCiAgICAgX2Zvcm1h dDogZnVuY3Rpb24ob3V0cHV0LCBmb3JjZU9iamVjdEZvcm1hdCkKICAgICB7Ci0gICAgICAgIHZh ciB0eXBlOwotICAgICAgICBpZiAoZm9yY2VPYmplY3RGb3JtYXQpCi0gICAgICAgICAgICB0eXBl ID0gIm9iamVjdCI7Ci0gICAgICAgIGVsc2UgaWYgKG91dHB1dCBpbnN0YW5jZW9mIFdlYkluc3Bl Y3Rvci5SZW1vdGVPYmplY3QpCi0gICAgICAgICAgICB0eXBlID0gb3V0cHV0LnN1YnR5cGUgfHwg b3V0cHV0LnR5cGU7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIHR5cGUgPSB0eXBlb2Ygb3V0 cHV0OworICAgICAgICB2YXIgaXNQcm94eSA9IChvdXRwdXQgIT0gbnVsbCAmJiB0eXBlb2Ygb3V0 cHV0ID09PSAib2JqZWN0Iik7CisgICAgICAgIHZhciB0eXBlID0gKGZvcmNlT2JqZWN0Rm9ybWF0 ID8gIm9iamVjdCIgOiBXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0LnR5cGUob3V0cHV0KSk7CiAK ICAgICAgICAgdmFyIGZvcm1hdHRlciA9IHRoaXMuX2N1c3RvbUZvcm1hdHRlcnNbdHlwZV07Ci0g ICAgICAgIGlmICghZm9ybWF0dGVyKSB7CisgICAgICAgIGlmICghZm9ybWF0dGVyIHx8ICFpc1By b3h5KSB7CiAgICAgICAgICAgICBmb3JtYXR0ZXIgPSB0aGlzLl9mb3JtYXR2YWx1ZTsKICAgICAg ICAgICAgIG91dHB1dCA9IG91dHB1dC5kZXNjcmlwdGlvbjsKICAgICAgICAgfQpAQCAtNzEyLDcg KzcwNyw3IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgX2Zv cm1hdEFzQXJyYXlFbnRyeTogZnVuY3Rpb24ob3V0cHV0KQogICAgIHsKICAgICAgICAgLy8gUHJl dmVudCBpbmZpbml0ZSBleHBhbnNpb24gb2YgY3Jvc3MtcmVmZXJlbmNpbmcgYXJyYXlzLgotICAg ICAgICByZXR1cm4gdGhpcy5fZm9ybWF0KG91dHB1dCwgb3V0cHV0LnN1YnR5cGUgJiYgb3V0cHV0 LnN1YnR5cGUgPT09ICJhcnJheSIpOworICAgICAgICByZXR1cm4gdGhpcy5fZm9ybWF0KG91dHB1 dCwgV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdC50eXBlKG91dHB1dCkgPT09ICJhcnJheSIpOwog ICAgIH0KIH0KIApAQCAtODQ5LDEwICs4NDQsNiBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3Nh Z2UucHJvdG90eXBlID0gewogICAgICAgICAvLyBGb3JtYXR0aW5nIGNvZGUgYmVsb3cgYXNzdW1l cyB0aGF0IHBhcmFtZXRlcnMgYXJlIGFsbCB3cmFwcGVycyB3aGVyZWFzIGZyb250ZW5kIGNvbnNv bGUKICAgICAgICAgLy8gQVBJIGFsbG93cyBwYXNzaW5nIGFyYml0cmFyeSB2YWx1ZXMgYXMgbWVz c2FnZXMgKHN0cmluZ3MsIG51bWJlcnMsIGV0Yy4pLiBXcmFwIHRoZW0gaGVyZS4KICAgICAgICAg Zm9yICh2YXIgaSA9IDA7IGkgPCBwYXJhbWV0ZXJzLmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAg ICAvLyBGSVhNRTogT25seSBwYXNzIHJ1bnRpbWUgd3JhcHBlcnMgaGVyZS4KLSAgICAgICAgICAg IGlmIChwYXJhbWV0ZXJzW2ldIGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdCkK LSAgICAgICAgICAgICAgICBjb250aW51ZTsKLQogICAgICAgICAgICAgaWYgKHR5cGVvZiBwYXJh bWV0ZXJzW2ldID09PSAib2JqZWN0IikKICAgICAgICAgICAgICAgICBwYXJhbWV0ZXJzW2ldID0g V2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdC5mcm9tUGF5bG9hZChwYXJhbWV0ZXJzW2ldKTsKICAg ICAgICAgICAgIGVsc2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qcwppbmRleCA5OWM3NTk3Zjc0OWMzMjIzNjhl ZDg3OWY5Y2I1MjcwMjE3NmZiYjJmLi5kMWU0YjAxODU1OWEwNjY0MTJlMjIxYzY2YzM5NzI1NTEw ZmYyOTY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Vs ZW1lbnRzVHJlZU91dGxpbmUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzCkBAIC01NzksOSArNTc5LDkgQEAgV2ViSW5zcGVj dG9yLkVsZW1lbnRzVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICBpZiAoIW5vZGUu bm9kZU5hbWUoKSB8fCBub2RlLm5vZGVOYW1lKCkudG9Mb3dlckNhc2UoKSAhPT0gImltZyIpCiAg ICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgZnVuY3Rpb24gc2V0VG9vbHRpcChyZXN1bHQp CisgICAgICAgIGZ1bmN0aW9uIHNldFRvb2x0aXAoZXJyb3IsIHJlc3VsdCwgd2FzVGhyb3duKQog ICAgICAgICB7Ci0gICAgICAgICAgICBpZiAoIXJlc3VsdCB8fCByZXN1bHQudHlwZSAhPT0gInN0 cmluZyIpCisgICAgICAgICAgICBpZiAoZXJyb3IgfHwgd2FzVGhyb3duIHx8IHJlc3VsdC50eXBl ICE9PSAic3RyaW5nIikKICAgICAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgICAgIHRy eSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL09iamVj dFByb3BlcnRpZXNTZWN0aW9uLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbi5qcwppbmRleCA1M2ZmM2ZkOTU2NGJmMGRkMzJlZWEy MTExMDVjMmUzYjdjYmJiNzJjLi45Njg3ODA3ODdiNTljOGEyMzRkYjM2NzM0NzY3M2FmMTUyOGM4 MThiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL09iamVj dFByb3BlcnRpZXNTZWN0aW9uLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvT2JqZWN0UHJvcGVydGllc1NlY3Rpb24uanMKQEAgLTIwNCw3ICsyMDQsNyBAQCBXZWJJ bnNwZWN0b3IuT2JqZWN0UHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAg ICAgICB0aGlzLnZhbHVlRWxlbWVudC5hZGRTdHlsZUNsYXNzKCJlcnJvciIpOwogICAgICAgICBp ZiAodGhpcy5wcm9wZXJ0eS52YWx1ZS50eXBlKQogICAgICAgICAgICAgdGhpcy52YWx1ZUVsZW1l bnQuYWRkU3R5bGVDbGFzcygiY29uc29sZS1mb3JtYXR0ZWQtIiArIHRoaXMucHJvcGVydHkudmFs dWUudHlwZSk7Ci0gICAgICAgIGlmICh0aGlzLnByb3BlcnR5LnZhbHVlLnN1YnR5cGUgPT09ICJu b2RlIikKKyAgICAgICAgaWYgKHRoaXMucHJvcGVydHkudmFsdWUudHlwZSA9PT0gIm5vZGUiKQog ICAgICAgICAgICAgdGhpcy52YWx1ZUVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY29udGV4dG1l bnUiLCB0aGlzLl9jb250ZXh0TWVudUV2ZW50RmlyZWQuYmluZCh0aGlzKSwgZmFsc2UpOwogCiAg ICAgICAgIHRoaXMubGlzdEl0ZW1FbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb3BlcnRpZXNTaWRlYmFyUGFu ZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvcGVydGllc1NpZGVi YXJQYW5lLmpzCmluZGV4IDVlM2VmYjA1ZDJlNDc2ZjNiZjJlNTZkNGI1MTVmOTkxMWViZWQxMGQu LmRiZGFhODQ3YjdmMjM3ZjFkYWQ0YWJmOTg3Yjk0M2M4NmJhNDdiYzcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvcGVydGllc1NpZGViYXJQYW5lLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvcGVydGllc1NpZGVi YXJQYW5lLmpzCkBAIC02NSwxMCArNjUsMTEgQEAgV2ViSW5zcGVjdG9yLlByb3BlcnRpZXNTaWRl YmFyUGFuZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBvYmplY3QucmVsZWFzZSgpOwogICAg ICAgICB9CiAKLSAgICAgICAgZnVuY3Rpb24gbm9kZVByb3RvdHlwZXNSZWFkeShvYmplY3QpCisg ICAgICAgIGZ1bmN0aW9uIG5vZGVQcm90b3R5cGVzUmVhZHkoZXJyb3IsIG9iamVjdFBheWxvYWQs IHdhc1Rocm93bikKICAgICAgICAgewotICAgICAgICAgICAgaWYgKCFvYmplY3QpCisgICAgICAg ICAgICBpZiAoZXJyb3IgfHwgd2FzVGhyb3duKQogICAgICAgICAgICAgICAgIHJldHVybjsKKyAg ICAgICAgICAgIHZhciBvYmplY3QgPSBXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0LmZyb21QYXls b2FkKG9iamVjdFBheWxvYWQpOwogICAgICAgICAgICAgb2JqZWN0LmdldE93blByb3BlcnRpZXMo ZmlsbFNlY3Rpb24uYmluZCh0aGlzKSk7CiAgICAgICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZW1vdGVPYmplY3QuanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1JlbW90ZU9iamVjdC5qcwppbmRleCA0ZjljOTJmOWU2 MWE1ZjhkOWQ3Zjg1MGM3ZjE0NjBiZmQxMzQ3ZDg5Li4zY2NjZmY4Zjg4NzQwYjI4ZTUxNzZmYzNi ZjZiZGEzN2IxOTM3NTZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1JlbW90ZU9iamVjdC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1JlbW90ZU9iamVjdC5qcwpAQCAtMjgsMjUgKzI4LDE3IEBACiAgKiBPRiBUSElTIFNP RlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdF LgogICovCiAKLVdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QgPSBmdW5jdGlvbihvYmplY3RJZCwg dHlwZSwgc3VidHlwZSwgdmFsdWUsIGRlc2NyaXB0aW9uKQorV2ViSW5zcGVjdG9yLlJlbW90ZU9i amVjdCA9IGZ1bmN0aW9uKG9iamVjdElkLCB0eXBlLCBkZXNjcmlwdGlvbiwgaGFzQ2hpbGRyZW4p CiB7CisgICAgdGhpcy5fb2JqZWN0SWQgPSBvYmplY3RJZDsKICAgICB0aGlzLl90eXBlID0gdHlw ZTsKLSAgICBpZiAob2JqZWN0SWQpIHsKLSAgICAgICAgLy8gaGFuZGxlCi0gICAgICAgIHRoaXMu X29iamVjdElkID0gb2JqZWN0SWQ7Ci0gICAgICAgIHRoaXMuX3N1YnR5cGUgPSBzdWJ0eXBlOwot ICAgICAgICB0aGlzLl9kZXNjcmlwdGlvbiA9IGRlc2NyaXB0aW9uOwotICAgICAgICB0aGlzLl9o YXNDaGlsZHJlbiA9IHRydWU7Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgLy8gUHJpbWl0aXZlCi0g ICAgICAgIHRoaXMuX2Rlc2NyaXB0aW9uID0gdmFsdWUgKyAiIjsKLSAgICAgICAgdGhpcy5faGFz Q2hpbGRyZW4gPSBmYWxzZTsKLSAgICB9CisgICAgdGhpcy5fZGVzY3JpcHRpb24gPSBkZXNjcmlw dGlvbjsKKyAgICB0aGlzLl9oYXNDaGlsZHJlbiA9IGhhc0NoaWxkcmVuOwogfQogCiBXZWJJbnNw ZWN0b3IuUmVtb3RlT2JqZWN0LmZyb21QcmltaXRpdmVWYWx1ZSA9IGZ1bmN0aW9uKHZhbHVlKQog ewotICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdChudWxsLCB0eXBlb2Yg dmFsdWUsIG51bGwsIHZhbHVlKTsKKyAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5SZW1vdGVP YmplY3QobnVsbCwgdHlwZW9mIHZhbHVlLCB2YWx1ZSk7CiB9CiAKIFdlYkluc3BlY3Rvci5SZW1v dGVPYmplY3QuZnJvbUxvY2FsT2JqZWN0ID0gZnVuY3Rpb24odmFsdWUpCkBAIC03MSw5ICs2Mywx MCBAQCBXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0LnJlc29sdmVOb2RlID0gZnVuY3Rpb24obm9k ZSwgb2JqZWN0R3JvdXAsIGNhbGxiYWNrKQogCiBXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0LmZy b21QYXlsb2FkID0gZnVuY3Rpb24ocGF5bG9hZCkKIHsKLSAgICBjb25zb2xlLmFzc2VydCh0eXBl b2YgcGF5bG9hZCA9PT0gIm9iamVjdCIsICJSZW1vdGUgb2JqZWN0IHBheWxvYWQgc2hvdWxkIG9u bHkgYmUgYW4gb2JqZWN0Iik7Ci0KLSAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5SZW1vdGVP YmplY3QocGF5bG9hZC5vYmplY3RJZCwgcGF5bG9hZC50eXBlLCBwYXlsb2FkLnN1YnR5cGUsIHBh eWxvYWQudmFsdWUsIHBheWxvYWQuZGVzY3JpcHRpb24pOworICAgIGlmICh0eXBlb2YgcGF5bG9h ZCA9PT0gIm9iamVjdCIpCisgICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLlJlbW90ZU9i amVjdChwYXlsb2FkLm9iamVjdElkLCBwYXlsb2FkLnR5cGUsIHBheWxvYWQuZGVzY3JpcHRpb24s IHBheWxvYWQuaGFzQ2hpbGRyZW4pOworICAgIC8vIEZJWE1FOiBtYWtlIHN1cmUgd2Ugb25seSBn ZXQgaGVyZSB3aXRoIHJlYWwgcGF5bG9hZHMgaW4gdGhlIG5ldyBEZWJ1Z2dlckFnZW50LmpzLgor ICAgIHJldHVybiBwYXlsb2FkOwogfQogCiBXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0LnR5cGUg PSBmdW5jdGlvbihyZW1vdGVPYmplY3QpCkBAIC05OSwxMSArOTIsNiBAQCBXZWJJbnNwZWN0b3Iu UmVtb3RlT2JqZWN0LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMuX3R5cGU7CiAg ICAgfSwKIAotICAgIGdldCBzdWJ0eXBlKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl9z dWJ0eXBlOwotICAgIH0sCi0KICAgICBnZXQgZGVzY3JpcHRpb24oKQogICAgIHsKICAgICAgICAg cmV0dXJuIHRoaXMuX2Rlc2NyaXB0aW9uOwpAQCAtMTYyLDEyICsxNTAsNyBAQCBXZWJJbnNwZWN0 b3IuUmVtb3RlT2JqZWN0LnByb3RvdHlwZSA9IHsKIAogICAgIGNhbGxGdW5jdGlvbjogZnVuY3Rp b24oZnVuY3Rpb25EZWNsYXJhdGlvbiwgY2FsbGJhY2spCiAgICAgewotICAgICAgICBmdW5jdGlv biBteWNhbGxiYWNrKGVycm9yLCByZXN1bHQsIHdhc1Rocm93bikKLSAgICAgICAgewotICAgICAg ICAgICAgY2FsbGJhY2soKGVycm9yIHx8IHdhc1Rocm93bikgPyBudWxsIDogV2ViSW5zcGVjdG9y LlJlbW90ZU9iamVjdC5mcm9tUGF5bG9hZChyZXN1bHQpKTsKLSAgICAgICAgfQotCi0gICAgICAg IFJ1bnRpbWVBZ2VudC5jYWxsRnVuY3Rpb25Pbih0aGlzLl9vYmplY3RJZCwgZnVuY3Rpb25EZWNs YXJhdGlvbi50b1N0cmluZygpLCB1bmRlZmluZWQsIG15Y2FsbGJhY2spOworICAgICAgICBSdW50 aW1lQWdlbnQuY2FsbEZ1bmN0aW9uT24odGhpcy5fb2JqZWN0SWQsIGZ1bmN0aW9uRGVjbGFyYXRp b24udG9TdHJpbmcoKSwgdW5kZWZpbmVkLCBjYWxsYmFjayk7CiAgICAgfSwKIAogICAgIHJlbGVh c2U6IGZ1bmN0aW9uKCkKQEAgLTI0OSwxOCArMjMyLDExIEBAIFdlYkluc3BlY3Rvci5Mb2NhbEpT T05PYmplY3QucHJvdG90eXBlID0gewogCiAgICAgZ2V0IHR5cGUoKQogICAgIHsKLSAgICAgICAg cmV0dXJuIHR5cGVvZiB0aGlzLl92YWx1ZTsKLSAgICB9LAotCi0gICAgZ2V0IHN1YnR5cGUoKQot ICAgIHsKICAgICAgICAgaWYgKHRoaXMuX3ZhbHVlID09PSBudWxsKQogICAgICAgICAgICAgcmV0 dXJuICJudWxsIjsKLQogICAgICAgICBpZiAodGhpcy5fdmFsdWUgaW5zdGFuY2VvZiBBcnJheSkK ICAgICAgICAgICAgIHJldHVybiAiYXJyYXkiOwotCi0gICAgICAgIHJldHVybiB1bmRlZmluZWQ7 CisgICAgICAgIHJldHVybiB0eXBlb2YgdGhpcy5fdmFsdWU7CiAgICAgfSwKIAogICAgIGdldCBo YXNDaGlsZHJlbigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1NvdXJjZUZyYW1lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T b3VyY2VGcmFtZS5qcwppbmRleCA0NzdjYWRhOWNhMzYyMjE5ZTliMzRiZjgxM2M1NDJmZmFiOGUw MjQ0Li45MWNlNjUzODdjNmM5ZjY2NzQzNTJkOGJhM2M4Y2RiODlkNzNiMjU5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKQEAgLTc4 OCw3ICs3ODgsNyBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAg ICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICAgICAgdmFyIHBvcHVwQ29udGVudEVsZW1l bnQgPSBudWxsOwotICAgICAgICAgICAgaWYgKHJlc3VsdC50eXBlICE9PSAib2JqZWN0Iikgewor ICAgICAgICAgICAgaWYgKHJlc3VsdC50eXBlICE9PSAib2JqZWN0IiAmJiByZXN1bHQudHlwZSAh PT0gIm5vZGUiICYmIHJlc3VsdC50eXBlICE9PSAiYXJyYXkiKSB7CiAgICAgICAgICAgICAgICAg cG9wdXBDb250ZW50RWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKICAg ICAgICAgICAgICAgICBwb3B1cENvbnRlbnRFbGVtZW50LmNsYXNzTmFtZSA9ICJtb25vc3BhY2Ug Y29uc29sZS1mb3JtYXR0ZWQtIiArIHJlc3VsdC50eXBlOwogICAgICAgICAgICAgICAgIHBvcHVw Q29udGVudEVsZW1lbnQuc3R5bGUud2hpdGVTcGFjZSA9ICJwcmUiOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwppbmRleCBiODNhMGU2OTk1NDM0 OTg5YjllODJiYzliODIzM2M1YmYzNGU3YzVmLi5kNWFlNjRiYzllNTlhZjE0OGNkNjEzZDJjZDFj ODFkNWNhMmFlZDdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL2luc3BlY3Rvci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L2luc3BlY3Rvci5qcwpAQCAtMTEyOCw3ICsxMTI4LDcgQEAgV2ViSW5zcGVjdG9yLmxvZyA9IGZ1 bmN0aW9uKG1lc3NhZ2UsIG1lc3NhZ2VMZXZlbCkKICAgICAgICAgV2ViSW5zcGVjdG9yLmxvZy5y ZXBlYXRDb3VudCA9IHJlcGVhdENvdW50OwogCiAgICAgICAgIC8vIENvbnNvbGVNZXNzYWdlIGV4 cGVjdHMgYSBwcm94eSBvYmplY3QKLSAgICAgICAgbWVzc2FnZSA9IFdlYkluc3BlY3Rvci5SZW1v dGVPYmplY3QuZnJvbVByaW1pdGl2ZVZhbHVlKG1lc3NhZ2UpOworICAgICAgICBtZXNzYWdlID0g bmV3IFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QuZnJvbVByaW1pdGl2ZVZhbHVlKG1lc3NhZ2Up OwogCiAgICAgICAgIC8vIHBvc3QgdGhlIG1lc3NhZ2UKICAgICAgICAgdmFyIG1zZyA9IG5ldyBX ZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UoCkBAIC0xMTY4LDcgKzExNjgsNyBAQCBXZWJJbnNw ZWN0b3IubG9nID0gZnVuY3Rpb24obWVzc2FnZSwgbWVzc2FnZUxldmVsKQogV2ViSW5zcGVjdG9y Lmluc3BlY3QgPSBmdW5jdGlvbihwYXlsb2FkLCBoaW50cykKIHsKICAgICB2YXIgb2JqZWN0ID0g V2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdC5mcm9tUGF5bG9hZChwYXlsb2FkKTsKLSAgICBpZiAo b2JqZWN0LnN1YnR5cGUgPT09ICJub2RlIikgeworICAgIGlmIChvYmplY3QudHlwZSA9PT0gIm5v ZGUiKSB7CiAgICAgICAgIC8vIFJlcXVlc3Qgbm9kZSBmcm9tIGJhY2tlbmQgYW5kIGZvY3VzIGl0 LgogICAgICAgICBvYmplY3QucHVzaE5vZGVUb0Zyb250ZW5kKFdlYkluc3BlY3Rvci51cGRhdGVG b2N1c2VkTm9kZS5iaW5kKFdlYkluc3BlY3RvciksIG9iamVjdC5yZWxlYXNlLmJpbmQob2JqZWN0 KSk7CiAgICAgICAgIHJldHVybjsK