48332 2010-10-26 08:37:47 -0700 REGRESSION(r70518): Breaks inspector tests. (Requested by pfeldman on #webkit). 2010-10-26 08:59:35 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 48261 1 webkit.review.bot webkit.review.bot jorlow pfeldman timothy oldest_to_newest 299485 0 webkit.review.bot 2010-10-26 08:37:47 -0700 http://trac.webkit.org/changeset/70518 broke the build: Breaks inspector tests. (Requested by pfeldman on #webkit). This is an automatic bug report generated by the sheriff-bot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests case pain. "Only you can prevent forest fires." -- Smokey the Bear 299486 1 71892 webkit.review.bot 2010-10-26 08:38:38 -0700 Created attachment 71892 ROLLOUT of r70518 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. 299502 2 71892 jorlow 2010-10-26 08:59:27 -0700 Comment on attachment 71892 ROLLOUT of r70518 Clearing flags on attachment: 71892 Committed r70525: <http://trac.webkit.org/changeset/70525> 299503 3 jorlow 2010-10-26 08:59:35 -0700 All reviewed patches have been landed. Closing bug. 71892 2010-10-26 08:38:38 -0700 2010-10-26 08:59:27 -0700 ROLLOUT of r70518 bug-48332-20101026153834.patch text/plain 36890 webkit.review.bot ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2ZWM0OWZjMWFmZTljYzNkOWZmYzk1MmIyMzgwMDg2YmEyNGJiNWY5Li4zZGE4ZGIz MjM3NTUyMTNhZGExY2UwZjA4NzE1ZWM1Y2JhNWY4ZTUwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAK KzIwMTAtMTAtMjYgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgor CisgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI3MDUxOC4KKyAgICAgICAgaHR0cDov L3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvNzA1MTgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ4MzMyCisKKyAgICAgICAgQnJlYWtzIGluc3BlY3Rv ciB0ZXN0cy4gKFJlcXVlc3RlZCBieSBwZmVsZG1hbiBvbiAjd2Via2l0KS4KKworICAgICAgICAq IGh0dHAvdGVzdHMvaW5zcGVjdG9yL2luc3BlY3Rvci10ZXN0Mi5qczoKKyAgICAgICAgKGluaXRp YWxpemVfSW5zcGVjdG9yVGVzdC5JbnNwZWN0b3JUZXN0LmNvbXBsZXRlVGVzdCk6CisgICAgICAg IChpbml0aWFsaXplX0luc3BlY3RvclRlc3QuSW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUluQ29uc29s ZSk6CisgICAgICAgIChpbml0aWFsaXplX0luc3BlY3RvclRlc3QuSW5zcGVjdG9yVGVzdC5ldmFs dWF0ZUluUGFnZSk6CisgICAgICAgIChpbml0aWFsaXplX0luc3BlY3RvclRlc3QuSW5zcGVjdG9y VGVzdC5ldmFsdWF0ZUluUGFnZVdpdGhUaW1lb3V0KToKKyAgICAgICAgKGluaXRpYWxpemVfSW5z cGVjdG9yVGVzdC5JbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCk6CisgICAgICAgIChpbml0aWFsaXpl X0luc3BlY3RvclRlc3QuSW5zcGVjdG9yVGVzdC5hZGRPYmplY3QpOgorICAgICAgICAoaW5pdGlh bGl6ZV9JbnNwZWN0b3JUZXN0Lkluc3BlY3RvclRlc3QucmVsb2FkUGFnZSk6CisgICAgICAgIChp bml0aWFsaXplX0luc3BlY3RvclRlc3QuSW5zcGVjdG9yVGVzdC5wYWdlUmVsb2FkZWQpOgorICAg ICAgICAoaW5pdGlhbGl6ZV9JbnNwZWN0b3JUZXN0Lkluc3BlY3RvclRlc3QucnVuQWZ0ZXJQZW5k aW5nRGlzcGF0Y2hlcyk6CisgICAgICAgIChpbml0aWFsaXplX0luc3BlY3RvclRlc3QuSW5zcGVj dG9yVGVzdC5lbmFibGVSZXNvdXJjZVRyYWNraW5nKToKKyAgICAgICAgKGluaXRpYWxpemVfSW5z cGVjdG9yVGVzdC5JbnNwZWN0b3JUZXN0LmRpc2FibGVSZXNvdXJjZVRyYWNraW5nKToKKyAgICAg ICAgKGluaXRpYWxpemVfSW5zcGVjdG9yVGVzdC5JbnNwZWN0b3JUZXN0LmZpbmRET01Ob2RlKToK KyAgICAgICAgKGluaXRpYWxpemVfSW5zcGVjdG9yVGVzdC5JbnNwZWN0b3JUZXN0Ll9hZGRTbmlm ZmVyKToKKyAgICAgICAgKiBodHRwL3Rlc3RzL2luc3BlY3Rvci9yZXNvdXJjZS1wYXJhbWV0ZXJz Lmh0bWw6CisgICAgICAgICogaW5zcGVjdG9yL2F1ZGl0cy1wYW5lbC1mdW5jdGlvbmFsLmh0bWw6 CisgICAgICAgICogaW5zcGVjdG9yL3N0eWxlcy1zb3VyY2Utb2Zmc2V0cy5odG1sOgorCiAyMDEw LTEwLTI2ICBKZXJlbXkgT3Jsb3cgIDxqb3Jsb3dAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IFN0ZXZlIEJsb2NrLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0 cy9pbnNwZWN0b3IvaW5zcGVjdG9yLXRlc3QyLmpzIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9p bnNwZWN0b3IvaW5zcGVjdG9yLXRlc3QyLmpzCmluZGV4IDhkOTczNDA3Y2IzMDgzMmZjNzViMTdj YzliMWIyMmYxYTkxODUzMDUuLmU3MzY3MmM4ZGRkMmZhZTg0NmI5YjM3MTgyMjljZWM3ODdkNzVj N2EgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2luc3BlY3Rv ci10ZXN0Mi5qcworKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9pbnNwZWN0 b3ItdGVzdDIuanMKQEAgLTYsNyArNiw3IEBAIHZhciByZXN1bHRzU3luY2hyb25pemVkID0gZmFs c2U7CiBJbnNwZWN0b3JUZXN0LmNvbXBsZXRlVGVzdCA9IGZ1bmN0aW9uKCkKIHsKICAgICBJbnNw ZWN0b3JCYWNrZW5kLmRpZEV2YWx1YXRlRm9yVGVzdEluRnJvbnRlbmQoSW5zcGVjdG9yVGVzdC5j b21wbGV0ZVRlc3RDYWxsSWQsICIiKTsKLX0KK307CiAKIEluc3BlY3RvclRlc3QuZXZhbHVhdGVJ bkNvbnNvbGUgPSBmdW5jdGlvbihjb2RlLCBjYWxsYmFjaykKIHsKQEAgLTIwLDE3ICsyMCwxNyBA QCBJbnNwZWN0b3JUZXN0LmV2YWx1YXRlSW5Db25zb2xlID0gZnVuY3Rpb24oY29kZSwgY2FsbGJh Y2spCiAgICAgICAgICAgICBpZiAoY2FsbGJhY2spCiAgICAgICAgICAgICAgICAgY2FsbGJhY2so Y29tbWFuZFJlc3VsdC50b01lc3NhZ2VFbGVtZW50KCkudGV4dENvbnRlbnQpOwogICAgICAgICB9 KTsKLX0KK307CiAKIEluc3BlY3RvclRlc3QuZXZhbHVhdGVJblBhZ2UgPSBmdW5jdGlvbihjb2Rl LCBjYWxsYmFjaykKIHsKICAgICBJbmplY3RlZFNjcmlwdEFjY2Vzcy5nZXREZWZhdWx0KCkuZXZh bHVhdGUoY29kZSwgImNvbnNvbGUiLCBjYWxsYmFjayB8fCBmdW5jdGlvbigpIHt9KTsKLX0KK307 CiAKIEluc3BlY3RvclRlc3QuZXZhbHVhdGVJblBhZ2VXaXRoVGltZW91dCA9IGZ1bmN0aW9uKGNv ZGUsIGNhbGxiYWNrKQogewogICAgIEluc3BlY3RvclRlc3QuZXZhbHVhdGVJblBhZ2UoInNldFRp bWVvdXQodW5lc2NhcGUoJyIgKyBlc2NhcGUoY29kZSkgKyAiJykpIiwgY2FsbGJhY2spOwotfQor fTsKIAogSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQgPSBmdW5jdGlvbih0ZXh0KQogewpAQCAtNDcs NyArNDcsNyBAQCBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCA9IGZ1bmN0aW9uKHRleHQpCiAgICAg ewogICAgICAgICBJbnNwZWN0b3JUZXN0LmV2YWx1YXRlSW5QYWdlKCJvdXRwdXQodW5lc2NhcGUo JyIgKyBlc2NhcGUodGV4dCkgKyAiJykpIik7CiAgICAgfQotfQorfTsKIAogSW5zcGVjdG9yVGVz dC5hZGRPYmplY3QgPSBmdW5jdGlvbihvYmplY3QsIG5vbmRldGVybWluaXN0aWNQcm9wcywgcHJl Zml4LCBmaXJzdExpbmVQcmVmaXgpCiB7CkBAIC03MSwyOCArNzEsMTYgQEAgSW5zcGVjdG9yVGVz dC5hZGRPYmplY3QgPSBmdW5jdGlvbihvYmplY3QsIG5vbmRldGVybWluaXN0aWNQcm9wcywgcHJl Zml4LCBmaXJzdEwKICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KHByZWZpeFdp dGhOYW1lICsgcHJvcFZhbHVlKTsKICAgICB9CiAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQo cHJlZml4ICsgIn0iKTsKLX0KK307CiAKIEluc3BlY3RvclRlc3QucmVsb2FkUGFnZSA9IGZ1bmN0 aW9uKGNhbGxiYWNrKQogewogICAgIEluc3BlY3RvclRlc3QuX3JlbG9hZFBhZ2VDYWxsYmFjayA9 IGNhbGxiYWNrOwotCi0gICAgaWYgKFdlYkluc3BlY3Rvci5wYW5lbHMubmV0d29yaykKLSAgICAg ICAgV2ViSW5zcGVjdG9yLnBhbmVscy5uZXR3b3JrLl9yZXNldCgpOwogICAgIEluc3BlY3RvckJh Y2tlbmQucmVsb2FkUGFnZSgpOwotfQotCi1JbnNwZWN0b3JUZXN0LnJlbG9hZFBhZ2VJZk5lZWRl ZCA9IGZ1bmN0aW9uKGNhbGxiYWNrKQotewotICAgIGlmICghSW5zcGVjdG9yVGVzdC5fcGFnZVdh c1JlbG9hZGVkKQotICAgICAgICBJbnNwZWN0b3JUZXN0LnJlbG9hZFBhZ2UoY2FsbGJhY2spOwot ICAgIGVsc2UKLSAgICAgICAgY2FsbGJhY2soKTsKLX0KK307CiAKIEluc3BlY3RvclRlc3QucGFn ZVJlbG9hZGVkID0gZnVuY3Rpb24oKQogewotICAgIEluc3BlY3RvclRlc3QuX3BhZ2VXYXNSZWxv YWRlZCA9IHRydWU7CiAgICAgcmVzdWx0c1N5bmNocm9uaXplZCA9IGZhbHNlOwogICAgIEluc3Bl Y3RvclRlc3QuYWRkUmVzdWx0KCJQYWdlIHJlbG9hZGVkLiIpOwogICAgIGlmIChJbnNwZWN0b3JU ZXN0Ll9yZWxvYWRQYWdlQ2FsbGJhY2spIHsKQEAgLTEwMCwzNiArODgsMjggQEAgSW5zcGVjdG9y VGVzdC5wYWdlUmVsb2FkZWQgPSBmdW5jdGlvbigpCiAgICAgICAgIGRlbGV0ZSBJbnNwZWN0b3JU ZXN0Ll9yZWxvYWRQYWdlQ2FsbGJhY2s7CiAgICAgICAgIGNhbGxiYWNrKCk7CiAgICAgfQotfQor fTsKIAogSW5zcGVjdG9yVGVzdC5ydW5BZnRlclBlbmRpbmdEaXNwYXRjaGVzID0gZnVuY3Rpb24o Y2FsbGJhY2spCiB7CiAgICAgV2ViSW5zcGVjdG9yLlRlc3RDb250cm9sbGVyLnByb3RvdHlwZS5y dW5BZnRlclBlbmRpbmdEaXNwYXRjaGVzKGNhbGxiYWNrKTsKLX0KK307CiAKIEluc3BlY3RvclRl c3QuZW5hYmxlUmVzb3VyY2VUcmFja2luZyA9IGZ1bmN0aW9uKGNhbGxiYWNrKQogewotICAgIGlm IChQcmVmZXJlbmNlcy5uZXR3b3JrUGFuZWxFbmFibGVkKSB7Ci0gICAgICAgIEluc3BlY3RvclRl c3QucmVsb2FkUGFnZUlmTmVlZGVkKGNhbGxiYWNrKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0K LQogICAgIGlmIChXZWJJbnNwZWN0b3IucGFuZWxzLnJlc291cmNlcy5yZXNvdXJjZVRyYWNraW5n RW5hYmxlZCkKICAgICAgICAgY2FsbGJhY2soKTsKICAgICBlbHNlIHsKICAgICAgICAgSW5zcGVj dG9yVGVzdC5fcmVsb2FkUGFnZUNhbGxiYWNrID0gY2FsbGJhY2s7CiAgICAgICAgIFdlYkluc3Bl Y3Rvci5wYW5lbHMucmVzb3VyY2VzLl90b2dnbGVSZXNvdXJjZVRyYWNraW5nKCk7CiAgICAgfQot fQorfTsKIAogSW5zcGVjdG9yVGVzdC5kaXNhYmxlUmVzb3VyY2VUcmFja2luZyA9IGZ1bmN0aW9u KCkKIHsKLSAgICBpZiAoUHJlZmVyZW5jZXMubmV0d29ya1BhbmVsRW5hYmxlZCkKLSAgICAgICAg cmV0dXJuOwotCiAgICAgaWYgKFdlYkluc3BlY3Rvci5wYW5lbHMucmVzb3VyY2VzLnJlc291cmNl VHJhY2tpbmdFbmFibGVkKQogICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnJlc291cmNlcy5f dG9nZ2xlUmVzb3VyY2VUcmFja2luZygpOwotfQorfTsKIAogSW5zcGVjdG9yVGVzdC5maW5kRE9N Tm9kZSA9IGZ1bmN0aW9uKHJvb3QsIGZpbHRlciwgY2FsbGJhY2spCiB7CkBAIC0xNzAsNyArMTUw LDcgQEAgSW5zcGVjdG9yVGVzdC5maW5kRE9NTm9kZSA9IGZ1bmN0aW9uKHJvb3QsIGZpbHRlciwg Y2FsbGJhY2spCiAgICAgICAgICAgICAgICAgZmluZERPTU5vZGUoY2hpbGRyZW5baV0pOwogICAg ICAgICB9CiAgICAgfQotfQorfTsKIAogSW5zcGVjdG9yVGVzdC5fYWRkU25pZmZlciA9IGZ1bmN0 aW9uKHJlY2VpdmVyLCBtZXRob2ROYW1lLCBvdmVycmlkZSwgb3B0X3N0aWNreSkKIHsKQEAgLTE5 Myw3ICsxNzMsNyBAQCBJbnNwZWN0b3JUZXN0Ll9hZGRTbmlmZmVyID0gZnVuY3Rpb24ocmVjZWl2 ZXIsIG1ldGhvZE5hbWUsIG92ZXJyaWRlLCBvcHRfc3RpY2t5KQogICAgICAgICB9CiAgICAgICAg IHJldHVybiByZXN1bHQ7CiAgICAgfTsKLX0KK307CiAKIH07CiAKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlLXBhcmFtZXRlcnMuaHRtbCBiL0xh eW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlLXBhcmFtZXRlcnMuaHRtbApp bmRleCAxNmZiNGRjMTgzNzk3YWQwMjZmZWVhM2ZhZjMwZDlmZTk2YTMwNDhlLi4xYjI4YmYyM2Rm Zjc0MzA3MGNlNmJkYzM2ODRhM2E5MzI0Mzk3MjZjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL2luc3BlY3Rvci9yZXNvdXJjZS1wYXJhbWV0ZXJzLmh0bWwKKysrIGIvTGF5b3V0 VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvcmVzb3VyY2UtcGFyYW1ldGVycy5odG1sCkBAIC00 MSw3ICs0MSw3IEBAIGZ1bmN0aW9uIGZyb250ZW5kX2VuYWJsZVJlc291cmNlVHJhY2tpbmcodGVz dENvbnRyb2xsZXIpCiAKIGZ1bmN0aW9uIGZyb250ZW5kX2R1bXBGb3JtRGF0YSh0ZXN0Q29udHJv bGxlcikKIHsKLSAgICB2YXIgcmVzb3VyY2UgPSBXZWJJbnNwZWN0b3IucmVzb3VyY2VGb3JVUkwo Imh0dHA6Ly9sb2NhbGhvc3Q6ODAwMC9pbnNwZWN0b3IvcmVzb3VyY2VzL3Bvc3QtdGFyZ2V0LmNn aT9xdWVyeVBhcmFtMT1xdWVyeVZhbHVlMSZxdWVyeVBhcmFtMj0iKTsKKyAgICB2YXIgcmVzb3Vy Y2UgPSBXZWJJbnNwZWN0b3IucmVzb3VyY2VVUkxNYXBbImh0dHA6Ly9sb2NhbGhvc3Q6ODAwMC9p bnNwZWN0b3IvcmVzb3VyY2VzL3Bvc3QtdGFyZ2V0LmNnaT9xdWVyeVBhcmFtMT1xdWVyeVZhbHVl MSZxdWVyeVBhcmFtMj0iXTsKIAogICAgIFdlYkluc3BlY3Rvci5wYW5lbHMucmVzb3VyY2VzLl90 b2dnbGVSZXNvdXJjZVRyYWNraW5nKCk7CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9hdWRpdHMtcGFuZWwtZnVuY3Rpb25hbC5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2F1ZGl0cy1wYW5lbC1mdW5jdGlvbmFsLmh0bWwKaW5kZXggMDVmNWMzNTE2MmJkM2NmMDQ4N2Fl YjYyYzJmNGE0NjE0NzAyZDFhZi4uMjNmYTQ5MTU5ZGI4ZWIyZDAwMmU2ZmI2Mjc2NmMxMDAzMzYy MzhmNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2F1ZGl0cy1wYW5lbC1mdW5j dGlvbmFsLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2F1ZGl0cy1wYW5lbC1mdW5j dGlvbmFsLmh0bWwKQEAgLTMzLDE0ICszMyw3IEBAIGZ1bmN0aW9uIGRvaXQoKQogCiBmdW5jdGlv biBmcm9udGVuZF9ydW5BdWRpdHModGVzdENvbnRyb2xsZXIpCiB7Ci0gICAgaWYgKFByZWZlcmVu Y2VzLm5ldHdvcmtQYW5lbEVuYWJsZWQpIHsKLSAgICAgICAgaWYgKCFXZWJJbnNwZWN0b3IucGFu ZWxzLm5ldHdvcmsuX3BhZ2VXYXNSZWxvYWRlZCkgewotICAgICAgICAgICAgV2ViSW5zcGVjdG9y LnBhbmVscy5uZXR3b3JrLl9wYWdlV2FzUmVsb2FkZWQgPSB0cnVlOwotICAgICAgICAgICAgV2Vi SW5zcGVjdG9yLnBhbmVscy5uZXR3b3JrLl9yZXNldCgpOwotICAgICAgICAgICAgSW5zcGVjdG9y QmFja2VuZC5yZWxvYWRQYWdlKCk7Ci0gICAgICAgICAgICByZXR1cm4gInJlZnJlc2hpbmciOwot ICAgICAgICB9Ci0gICAgfSBlbHNlIGlmICghV2ViSW5zcGVjdG9yLnBhbmVscy5yZXNvdXJjZXMu cmVzb3VyY2VUcmFja2luZ0VuYWJsZWQpIHsKKyAgICBpZiAoIVdlYkluc3BlY3Rvci5wYW5lbHMu cmVzb3VyY2VzLnJlc291cmNlVHJhY2tpbmdFbmFibGVkKSB7CiAgICAgICAgIFdlYkluc3BlY3Rv ci5wYW5lbHMucmVzb3VyY2VzLl90b2dnbGVSZXNvdXJjZVRyYWNraW5nKCk7CiAgICAgICAgIHJl dHVybiAicmVmcmVzaGluZyI7CiAgICAgfQpAQCAtNTksOCArNTIsNyBAQCBmdW5jdGlvbiBmcm9u dGVuZF9ydW5BdWRpdHModGVzdENvbnRyb2xsZXIpCiAgICAgICAgICAgICAvLyBBdWRpdHMgYXJl IGRvbmUsIGNoZWNrIHJlc3VsdHMuCiAgICAgICAgICAgICB2YXIgb3V0cHV0ID0gZnJvbnRlbmRf Y29sbGVjdEF1ZGl0UmVzdWx0cygpOwogICAgICAgICAgICAgLy8gQXZvaWQgaW5mbHVlbmNpbmcg dGVzdHMgdGhhdCByZXF1aXJlIHJlc291cmNlIHRyYWNraW5nIHRvIGJlIGRpc2FibGVkLgotICAg ICAgICAgICAgaWYgKCFQcmVmZXJlbmNlcy5uZXR3b3JrUGFuZWxFbmFibGVkKQotICAgICAgICAg ICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMucmVzb3VyY2VzLl90b2dnbGVSZXNvdXJjZVRyYWNr aW5nKCk7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnJlc291cmNlcy5fdG9nZ2xl UmVzb3VyY2VUcmFja2luZygpOwogICAgICAgICAgICAgdGVzdENvbnRyb2xsZXIucnVuQWZ0ZXJQ ZW5kaW5nRGlzcGF0Y2hlcyhmdW5jdGlvbigpIHsKICAgICAgICAgICAgICAgICB0ZXN0Q29udHJv bGxlci5ub3RpZnlEb25lKG91dHB1dC5qb2luKCJcbiIpKTsKICAgICAgICAgICAgIH0pOwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy1zb3VyY2Utb2Zmc2V0cy5odG1s IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy1zb3VyY2Utb2Zmc2V0cy5odG1sCmluZGV4 IDIwNWY0Njc0ODJjNjJkZTFiODE1YzMyNzgzZTRmYThmYTI5MzY0MjguLmZjZjkyOGY4ZWE2ZWIy MzhiMzExZWJmNGIyNGQzZmRiZGIzZTE5YzYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9zdHlsZXMtc291cmNlLW9mZnNldHMuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0 b3Ivc3R5bGVzLXNvdXJjZS1vZmZzZXRzLmh0bWwKQEAgLTI0LDcgKzI0LDcgQEAgZnVuY3Rpb24g ZG9pdCgpCiAKIGZ1bmN0aW9uIGZyb250ZW5kX3J1blRlc3QodGVzdENvbnRyb2xsZXIpCiB7Ci0g ICAgaWYgKCFQcmVmZXJlbmNlcy5uZXR3b3JrUGFuZWxFbmFibGVkICYmICFXZWJJbnNwZWN0b3Iu cGFuZWxzLnJlc291cmNlcy5yZXNvdXJjZVRyYWNraW5nRW5hYmxlZCkgeworICAgIGlmICghV2Vi SW5zcGVjdG9yLnBhbmVscy5yZXNvdXJjZXMucmVzb3VyY2VUcmFja2luZ0VuYWJsZWQpIHsKICAg ICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5yZXNvdXJjZXMuX3RvZ2dsZVJlc291cmNlVHJhY2tp bmcoKTsKICAgICAgICAgcmV0dXJuICJyZWZyZXNoaW5nIjsKICAgICB9CmRpZmYgLS1naXQgYS9X ZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDk0ZGJkZThmZWExYzFj YzIyNTE1ODM1OGY1MjY5M2E3NzllZTA0M2MuLjk3NzdiYjk2MDUzMzI1ZWY3ZDhlMDNhODMyYWQy ZTkxNzY5OGVlMWIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsNzAgQEAKKzIwMTAtMTAtMjYgIFNoZXJpZmYgQm90ICA8d2Vi a2l0LnJldmlldy5ib3RAZ21haWwuY29tPgorCisgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcg b3V0IHI3MDUxOC4KKyAgICAgICAgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvNzA1 MTgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ4MzMy CisKKyAgICAgICAgQnJlYWtzIGluc3BlY3RvciB0ZXN0cy4gKFJlcXVlc3RlZCBieSBwZmVsZG1h biBvbiAjd2Via2l0KS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQXVkaXRMYXVu Y2hlclZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQXVkaXRMYXVuY2hlclZpZXcucHJv dG90eXBlLl9jcmVhdGVMYXVuY2hlclVJKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L0F1ZGl0c1BhbmVsLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZp ZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlLmFkZE1l c3NhZ2UpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ29va2llSXRlbXNWaWV3Lmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvb2tpZUl0ZW1zVmlldy5wcm90b3R5cGUuX2ZpbHRl ckNvb2tpZXNGb3JEb21haW4pOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5z aW9uU2VydmVyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkV4dGVuc2lvblNlcnZlci5wcm90 b3R5cGUuX29uUmV2ZWFsQW5kU2VsZWN0UmVzb3VyY2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkV4dGVuc2lvblNlcnZlci5wcm90b3R5cGUuX29uR2V0UmVzb3VyY2VzKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5FeHRlbnNpb25TZXJ2ZXIucHJvdG90eXBlLl9vbkdldFJlc291cmNlQ29udGVu dCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9IQVJFbnRyeS5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5IQVJMb2cucHJvdG90eXBlLmJ1aWxkKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5IQVJMb2cucHJvdG90eXBlLmJ1aWxkTWFpblJlc291cmNlVGltaW5ncyk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuSEFSTG9nLnByb3RvdHlwZS5fY29udmVydFJlc291cmNlKToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5OZXR3b3JrUGFuZWwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5l bC5wcm90b3R5cGUuX3Jlc2V0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrUGFuZWwu cHJvdG90eXBlLmFkZFJlc291cmNlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jl c291cmNlLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZS5zZXQg Y2F0ZWdvcnkpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VDYXRlZ29y eS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZUNhdGVnb3J5KToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5SZXNvdXJjZUNhdGVnb3J5LnByb3RvdHlwZS50b1N0cmluZyk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VDYXRlZ29yeS5wcm90b3R5cGUuYWRkUmVzb3VyY2Up OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlQ2F0ZWdvcnkucHJvdG90eXBlLnJlbW92 ZVJlc291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZUNhdGVnb3J5LnByb3Rv dHlwZS5yZW1vdmVBbGxSZXNvdXJjZXMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv UmVzb3VyY2VNYW5hZ2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlTWFuYWdl ci5wcm90b3R5cGUuaWRlbnRpZmllckZvckluaXRpYWxSZXF1ZXN0KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5SZXNvdXJjZU1hbmFnZXIucHJvdG90eXBlLndpbGxTZW5kUmVxdWVzdCk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VNYW5hZ2VyLnByb3RvdHlwZS5kaWRGaW5pc2hMb2Fk aW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZU1hbmFnZXIucHJvdG90eXBlLmRp ZEZhaWxMb2FkaW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZU1hbmFnZXIucHJv dG90eXBlLmRpZExvYWRSZXNvdXJjZUZyb21NZW1vcnlDYWNoZSk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuUmVzb3VyY2VNYW5hZ2VyLnByb3RvdHlwZS5zZXRPdmVycmlkZUNvbnRlbnQpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLnByb3RvdHlwZS5fY2FsbEZvckZy YW1lUmVzb3VyY2VzKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1Bh bmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUucmVzZXQpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5hZGRSZXNvdXJjZSk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlLnJlbW92ZVJlc291cmNl KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUuX3RvZ2ds ZVJlc291cmNlVHJhY2tpbmcpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0 c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUu YWRkU2NyaXB0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBl Ll9yZXNvdXJjZUxvYWRpbmdGaW5pc2hlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0 c1BhbmVsLnByb3RvdHlwZS5fYnJlYWtwb2ludEFkZGVkKToKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0 eWxlUHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUudXBkYXRlVGl0bGUubGlua2lmeVVSTCk6 CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuX3VwZGF0ZUZvY3VzZWROb2RlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci51 cGRhdGVSZXNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuZG9tQ29udGVudEV2ZW50Rmly ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmxvYWRFdmVudEZpcmVkKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5yZW1vdmVSZXNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IucmVzZXQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLmRpc3BsYXlOYW1lRm9yVVJMKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5yZXNvdXJjZUZvclVSTCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IubGlua2lm eVN0cmluZ0FzRnJhZ21lbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLnJlc291cmNlVVJMRm9y UmVsYXRlZE5vZGUpOgorCiAyMDEwLTEwLTI2ICBKZXJlbXkgT3Jsb3cgIDxqb3Jsb3dAY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFN0ZXZlIEJsb2NrLgpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0F1ZGl0TGF1bmNoZXJWaWV3LmpzIGIvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0F1ZGl0TGF1bmNoZXJWaWV3LmpzCmluZGV4IGQ0YmJmOTA3 YTZkNGMyNGI5MDEzY2JhNjM1OTA0NzJmOTI0OGU1YzYuLmE5MjI3MTViNzBkODQwYTk1ODAzYWRk ZjliYjU5MTEyYzAyY2VhYjUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9BdWRpdExhdW5jaGVyVmlldy5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv QXVkaXRMYXVuY2hlclZpZXcuanMKQEAgLTI2OSw3ICsyNjksNiBAQCBXZWJJbnNwZWN0b3IuQXVk aXRMYXVuY2hlclZpZXcucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9zZWxlY3RBbGxDbGlj a2VkKHRoaXMuX3NlbGVjdEFsbENoZWNrYm94RWxlbWVudC5jaGVja2VkKTsKICAgICAgICAgdGhp cy51cGRhdGVSZXNvdXJjZVRyYWNraW5nU3RhdGUoKTsKICAgICAgICAgdGhpcy5fdXBkYXRlQnV0 dG9uKCk7Ci0gICAgICAgIHRoaXMuX3VwZGF0ZVJlc291cmNlUHJvZ3Jlc3MoKTsKICAgICB9LAog CiAgICAgX3VwZGF0ZVJlc291cmNlUHJvZ3Jlc3M6IGZ1bmN0aW9uKCkKZGlmZiAtLWdpdCBhL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRpdHNQYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9BdWRpdHNQYW5lbC5qcwppbmRleCA4OTQ3ZjJjMzc4ODM5OWM3Mjc5NDMw NzU4MzkzN2NkNjA4N2ZiNTNkLi44MmJlNThmZDNlNDAyOTBjYWI2MDNmNTY5MmM1ZDFiOWU3MmQw ZWVlIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXVkaXRzUGFuZWwu anMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0F1ZGl0c1BhbmVsLmpzCkBAIC0x MzAsOCArMTMwLDggQEAgV2ViSW5zcGVjdG9yLkF1ZGl0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAg ICBfZXhlY3V0ZUF1ZGl0OiBmdW5jdGlvbihjYXRlZ29yaWVzLCByZXN1bHRDYWxsYmFjaykKICAg ICB7CiAgICAgICAgIHZhciByZXNvdXJjZXMgPSBbXTsKLSAgICAgICAgZm9yICh2YXIgaWQgaW4g V2ViSW5zcGVjdG9yLm5ldHdvcmtSZXNvdXJjZXMpCi0gICAgICAgICAgICByZXNvdXJjZXMucHVz aChXZWJJbnNwZWN0b3IubmV0d29ya1Jlc291cmNlc1tpZF0pOworICAgICAgICBmb3IgKHZhciBp ZCBpbiBXZWJJbnNwZWN0b3IucmVzb3VyY2VzKQorICAgICAgICAgICAgcmVzb3VyY2VzLnB1c2go V2ViSW5zcGVjdG9yLnJlc291cmNlc1tpZF0pOwogCiAgICAgICAgIHZhciBydWxlc1JlbWFpbmlu ZyA9IDA7CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgY2F0ZWdvcmllcy5sZW5ndGg7ICsr aSkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5q cyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcwppbmRleCAzYjNi OTcxMDZhNmM0OTAwZmUzNzcxMDdiMDE5NmUwNzg5MzUyOWU0Li4xMDYyNTA3YzA1YzVmNjg2MjI5 MmJiOTMwZTQyZTEyNDMyOGJmOTlkIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvQ29uc29sZVZpZXcuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Nv bnNvbGVWaWV3LmpzCkBAIC0yMjUsMTQgKzIyNSwxMiBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZp ZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5faW5jcmVtZW50RXJyb3JXYXJuaW5n Q291bnQobXNnKTsKIAogICAgICAgICAgICAgLy8gQWRkIG1lc3NhZ2UgdG8gdGhlIHJlc291cmNl IHBhbmVsCi0gICAgICAgICAgICBpZiAoIVByZWZlcmVuY2VzLm5ldHdvcmtQYW5lbEVuYWJsZWQp IHsKLSAgICAgICAgICAgICAgICB2YXIgcmVzb3VyY2UgPSBXZWJJbnNwZWN0b3IucmVzb3VyY2VG b3JVUkwobXNnLnVybCk7Ci0gICAgICAgICAgICAgICAgaWYgKHJlc291cmNlKSB7Ci0gICAgICAg ICAgICAgICAgICAgIG1zZy5yZXNvdXJjZSA9IHJlc291cmNlOwotICAgICAgICAgICAgICAgICAg ICBpZiAoV2ViSW5zcGVjdG9yLnBhbmVscy5yZXNvdXJjZXMpCi0gICAgICAgICAgICAgICAgICAg ICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnJlc291cmNlcy5hZGRNZXNzYWdlVG9SZXNvdXJjZSht c2cucmVzb3VyY2UsIG1zZyk7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgfSBlbHNl CisgICAgICAgICAgICBpZiAobXNnLnVybCBpbiBXZWJJbnNwZWN0b3IucmVzb3VyY2VVUkxNYXAp IHsKKyAgICAgICAgICAgICAgICBtc2cucmVzb3VyY2UgPSBXZWJJbnNwZWN0b3IucmVzb3VyY2VV UkxNYXBbbXNnLnVybF07CisgICAgICAgICAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5wYW5lbHMu cmVzb3VyY2VzKQorICAgICAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnJlc291 cmNlcy5hZGRNZXNzYWdlVG9SZXNvdXJjZShtc2cucmVzb3VyY2UsIG1zZyk7CisgICAgICAgICAg ICB9CisgICAgICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLnJlc291cmNlTWFuYWdlcikKICAgICAg ICAgICAgICAgICBXZWJJbnNwZWN0b3IucmVzb3VyY2VNYW5hZ2VyLmFkZENvbnNvbGVNZXNzYWdl KG1zZyk7CiAKICAgICAgICAgICAgIHRoaXMuY29tbWFuZFNpbmNlUHJldmlvdXNNZXNzYWdlID0g ZmFsc2U7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29va2llSXRl bXNWaWV3LmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Nvb2tpZUl0ZW1zVmlldy5q cwppbmRleCBiZWRlZmMyOGFlMmZhM2NjNTViMzUzMDNjNGUzZGUzYzQzNzFjNWJiLi4wYjA1ZjJh YzE1M2RiMzYzYWZkYThkNTM1ZTMwMGVmY2E2Y2Q4NWM4IDEwMDY0NAotLS0gYS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvQ29va2llSXRlbXNWaWV3LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9Db29raWVJdGVtc1ZpZXcuanMKQEAgLTEyMCwxMyArMTIwLDEyIEBAIFdl Ykluc3BlY3Rvci5Db29raWVJdGVtc1ZpZXcucHJvdG90eXBlID0gewogICAgICAgICB2YXIgcmVz b3VyY2VVUkxzRm9yRG9jdW1lbnRVUkwgPSBbXTsKICAgICAgICAgdGhpcy5fdG90YWxTaXplID0g MDsKIAotICAgICAgICBmdW5jdGlvbiBwb3B1bGF0ZVJlc291cmNlc0ZvckRvY3VtZW50cyhyZXNv dXJjZSkKLSAgICAgICAgeworICAgICAgICBmb3IgKHZhciBpZCBpbiBXZWJJbnNwZWN0b3IucmVz b3VyY2VzKSB7CisgICAgICAgICAgICB2YXIgcmVzb3VyY2UgPSBXZWJJbnNwZWN0b3IucmVzb3Vy Y2VzW2lkXTsKICAgICAgICAgICAgIHZhciB1cmwgPSByZXNvdXJjZS5kb2N1bWVudFVSTC5hc1Bh cnNlZFVSTCgpOwogICAgICAgICAgICAgaWYgKHVybCAmJiB1cmwuaG9zdCA9PSB0aGlzLl9jb29r aWVEb21haW4pCiAgICAgICAgICAgICAgICAgcmVzb3VyY2VVUkxzRm9yRG9jdW1lbnRVUkwucHVz aChyZXNvdXJjZS51cmwpOwogICAgICAgICB9Ci0gICAgICAgIFdlYkluc3BlY3Rvci5mb3JBbGxS ZXNvdXJjZXMocG9wdWxhdGVSZXNvdXJjZXNGb3JEb2N1bWVudHMpOwogCiAgICAgICAgIGZvciAo dmFyIGkgPSAwOyBpIDwgYWxsQ29va2llcy5sZW5ndGg7ICsraSkgewogICAgICAgICAgICAgdmFy IHB1c2hlZCA9IGZhbHNlOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0V4dGVuc2lvblNlcnZlci5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNp b25TZXJ2ZXIuanMKaW5kZXggZWE3M2MzOTM0NWQxNDgwMTc1YjNiZjc4YWE1ZjU2NmIwNjA5ZjRi Ni4uOTM1ZTc5ZjJkOWVmNWE2MzhjMmM5NTA0N2UwZjVkZDM2ZGJhNzFiZSAxMDA2NDQKLS0tIGEv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblNlcnZlci5qcworKysgYi9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uU2VydmVyLmpzCkBAIC0yNDAsNyArMjQw LDcgQEAgV2ViSW5zcGVjdG9yLkV4dGVuc2lvblNlcnZlci5wcm90b3R5cGUgPSB7CiAgICAgICAg IHZhciBpZCA9IG1lc3NhZ2UuaWQ7CiAgICAgICAgIHZhciByZXNvdXJjZSA9IG51bGw7CiAKLSAg ICAgICAgcmVzb3VyY2UgPSBXZWJJbnNwZWN0b3IubmV0d29ya1Jlc291cmNlc1tpZF0gfHwgV2Vi SW5zcGVjdG9yLnJlc291cmNlRm9yVVJMKGlkKTsKKyAgICAgICAgcmVzb3VyY2UgPSBXZWJJbnNw ZWN0b3IucmVzb3VyY2VzW2lkXSB8fCBXZWJJbnNwZWN0b3IucmVzb3VyY2VGb3JVUkwoaWQpOwog ICAgICAgICBpZiAoIXJlc291cmNlKQogICAgICAgICAgICAgcmV0dXJuIHRoaXMuX3N0YXR1cy5F X05PVEZPVU5EKHR5cGVvZiBpZCArICI6ICIgKyBpZCk7CiAgICAgICAgIGlmIChQcmVmZXJlbmNl cy5uZXR3b3JrUGFuZWxFbmFibGVkKSB7CkBAIC0yNjEsMTQgKzI2MSwxNCBAQCBXZWJJbnNwZWN0 b3IuRXh0ZW5zaW9uU2VydmVyLnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIGZ1bmN0aW9u IHJlc291cmNlV3JhcHBlcihpZCkKICAgICAgICAgewotICAgICAgICAgICAgcmV0dXJuIFdlYklu c3BlY3Rvci5leHRlbnNpb25TZXJ2ZXIuX2NvbnZlcnRSZXNvdXJjZShXZWJJbnNwZWN0b3IubmV0 d29ya1Jlc291cmNlc1tpZF0pOworICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5leHRl bnNpb25TZXJ2ZXIuX2NvbnZlcnRSZXNvdXJjZShXZWJJbnNwZWN0b3IucmVzb3VyY2VzW2lkXSk7 CiAgICAgICAgIH0KIAogICAgICAgICB2YXIgcmVzcG9uc2U7CiAgICAgICAgIGlmIChyZXF1ZXN0 LmlkKQotICAgICAgICAgICAgcmVzcG9uc2UgPSBXZWJJbnNwZWN0b3IubmV0d29ya1Jlc291cmNl c1tyZXF1ZXN0LmlkXSA/IHJlc291cmNlV3JhcHBlcihyZXF1ZXN0LmlkKSA6IHRoaXMuX3N0YXR1 cy5FX05PVEZPVU5EKHJlcXVlc3QuaWQpOworICAgICAgICAgICAgcmVzcG9uc2UgPSBXZWJJbnNw ZWN0b3IucmVzb3VyY2VzW3JlcXVlc3QuaWRdID8gcmVzb3VyY2VXcmFwcGVyKHJlcXVlc3QuaWQp IDogdGhpcy5fc3RhdHVzLkVfTk9URk9VTkQocmVxdWVzdC5pZCk7CiAgICAgICAgIGVsc2UKLSAg ICAgICAgICAgIHJlc3BvbnNlID0gT2JqZWN0LmtleXMoV2ViSW5zcGVjdG9yLm5ldHdvcmtSZXNv dXJjZXMpLm1hcChyZXNvdXJjZVdyYXBwZXIpOworICAgICAgICAgICAgcmVzcG9uc2UgPSBPYmpl Y3Qua2V5cyhXZWJJbnNwZWN0b3IucmVzb3VyY2VzKS5tYXAocmVzb3VyY2VXcmFwcGVyKTsKICAg ICAgICAgcmV0dXJuIHJlc3BvbnNlOwogICAgIH0sCiAKQEAgLTI5OCw3ICsyOTgsNyBAQCBXZWJJ bnNwZWN0b3IuRXh0ZW5zaW9uU2VydmVyLnByb3RvdHlwZSA9IHsKIAogICAgICAgICBmb3IgKHZh ciBpID0gMDsgaSA8IGlkcy5sZW5ndGg7ICsraSkgewogICAgICAgICAgICAgdmFyIGlkID0gaWRz W2ldOwotICAgICAgICAgICAgdmFyIHJlc291cmNlID0gV2ViSW5zcGVjdG9yLm5ldHdvcmtSZXNv dXJjZXNbaWRdOworICAgICAgICAgICAgdmFyIHJlc291cmNlID0gV2ViSW5zcGVjdG9yLnJlc291 cmNlc1tpZF07CiAgICAgICAgICAgICBpZiAoIXJlc291cmNlKQogICAgICAgICAgICAgICAgIHJl c3BvbnNlLnB1c2godGhpcy5fc3RhdHVzLkVfTk9URk9VTkQoaWQpKTsKICAgICAgICAgICAgIGVs c2UKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IQVJFbnRyeS5qcyBi L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IQVJFbnRyeS5qcwppbmRleCBmM2JmYjA2MjI0 MTg3NzRlOTgwNjg3YTFlMDcxZWRlZjVhMTM3ZmY0Li4yYjhmNDFiMDU3YWI0NjkwYzhmYTE2ZWNj Y2UzNTg2Y2FiM2JhNWUxIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv SEFSRW50cnkuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hBUkVudHJ5Lmpz CkBAIC0xODAsNyArMTgwLDcgQEAgV2ViSW5zcGVjdG9yLkhBUkVudHJ5LnByb3RvdHlwZSA9IHsK ICAgICAgICAgdmFyIHN0YXJ0VGltZSA9IHRpbWluZ1tzdGFydF07CiAgICAgICAgIHJldHVybiB0 eXBlb2Ygc3RhcnRUaW1lICE9PSAibnVtYmVyIiB8fCBzdGFydFRpbWUgPT09IC0xID8gLTEgOiBN YXRoLnJvdW5kKHRpbWluZ1tlbmRdIC0gc3RhcnRUaW1lKTsKICAgICB9Ci19Cit9OwogCiBXZWJJ bnNwZWN0b3IuSEFSRW50cnkuX3RvTWlsbGlzZWNvbmRzID0gZnVuY3Rpb24odGltZSkKIHsKQEAg LTIwMyw3ICsyMDMsNyBAQCBXZWJJbnNwZWN0b3IuSEFSTG9nLnByb3RvdHlwZSA9IHsKICAgICAg ICAgICAgICAgICB2ZXJzaW9uOiB3ZWJLaXRWZXJzaW9uID8gd2ViS2l0VmVyc2lvblsxXSA6ICJu L2EiCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgcGFnZXM6IHRoaXMuX2J1aWxkUGFnZXMo KSwKLSAgICAgICAgICAgIGVudHJpZXM6IE9iamVjdC5rZXlzKFdlYkluc3BlY3Rvci5uZXR3b3Jr UmVzb3VyY2VzKS5tYXAodGhpcy5fY29udmVydFJlc291cmNlKQorICAgICAgICAgICAgZW50cmll czogT2JqZWN0LmtleXMoV2ViSW5zcGVjdG9yLnJlc291cmNlcykubWFwKHRoaXMuX2NvbnZlcnRS ZXNvdXJjZSkKICAgICAgICAgfQogICAgIH0sCiAKQEAgLTIyMSwxNSArMjIxLDE3IEBAIFdlYklu c3BlY3Rvci5IQVJMb2cucHJvdG90eXBlID0gewogCiAgICAgYnVpbGRNYWluUmVzb3VyY2VUaW1p bmdzOiBmdW5jdGlvbigpCiAgICAgeworICAgICAgICB2YXIgcmVzb3VyY2VzUGFuZWwgPSBXZWJJ bnNwZWN0b3IucGFuZWxzLnJlc291cmNlczsKKyAgICAgICAgdmFyIHN0YXJ0VGltZSA9IFdlYklu c3BlY3Rvci5tYWluUmVzb3VyY2Uuc3RhcnRUaW1lOwogICAgICAgICByZXR1cm4gewotICAgICAg ICAgICAgIG9uQ29udGVudExvYWQ6IHRoaXMuX3BhZ2VFdmVudFRpbWUoV2ViSW5zcGVjdG9yLm1h aW5SZXNvdXJjZURPTUNvbnRlbnRUaW1lKSwKLSAgICAgICAgICAgICBvbkxvYWQ6IHRoaXMuX3Bh Z2VFdmVudFRpbWUoV2ViSW5zcGVjdG9yLm1haW5SZXNvdXJjZUxvYWRUaW1lKSwKKyAgICAgICAg ICAgICBvbkNvbnRlbnRMb2FkOiB0aGlzLl9wYWdlRXZlbnRUaW1lKHJlc291cmNlc1BhbmVsLm1h aW5SZXNvdXJjZURPTUNvbnRlbnRUaW1lKSwKKyAgICAgICAgICAgICBvbkxvYWQ6IHRoaXMuX3Bh Z2VFdmVudFRpbWUocmVzb3VyY2VzUGFuZWwubWFpblJlc291cmNlTG9hZFRpbWUpLAogICAgICAg ICB9CiAgICAgfSwKIAogICAgIF9jb252ZXJ0UmVzb3VyY2U6IGZ1bmN0aW9uKGlkKQogICAgIHsK LSAgICAgICAgcmV0dXJuIChuZXcgV2ViSW5zcGVjdG9yLkhBUkVudHJ5KFdlYkluc3BlY3Rvci5u ZXR3b3JrUmVzb3VyY2VzW2lkXSkpLmJ1aWxkKCk7CisgICAgICAgIHJldHVybiAobmV3IFdlYklu c3BlY3Rvci5IQVJFbnRyeShXZWJJbnNwZWN0b3IucmVzb3VyY2VzW2lkXSkpLmJ1aWxkKCk7CiAg ICAgfSwKIAogICAgIF9wYWdlRXZlbnRUaW1lOiBmdW5jdGlvbih0aW1lKQpAQCAtMjM5LDQgKzI0 MSw0IEBAIFdlYkluc3BlY3Rvci5IQVJMb2cucHJvdG90eXBlID0gewogICAgICAgICAgICAgcmV0 dXJuIC0xOwogICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLkhBUkVudHJ5Ll90b01pbGxpc2Vj b25kcyh0aW1lIC0gc3RhcnRUaW1lKTsKICAgICB9Ci19Cit9OwpkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMKaW5kZXggYmVjNjA1NmE1NTQ5MTEzNDAyOTU5ZjRj ODc1OWMzNzY4ZmE4ZWNmMC4uOTkzMGE0YzIwNDM5MTRhZTdjYWE1NDI0ZjhkZjkxYjM4NTFmYmNk MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5q cworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCkBAIC0z Niw4ICszNiw2IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrUGFuZWwgPSBmdW5jdGlvbigpCiAgICAg dGhpcy5zaWRlYmFyRWxlbWVudC5jbGFzc05hbWUgPSAibmV0d29yay1zaWRlYmFyIjsKIAogICAg IHRoaXMuX3Jlc291cmNlcyA9IFtdOwotICAgIHRoaXMuX3Jlc291cmNlc0J5SWQgPSB7fTsKLSAg ICB0aGlzLl9sYXN0SWRlbnRpZmllciA9IDA7CiAgICAgdGhpcy5fc3RhbGVSZXNvdXJjZXMgPSBb XTsKICAgICB0aGlzLl9yZXNvdXJjZUdyaWROb2RlcyA9IHt9OwogICAgIHRoaXMuX21haW5SZXNv dXJjZUxvYWRUaW1lID0gLTE7CkBAIC03NjAsNyArNzU4LDYgQEAgV2ViSW5zcGVjdG9yLk5ldHdv cmtQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl9jYWxjdWxhdG9yLnJlc2V0 KCk7CiAKICAgICAgICAgdGhpcy5fcmVzb3VyY2VzID0gW107Ci0gICAgICAgIHRoaXMuX3Jlc291 cmNlc0J5SWQgPSB7fTsKICAgICAgICAgdGhpcy5fc3RhbGVSZXNvdXJjZXMgPSBbXTsKICAgICAg ICAgdGhpcy5fcmVzb3VyY2VHcmlkTm9kZXMgPSB7fTsKIApAQCAtNzc2LDE3ICs3NzMsOSBAQCBX ZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fcmVz ZXRTdW1tYXJ5QmFyKCk7CiAgICAgfSwKIAotICAgIGdldCByZXNvdXJjZXMoKQotICAgIHsKLSAg ICAgICAgcmV0dXJuIHRoaXMuX3Jlc291cmNlc0J5SWQ7Ci0gICAgfSwKLQogICAgIGFkZFJlc291 cmNlOiBmdW5jdGlvbihyZXNvdXJjZSkKICAgICB7CiAgICAgICAgIHRoaXMuX3Jlc291cmNlcy5w dXNoKHJlc291cmNlKTsKLSAgICAgICAgaWYgKCFyZXNvdXJjZS5pZGVudGlmaWVyKQotICAgICAg ICAgICAgcmVzb3VyY2UuaWRlbnRpZmllciA9ICJuZXR3b3JrOiIgKyB0aGlzLl9sYXN0SWRlbnRp ZmllcisrOwotICAgICAgICB0aGlzLl9yZXNvdXJjZXNCeUlkW3Jlc291cmNlLmlkZW50aWZpZXJd ID0gcmVzb3VyY2U7CiAgICAgICAgIHRoaXMucmVmcmVzaFJlc291cmNlKHJlc291cmNlKTsKICAg ICB9LAogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2Uu anMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMKaW5kZXggYzEzODVh NzY1OGUzYTkxM2ZjNDM2YzIxN2JjNjZhZGIyODA0NGZmYi4uZjhhY2M2ODQ3Y2FjOGJhYmM1NDkw ODdiYzk2ODlhOTc1MGExZmM3MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1Jlc291cmNlLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJj ZS5qcwpAQCAtMjc3LDcgKzI3NywxNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBl ID0gewogCiAgICAgc2V0IGNhdGVnb3J5KHgpCiAgICAgeworICAgICAgICBpZiAodGhpcy5fY2F0 ZWdvcnkgPT09IHgpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgdmFyIG9sZENhdGVn b3J5ID0gdGhpcy5fY2F0ZWdvcnk7CisgICAgICAgIGlmIChvbGRDYXRlZ29yeSkKKyAgICAgICAg ICAgIG9sZENhdGVnb3J5LnJlbW92ZVJlc291cmNlKHRoaXMpOworCiAgICAgICAgIHRoaXMuX2Nh dGVnb3J5ID0geDsKKworICAgICAgICBpZiAodGhpcy5fY2F0ZWdvcnkpCisgICAgICAgICAgICB0 aGlzLl9jYXRlZ29yeS5hZGRSZXNvdXJjZSh0aGlzKTsKICAgICB9LAogCiAgICAgZ2V0IGNhY2hl ZCgpCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VDYXRl Z29yeS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZUNhdGVnb3J5Lmpz CmluZGV4IDQzYzdjMmJkOGNjYTNjMzA5NDYyMzBmZTk1NGIzNDBiOTVjYTY1ZTkuLjdkOTVhMWYx OThjNTkxNTIyODcyOTA1M2ZiMTcyMWY2ZDJkYzZiYzMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZUNhdGVnb3J5LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9SZXNvdXJjZUNhdGVnb3J5LmpzCkBAIC0zMSwxMSArMzEsNDAgQEAgV2Vi SW5zcGVjdG9yLlJlc291cmNlQ2F0ZWdvcnkgPSBmdW5jdGlvbihuYW1lLCB0aXRsZSwgY29sb3Ip CiAgICAgdGhpcy5uYW1lID0gbmFtZTsKICAgICB0aGlzLnRpdGxlID0gdGl0bGU7CiAgICAgdGhp cy5jb2xvciA9IGNvbG9yOworICAgIHRoaXMucmVzb3VyY2VzID0gW107CiB9CiAKIFdlYkluc3Bl Y3Rvci5SZXNvdXJjZUNhdGVnb3J5LnByb3RvdHlwZSA9IHsKKwogICAgIHRvU3RyaW5nOiBmdW5j dGlvbigpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy50aXRsZTsKKyAgICB9LAorCisgICAg YWRkUmVzb3VyY2U6IGZ1bmN0aW9uKHJlc291cmNlKQorICAgIHsKKyAgICAgICAgdmFyIGEgPSBy ZXNvdXJjZTsKKyAgICAgICAgdmFyIHJlc291cmNlc0xlbmd0aCA9IHRoaXMucmVzb3VyY2VzLmxl bmd0aDsKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCByZXNvdXJjZXNMZW5ndGg7ICsraSkg eworICAgICAgICAgICAgdmFyIGIgPSB0aGlzLnJlc291cmNlc1tpXTsKKyAgICAgICAgICAgIGlm IChhLmxhc3RQYXRoQ29tcG9uZW50TG93ZXJDYXNlICYmIGIubGFzdFBhdGhDb21wb25lbnRMb3dl ckNhc2UpCisgICAgICAgICAgICAgICAgaWYgKGEubGFzdFBhdGhDb21wb25lbnRMb3dlckNhc2Ug PCBiLmxhc3RQYXRoQ29tcG9uZW50TG93ZXJDYXNlKQorICAgICAgICAgICAgICAgICAgICBicmVh azsKKyAgICAgICAgICAgIGVsc2UgaWYgKGEubmFtZSAmJiBiLm5hbWUpCisgICAgICAgICAgICAg ICAgaWYgKGEubmFtZSA8IGIubmFtZSkKKyAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAg ICAgIH0KKworICAgICAgICB0aGlzLnJlc291cmNlcy5zcGxpY2UoaSwgMCwgcmVzb3VyY2UpOwor ICAgIH0sCisKKyAgICByZW1vdmVSZXNvdXJjZTogZnVuY3Rpb24ocmVzb3VyY2UpCisgICAgewor ICAgICAgICB0aGlzLnJlc291cmNlcy5yZW1vdmUocmVzb3VyY2UsIHRydWUpOworICAgIH0sCisK KyAgICByZW1vdmVBbGxSZXNvdXJjZXM6IGZ1bmN0aW9uKHJlc291cmNlKQorICAgIHsKKyAgICAg ICAgdGhpcy5yZXNvdXJjZXMgPSBbXTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VNYW5hZ2VyLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1Jlc291cmNlTWFuYWdlci5qcwppbmRleCAwNTMzZWM1MDNkMjg3OWQ4MTY2M2Rh ZDJiNWI4YTExYWYxM2VhMWFmLi4zM2MyNTVhZmQ0MTllMWQyYjYyYmZlZGUzZTg2ODFhMGViMTRi OTU2IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VNYW5h Z2VyLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZU1hbmFnZXIu anMKQEAgLTY4LDcgKzY4LDYgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlTWFuYWdlci5wcm90b3R5 cGUgPSB7CiAgICAgICAgIH0KIAogICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLm5ldHdvcmsu YWRkUmVzb3VyY2UocmVzb3VyY2UpOwotICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLmF1ZGl0 cy5yZXNvdXJjZVN0YXJ0ZWQocmVzb3VyY2UpOwogICAgIH0sCiAKICAgICBfY3JlYXRlUmVzb3Vy Y2U6IGZ1bmN0aW9uKGlkZW50aWZpZXIsIHVybCwgbG9hZGVyKQpAQCAtMTAwLDEwICs5OSw5IEBA IFdlYkluc3BlY3Rvci5SZXNvdXJjZU1hbmFnZXIucHJvdG90eXBlID0gewogICAgICAgICByZXNv dXJjZS5yZXF1ZXN0Rm9ybURhdGEgPSByZXF1ZXN0LnJlcXVlc3RGb3JtRGF0YTsKICAgICAgICAg cmVzb3VyY2Uuc3RhcnRUaW1lID0gdGltZTsKIAotICAgICAgICBpZiAoaXNSZWRpcmVjdCkgewor ICAgICAgICBpZiAoaXNSZWRpcmVjdCkKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMu bmV0d29yay5hZGRSZXNvdXJjZShyZXNvdXJjZSk7Ci0gICAgICAgICAgICBXZWJJbnNwZWN0b3Iu cGFuZWxzLmF1ZGl0cy5yZXNvdXJjZVN0YXJ0ZWQocmVzb3VyY2UpOwotICAgICAgICB9IGVsc2Ug CisgICAgICAgIGVsc2UKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMubmV0d29yay5y ZWZyZXNoUmVzb3VyY2UocmVzb3VyY2UpOwogICAgIH0sCiAKQEAgLTE4OCw3ICsxODYsNiBAQCBX ZWJJbnNwZWN0b3IuUmVzb3VyY2VNYW5hZ2VyLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmVzb3Vy Y2UuZW5kVGltZSA9IGZpbmlzaFRpbWU7CiAKICAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5u ZXR3b3JrLnJlZnJlc2hSZXNvdXJjZShyZXNvdXJjZSk7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5w YW5lbHMuYXVkaXRzLnJlc291cmNlRmluaXNoZWQocmVzb3VyY2UpOwogICAgICAgICBkZWxldGUg dGhpcy5fcmVzb3VyY2VzQnlJZFtpZGVudGlmaWVyXTsKICAgICB9LAogCkBAIC0yMDIsNyArMTk5 LDYgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlTWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgICAg IHJlc291cmNlLmVuZFRpbWUgPSB0aW1lOwogCiAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMu bmV0d29yay5yZWZyZXNoUmVzb3VyY2UocmVzb3VyY2UpOwotICAgICAgICBXZWJJbnNwZWN0b3Iu cGFuZWxzLmF1ZGl0cy5yZXNvdXJjZUZpbmlzaGVkKHJlc291cmNlKTsKICAgICAgICAgZGVsZXRl IHRoaXMuX3Jlc291cmNlc0J5SWRbaWRlbnRpZmllcl07CiAgICAgfSwKIApAQCAtMjE0LDggKzIx MCw2IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZU1hbmFnZXIucHJvdG90eXBlID0gewogICAgICAg ICByZXNvdXJjZS5zdGFydFRpbWUgPSByZXNvdXJjZS5yZXNwb25zZVJlY2VpdmVkVGltZSA9IHJl c291cmNlLmVuZFRpbWUgPSB0aW1lOwogCiAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMubmV0 d29yay5hZGRSZXNvdXJjZShyZXNvdXJjZSk7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMu YXVkaXRzLnJlc291cmNlU3RhcnRlZChyZXNvdXJjZSk7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5w YW5lbHMuYXVkaXRzLnJlc291cmNlRmluaXNoZWQocmVzb3VyY2UpOwogICAgICAgICB0aGlzLl9y ZXNvdXJjZVRyZWVNb2RlbC5hZGRSZXNvdXJjZVRvRnJhbWUocmVzb3VyY2UubG9hZGVyLmZyYW1l SWQsIHJlc291cmNlKTsKICAgICB9LAogCkBAIC0yMzUsNyArMjI5LDcgQEAgV2ViSW5zcGVjdG9y LlJlc291cmNlTWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJlc291cmNlLnR5cGUgPSBX ZWJJbnNwZWN0b3IuUmVzb3VyY2UuVHlwZVt0eXBlXTsKICAgICAgICAgcmVzb3VyY2Uub3ZlcnJp ZGVuQ29udGVudCA9IHNvdXJjZVN0cmluZzsKIAotICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxz Lm5ldHdvcmsucmVmcmVzaFJlc291cmNlKHJlc291cmNlKTsKKyAgICAgICAgV2ViSW5zcGVjdG9y LnBhbmVscy5uZXR3b3JrLmFkZFJlc291cmNlKHJlc291cmNlKTsKICAgICB9LAogCiAgICAgZGlk Q29tbWl0TG9hZEZvckZyYW1lOiBmdW5jdGlvbihwYXJlbnRGcmFtZUlkLCBsb2FkZXIpCkBAIC01 NTIsMTggKzU0NiwxMyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwucHJvdG90eXBl ID0gewogICAgIF9jYWxsRm9yRnJhbWVSZXNvdXJjZXM6IGZ1bmN0aW9uKGZyYW1lSWQsIGNhbGxi YWNrKQogICAgIHsKICAgICAgICAgdmFyIHJlc291cmNlcyA9IHRoaXMuX3Jlc291cmNlc0J5RnJh bWVJZFtmcmFtZUlkXTsKLSAgICAgICAgZm9yICh2YXIgaSA9IDA7IHJlc291cmNlcyAmJiBpIDwg cmVzb3VyY2VzLmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICBpZiAoY2FsbGJhY2socmVzb3Vy Y2VzW2ldKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgfQorICAgICAg ICBmb3IgKHZhciBpID0gMDsgcmVzb3VyY2VzICYmIGkgPCByZXNvdXJjZXMubGVuZ3RoOyArK2kp CisgICAgICAgICAgICBjYWxsYmFjayhyZXNvdXJjZXNbaV0pOwogICAgICAgICAKICAgICAgICAg dmFyIGZyYW1lcyA9IHRoaXMuX3N1YmZyYW1lc1tmcmFtZUlkXTsKICAgICAgICAgaWYgKGZyYW1l cykgewotICAgICAgICAgICAgZm9yICh2YXIgaWQgaW4gZnJhbWVzKSB7Ci0gICAgICAgICAgICAg ICAgaWYgKHRoaXMuX2NhbGxGb3JGcmFtZVJlc291cmNlcyhpZCwgY2FsbGJhY2spKQotICAgICAg ICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGZv ciAodmFyIGlkIGluIGZyYW1lcykKKyAgICAgICAgICAgICAgICB0aGlzLl9jYWxsRm9yRnJhbWVS ZXNvdXJjZXMoaWQsIGNhbGxiYWNrKTsKICAgICAgICAgfQotICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291 cmNlc1BhbmVsLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVs LmpzCmluZGV4IDQ4YzQ5ZGRmMjQwNmQxNTIyYzNmOTg0YjQ3ZTk4MzNjMGI2ZTcyMmYuLjI3ZWVm MjUzZTE4NDUwYmVlOTA1YWI4YjNjZWM2MmVmMzQxMTJmNGYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcworKysgYi9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKQEAgLTMwLDcgKzMwLDcgQEAKIFdlYklu c3BlY3Rvci5SZXNvdXJjZXNQYW5lbCA9IGZ1bmN0aW9uKCkKIHsKICAgICBXZWJJbnNwZWN0b3Iu UGFuZWwuY2FsbCh0aGlzLCAicmVzb3VyY2VzIik7Ci0gICAgdGhpcy5yZXNvdXJjZVVSTE1hcCA9 IHt9OworCiAgICAgdGhpcy5faXRlbXMgPSBbXTsKICAgICB0aGlzLl9zdGFsZUl0ZW1zID0gW107 CiAKQEAgLTc1MiwxMiArNzUyLDEwIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90 b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLnNvcnRpbmdTZWxlY3RFbGVtZW50LmFkZFN0eWxl Q2xhc3MoImhpZGRlbiIpOwogICAgICAgICAgICAgdGhpcy5wYW5lbEVuYWJsZXJWaWV3LnZpc2li bGUgPSB0cnVlOwogICAgICAgICB9Ci0gICAgICAgIHRoaXMucmVzb3VyY2VVUkxNYXAgPSB7fTsK ICAgICB9LAogCiAgICAgYWRkUmVzb3VyY2U6IGZ1bmN0aW9uKHJlc291cmNlKQogICAgIHsKLSAg ICAgICAgdGhpcy5yZXNvdXJjZVVSTE1hcFtyZXNvdXJjZS51cmxdID0gcmVzb3VyY2U7CiAgICAg ICAgIHRoaXMuX3Jlc291cmNlcy5wdXNoKHJlc291cmNlKTsKICAgICB9LAogCkBAIC03NzIsNyAr NzcwLDYgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAg ICAgcmVzb3VyY2UuZXJyb3JzID0gMDsKIAogICAgICAgICBkZWxldGUgcmVzb3VyY2UuX3Jlc291 cmNlc1ZpZXc7Ci0gICAgICAgIGRlbGV0ZSB0aGlzLnJlc291cmNlVVJMTWFwW3Jlc291cmNlLnVy bF07CiAgICAgfSwKIAogICAgIGFkZE1lc3NhZ2VUb1Jlc291cmNlOiBmdW5jdGlvbihyZXNvdXJj ZSwgbXNnKQpAQCAtMTA4NSw3ICsxMDgyLDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVs LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMubGFyZ2VyUmVzb3VyY2VzQnV0dG9uLnZp c2libGUgPSBmYWxzZTsKICAgICAgICAgICAgIHRoaXMuc29ydGluZ1NlbGVjdEVsZW1lbnQudmlz aWJsZSA9IGZhbHNlOwogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnJlc291cmNlcyA9IHt9Owot ICAgICAgICAgICAgdGhpcy5yZXNvdXJjZVVSTE1hcCA9IHt9OworICAgICAgICAgICAgV2ViSW5z cGVjdG9yLnJlc291cmNlVVJMTWFwID0ge307CiAgICAgICAgICAgICBJbnNwZWN0b3JCYWNrZW5k LnNldFJlc291cmNlVHJhY2tpbmdFbmFibGVkKGZhbHNlLCB0cnVlLCBjYWxsYmFjayk7CiAgICAg ICAgIH0gZWxzZSB7CiAgICAgICAgICAgICB0aGlzLmxhcmdlclJlc291cmNlc0J1dHRvbi52aXNp YmxlID0gdHJ1ZTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3Jp cHRzUGFuZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpz CmluZGV4IDc1NTliYTY1NmMyYzEwODk5ODkzZDVjOGNlMTQ2M2RkMWFlOTJkMGQuLmQ2Zjg2YjZi MjI5OTUzMzg3NzllYjEzNmE5ZDg4OTBiYTI1Y2VjZmIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwpAQCAtMjQxLDEyICsyNDEsOSBAQCBXZWJJbnNwZWN0 b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIHNjcmlwdCA9IG5ldyBX ZWJJbnNwZWN0b3IuU2NyaXB0KHNvdXJjZUlELCBzb3VyY2VVUkwsIHNvdXJjZSwgc3RhcnRpbmdM aW5lLCBlcnJvckxpbmUsIGVycm9yTWVzc2FnZSwgc2NyaXB0V29ybGRUeXBlKTsKICAgICAgICAg dGhpcy5fc291cmNlSURNYXBbc291cmNlSURdID0gc2NyaXB0OwogCi0gICAgICAgIFdlYkluc3Bl Y3Rvci5sb2coImFkZFNjcmlwdDoiICsgc291cmNlVVJMKTsKLSAgICAgICAgdmFyIHJlc291cmNl ID0gV2ViSW5zcGVjdG9yLnJlc291cmNlRm9yVVJMKHNvdXJjZVVSTCk7CisgICAgICAgIHZhciBy ZXNvdXJjZSA9IFdlYkluc3BlY3Rvci5yZXNvdXJjZVVSTE1hcFtzb3VyY2VVUkxdOwogICAgICAg ICBpZiAocmVzb3VyY2UpIHsKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5sb2coInJlc291cmNl OiIgKyByZXNvdXJjZS51cmwpOwogICAgICAgICAgICAgaWYgKHJlc291cmNlLmZpbmlzaGVkKSB7 Ci0gICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmxvZygicmVzb3VyY2UgZmluaXNoZWQ6IiAr IHJlc291cmNlLnVybCk7CiAgICAgICAgICAgICAgICAgLy8gUmVzb3VyY2UgaXMgZmluaXNoZWQs IGJpbmQgdGhlIHNjcmlwdCByaWdodCBhd2F5LgogICAgICAgICAgICAgICAgIHJlc291cmNlLmFk ZFNjcmlwdChzY3JpcHQpOwogICAgICAgICAgICAgICAgIHRoaXMuX3NvdXJjZUlETWFwW3NvdXJj ZUlEXSA9IHJlc291cmNlOwpAQCAtMjcyLDcgKzI2OSw2IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRz UGFuZWwucHJvdG90eXBlID0gewogICAgIF9yZXNvdXJjZUxvYWRpbmdGaW5pc2hlZDogZnVuY3Rp b24oZSkKICAgICB7CiAgICAgICAgIHZhciByZXNvdXJjZSA9IGUudGFyZ2V0OwotICAgICAgICBX ZWJJbnNwZWN0b3IubG9nKCJfcmVzb3VyY2VMb2FkaW5nRmluaXNoZWQ6IiArIHJlc291cmNlLnVy bCk7CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcmVzb3VyY2UuX3NjcmlwdHNQZW5kaW5n UmVzb3VyY2VMb2FkLmxlbmd0aDsgKytpKSB7CiAgICAgICAgICAgICAvLyBCaW5kIHNjcmlwdCB0 byByZXNvdXJjZS4KICAgICAgICAgICAgIHZhciBzY3JpcHQgPSByZXNvdXJjZS5fc2NyaXB0c1Bl bmRpbmdSZXNvdXJjZUxvYWRbaV07CkBAIC0yOTMsNyArMjg5LDcgQEAgV2ViSW5zcGVjdG9yLlNj cmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgdmFyIHNvdXJjZUZyYW1lOwogICAg ICAgICBpZiAoYnJlYWtwb2ludC51cmwpIHsKLSAgICAgICAgICAgIHZhciByZXNvdXJjZSA9IFdl Ykluc3BlY3Rvci5yZXNvdXJjZUZvclVSTChicmVha3BvaW50LnVybCk7CisgICAgICAgICAgICB2 YXIgcmVzb3VyY2UgPSBXZWJJbnNwZWN0b3IucmVzb3VyY2VVUkxNYXBbYnJlYWtwb2ludC51cmxd OwogICAgICAgICAgICAgaWYgKHJlc291cmNlICYmIHJlc291cmNlLmZpbmlzaGVkKQogICAgICAg ICAgICAgICAgIHNvdXJjZUZyYW1lID0gdGhpcy5fc291cmNlRnJhbWVGb3JTY3JpcHRPclJlc291 cmNlKHJlc291cmNlKTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzCmluZGV4IDEzOGZiZmMxMDk3NDZiNTEyZTA0YzlmM2Nm ZGUxYzgzYmNiMTMxZTkuLjM2ZDg1NGM2NWI5YzZiZjEyNzQyODBhZDQ1OGM4NzkxMWIwN2MxY2Ig MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFu ZS5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUu anMKQEAgLTExODYsOCArMTE4Niw3IEBAIFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnR5VHJlZUVs ZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgIHZhciBj b250YWluZXIgPSBkb2N1bWVudC5jcmVhdGVEb2N1bWVudEZyYWdtZW50KCk7CiAgICAgICAgICAg ICAgICAgY29udGFpbmVyLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKCJ1cmwo IikpOwotICAgICAgICAgICAgICAgIHZhciBoYXNSZXNvdXJjZSA9ICEhV2ViSW5zcGVjdG9yLnJl c291cmNlRm9yVVJMKHVybCk7Ci0gICAgICAgICAgICAgICAgY29udGFpbmVyLmFwcGVuZENoaWxk KFdlYkluc3BlY3Rvci5saW5raWZ5VVJMQXNOb2RlKHVybCwgdXJsLCBudWxsLCBoYXNSZXNvdXJj ZSkpOworICAgICAgICAgICAgICAgIGNvbnRhaW5lci5hcHBlbmRDaGlsZChXZWJJbnNwZWN0b3Iu bGlua2lmeVVSTEFzTm9kZSh1cmwsIHVybCwgbnVsbCwgKHVybCBpbiBXZWJJbnNwZWN0b3IucmVz b3VyY2VVUkxNYXApKSk7CiAgICAgICAgICAgICAgICAgY29udGFpbmVyLmFwcGVuZENoaWxkKGRv Y3VtZW50LmNyZWF0ZVRleHROb2RlKCIpIikpOwogICAgICAgICAgICAgICAgIHJldHVybiBjb250 YWluZXI7CiAgICAgICAgICAgICB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvaW5zcGVjdG9yLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rv ci5qcwppbmRleCBjYzk1MGNmOGUwOGRlOGFjN2UyZTJiMzY4MjNmODU5MzRiMzQ3OTU2Li44OTM2 NzQxNGU0NTU3ODYyOGFhNzhkYWY1ZmRmNDRkNmUxMDMxMDY2IDEwMDY0NAotLS0gYS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9pbnNwZWN0b3IuanMKQEAgLTUwLDYgKzUwLDcgQEAKIAogdmFyIFdlYkluc3Bl Y3RvciA9IHsKICAgICByZXNvdXJjZXM6IHt9LAorICAgIHJlc291cmNlVVJMTWFwOiB7fSwKICAg ICBjb29raWVEb21haW5zOiB7fSwKICAgICBhcHBsaWNhdGlvbkNhY2hlRG9tYWluczoge30sCiAg ICAgbWlzc2luZ0xvY2FsaXplZFN0cmluZ3M6IHt9LApAQCAtNDUxLDMzICs0NTIsNiBAQCB2YXIg V2ViSW5zcGVjdG9yID0gewogICAgIHsKICAgICAgICAgdGhpcy5jdXJyZW50UGFuZWwgPSB0aGlz LnBhbmVscy5lbGVtZW50czsKICAgICAgICAgdGhpcy5wYW5lbHMuZWxlbWVudHMudXBkYXRlRm9j dXNlZE5vZGUobm9kZUlkKTsKLSAgICB9LAotCi0gICAgZ2V0IG5ldHdvcmtSZXNvdXJjZXMoKQot ICAgIHsKLSAgICAgICAgaWYgKFByZWZlcmVuY2VzLm5ldHdvcmtQYW5lbEVuYWJsZWQpCi0gICAg ICAgICAgICByZXR1cm4gdGhpcy5wYW5lbHMubmV0d29yay5yZXNvdXJjZXM7Ci0gICAgICAgIGVs c2UKLSAgICAgICAgICAgIHJldHVybiB0aGlzLnJlc291cmNlczsKLSAgICB9LAotCi0gICAgZm9y QWxsUmVzb3VyY2VzOiBmdW5jdGlvbihjYWxsYmFjaykKLSAgICB7Ci0gICAgICAgIGlmIChQcmVm ZXJlbmNlcy5uZXR3b3JrUGFuZWxFbmFibGVkKQotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnJl c291cmNlTWFuYWdlci5mb3JBbGxSZXNvdXJjZXMoY2FsbGJhY2spOwotICAgICAgICBlbHNlIHsK LSAgICAgICAgICAgIGZvciAodmFyIGlkIGluIFdlYkluc3BlY3Rvci5wYW5lbHMucmVzb3VyY2Vz LnJlc291cmNlcykgewotICAgICAgICAgICAgICAgIGlmIChjYWxsYmFjayhXZWJJbnNwZWN0b3Iu cGFuZWxzLnJlc291cmNlcy5yZXNvdXJjZXNbaWRdKSkKLSAgICAgICAgICAgICAgICAgICAgcmV0 dXJuOwotICAgICAgICAgICAgfQotICAgICAgICB9Ci0gICAgfSwKLQotICAgIHJlc291cmNlRm9y VVJMOiBmdW5jdGlvbih1cmwpCi0gICAgewotICAgICAgICBpZiAoUHJlZmVyZW5jZXMubmV0d29y a1BhbmVsRW5hYmxlZCkKLSAgICAgICAgICAgIHJldHVybiB0aGlzLnJlc291cmNlTWFuYWdlci5y ZXNvdXJjZUZvclVSTCh1cmwpOwotICAgICAgICByZXR1cm4gdGhpcy5wYW5lbHMucmVzb3VyY2Vz LnJlc291cmNlVVJMTWFwW3VybF07CiAgICAgfQogfQogCkBAIC0xMjcxLDYgKzEyNDUsNyBAQCBX ZWJJbnNwZWN0b3IudXBkYXRlUmVzb3VyY2UgPSBmdW5jdGlvbihwYXlsb2FkKQogICAgIGlmICgh cmVzb3VyY2UpIHsKICAgICAgICAgcmVzb3VyY2UgPSBuZXcgV2ViSW5zcGVjdG9yLlJlc291cmNl KGlkZW50aWZpZXIsIHBheWxvYWQudXJsKTsKICAgICAgICAgdGhpcy5yZXNvdXJjZXNbaWRlbnRp Zmllcl0gPSByZXNvdXJjZTsKKyAgICAgICAgdGhpcy5yZXNvdXJjZVVSTE1hcFtyZXNvdXJjZS51 cmxdID0gcmVzb3VyY2U7CiAgICAgICAgIHRoaXMucGFuZWxzLnJlc291cmNlcy5hZGRSZXNvdXJj ZShyZXNvdXJjZSk7CiAgICAgICAgIHRoaXMucGFuZWxzLmF1ZGl0cy5yZXNvdXJjZVN0YXJ0ZWQo cmVzb3VyY2UpOwogICAgIH0KQEAgLTEzNDIsNyArMTMxNyw2IEBAIFdlYkluc3BlY3Rvci5kb21D b250ZW50RXZlbnRGaXJlZCA9IGZ1bmN0aW9uKHRpbWUpCiAgICAgdGhpcy5wYW5lbHMuYXVkaXRz Lm1haW5SZXNvdXJjZURPTUNvbnRlbnRUaW1lID0gdGltZTsKICAgICBpZiAodGhpcy5wYW5lbHMu bmV0d29yaykKICAgICAgICAgdGhpcy5wYW5lbHMubmV0d29yay5tYWluUmVzb3VyY2VET01Db250 ZW50VGltZSA9IHRpbWU7Ci0gICAgdGhpcy5tYWluUmVzb3VyY2VET01Db250ZW50VGltZSA9IHRp bWU7CiB9CiAKIFdlYkluc3BlY3Rvci5sb2FkRXZlbnRGaXJlZCA9IGZ1bmN0aW9uKHRpbWUpCkBA IC0xMzUyLDcgKzEzMjYsNiBAQCBXZWJJbnNwZWN0b3IubG9hZEV2ZW50RmlyZWQgPSBmdW5jdGlv bih0aW1lKQogICAgIHRoaXMucGFuZWxzLmF1ZGl0cy5tYWluUmVzb3VyY2VMb2FkVGltZSA9IHRp bWU7CiAgICAgaWYgKHRoaXMucGFuZWxzLm5ldHdvcmspCiAgICAgICAgIHRoaXMucGFuZWxzLm5l dHdvcmsubWFpblJlc291cmNlTG9hZFRpbWUgPSB0aW1lOwotICAgIHRoaXMubWFpblJlc291cmNl TG9hZFRpbWUgPSB0aW1lOwogfQogCiBXZWJJbnNwZWN0b3IucmVtb3ZlUmVzb3VyY2UgPSBmdW5j dGlvbihpZGVudGlmaWVyKQpAQCAtMTM2NCw2ICsxMzM3LDggQEAgV2ViSW5zcGVjdG9yLnJlbW92 ZVJlc291cmNlID0gZnVuY3Rpb24oaWRlbnRpZmllcikKICAgICBpZiAoIXJlc291cmNlKQogICAg ICAgICByZXR1cm47CiAKKyAgICByZXNvdXJjZS5jYXRlZ29yeS5yZW1vdmVSZXNvdXJjZShyZXNv dXJjZSk7CisgICAgZGVsZXRlIHRoaXMucmVzb3VyY2VVUkxNYXBbcmVzb3VyY2UudXJsXTsKICAg ICBkZWxldGUgdGhpcy5yZXNvdXJjZXNbaWRlbnRpZmllcl07CiAKICAgICBpZiAodGhpcy5wYW5l bHMucmVzb3VyY2VzKQpAQCAtMTUwNywxMyArMTQ4MiwxNiBAQCBXZWJJbnNwZWN0b3IucmVzZXQg PSBmdW5jdGlvbigpCiAKICAgICB0aGlzLnNlc3Npb25TZXR0aW5ncy5yZXNldCgpOwogCisgICAg Zm9yICh2YXIgY2F0ZWdvcnkgaW4gdGhpcy5yZXNvdXJjZUNhdGVnb3JpZXMpCisgICAgICAgIHRo aXMucmVzb3VyY2VDYXRlZ29yaWVzW2NhdGVnb3J5XS5yZW1vdmVBbGxSZXNvdXJjZXMoKTsKKwog ICAgIHRoaXMucmVzb3VyY2VzID0ge307CisgICAgdGhpcy5yZXNvdXJjZVVSTE1hcCA9IHt9Owog ICAgIHRoaXMuY29va2llRG9tYWlucyA9IHt9OwogICAgIHRoaXMuYXBwbGljYXRpb25DYWNoZURv bWFpbnMgPSB7fTsKICAgICB0aGlzLmhpZ2hsaWdodERPTU5vZGUoMCk7CiAKLSAgICBpZiAoIVBy ZWZlcmVuY2VzLm5ldHdvcmtQYW5lbEVuYWJsZWQpCi0gICAgICAgIGRlbGV0ZSB0aGlzLm1haW5S ZXNvdXJjZTsKKyAgICBkZWxldGUgdGhpcy5tYWluUmVzb3VyY2U7CiAKICAgICB0aGlzLmNvbnNv bGUuY2xlYXJNZXNzYWdlcygpOwogICAgIHRoaXMuZXh0ZW5zaW9uU2VydmVyLm5vdGlmeUluc3Bl Y3RvclJlc2V0KCk7CkBAIC0xNzIzLDcgKzE3MDEsMTMgQEAgV2ViSW5zcGVjdG9yLmRpc3BsYXlO YW1lRm9yVVJMID0gZnVuY3Rpb24odXJsKQogICAgIGlmICghdXJsKQogICAgICAgICByZXR1cm4g IiI7CiAKLSAgICB2YXIgcmVzb3VyY2UgPSB0aGlzLnJlc291cmNlRm9yVVJMKHVybCk7CisgICAg aWYgKFdlYkluc3BlY3Rvci5yZXNvdXJjZU1hbmFnZXIpIHsKKyAgICAgICAgdmFyIHJlc291cmNl ID0gV2ViSW5zcGVjdG9yLnJlc291cmNlTWFuYWdlci5yZXNvdXJjZUZvclVSTCh1cmwpOworICAg ICAgICBpZiAocmVzb3VyY2UpCisgICAgICAgICAgICByZXR1cm4gcmVzb3VyY2UuZGlzcGxheU5h bWU7CisgICAgfQorCisgICAgdmFyIHJlc291cmNlID0gdGhpcy5yZXNvdXJjZVVSTE1hcFt1cmxd OwogICAgIGlmIChyZXNvdXJjZSkKICAgICAgICAgcmV0dXJuIHJlc291cmNlLmRpc3BsYXlOYW1l OwogCkBAIC0xNzQxLDYgKzE3MjUsMjEgQEAgV2ViSW5zcGVjdG9yLmRpc3BsYXlOYW1lRm9yVVJM ID0gZnVuY3Rpb24odXJsKQogICAgIHJldHVybiB1cmwudHJpbVVSTChXZWJJbnNwZWN0b3IubWFp blJlc291cmNlLmRvbWFpbik7CiB9CiAKK1dlYkluc3BlY3Rvci5yZXNvdXJjZUZvclVSTCA9IGZ1 bmN0aW9uKHVybCkKK3sKKyAgICBpZiAodXJsIGluIHRoaXMucmVzb3VyY2VVUkxNYXApCisgICAg ICAgIHJldHVybiB0aGlzLnJlc291cmNlVVJMTWFwW3VybF07CisKKyAgICAvLyBObyBkaXJlY3Qg bWF0Y2ggZm91bmQuIFNlYXJjaCBmb3IgcmVzb3VyY2VzIHRoYXQgY29udGFpbgorICAgIC8vIGEg c3Vic3RyaW5nIG9mIHRoZSBVUkwuCisgICAgZm9yICh2YXIgcmVzb3VyY2VVUkwgaW4gdGhpcy5y ZXNvdXJjZVVSTE1hcCkgeworICAgICAgICBpZiAocmVzb3VyY2VVUkwuaGFzU3Vic3RyaW5nKHVy bCkpCisgICAgICAgICAgICByZXR1cm4gdGhpcy5yZXNvdXJjZVVSTE1hcFtyZXNvdXJjZVVSTF07 CisgICAgfQorCisgICAgcmV0dXJuIG51bGw7Cit9CisKIFdlYkluc3BlY3Rvci5fY2hvb3NlUGFu ZWxUb1Nob3dTb3VyY2VMaW5lID0gZnVuY3Rpb24odXJsLCBsaW5lLCBwcmVmZXJyZWRQYW5lbCkK IHsKICAgICBwcmVmZXJyZWRQYW5lbCA9IHByZWZlcnJlZFBhbmVsIHx8ICJyZXNvdXJjZXMiOwpA QCAtMTc4OSw4ICsxNzg4LDcgQEAgV2ViSW5zcGVjdG9yLmxpbmtpZnlTdHJpbmdBc0ZyYWdtZW50 ID0gZnVuY3Rpb24oc3RyaW5nKQogICAgICAgICAgICAgdGl0bGUgPSBXZWJJbnNwZWN0b3IucGFu ZWxzLnByb2ZpbGVzLmRpc3BsYXlUaXRsZUZvclByb2ZpbGVMaW5rKHByb2ZpbGVTdHJpbmdNYXRj aGVzWzJdLCBwcm9maWxlU3RyaW5nTWF0Y2hlc1sxXSk7CiAKICAgICAgICAgdmFyIHJlYWxVUkwg PSAobGlua1N0cmluZy5pbmRleE9mKCJ3d3cuIikgPT09IDAgPyAiaHR0cDovLyIgKyBsaW5rU3Ry aW5nIDogbGlua1N0cmluZyk7Ci0gICAgICAgIHZhciBoYXNSZXNvdXJjZVdpdGhVUkwgPSAhIVdl Ykluc3BlY3Rvci5yZXNvdXJjZUZvclVSTChyZWFsVVJMKTsKLSAgICAgICAgY29udGFpbmVyLmFw cGVuZENoaWxkKFdlYkluc3BlY3Rvci5saW5raWZ5VVJMQXNOb2RlKHJlYWxVUkwsIHRpdGxlLCBu dWxsLCBoYXNSZXNvdXJjZVdpdGhVUkwpKTsKKyAgICAgICAgY29udGFpbmVyLmFwcGVuZENoaWxk KFdlYkluc3BlY3Rvci5saW5raWZ5VVJMQXNOb2RlKHJlYWxVUkwsIHRpdGxlLCBudWxsLCAocmVh bFVSTCBpbiBXZWJJbnNwZWN0b3IucmVzb3VyY2VVUkxNYXApKSk7CiAgICAgICAgIHN0cmluZyA9 IHN0cmluZy5zdWJzdHJpbmcobGlua0luZGV4ICsgbGlua1N0cmluZy5sZW5ndGgsIHN0cmluZy5s ZW5ndGgpOwogICAgIH0KIApAQCAtMTg1OCwxNyArMTg1NiwxMyBAQCBXZWJJbnNwZWN0b3IucmVz b3VyY2VVUkxGb3JSZWxhdGVkTm9kZSA9IGZ1bmN0aW9uKG5vZGUsIHVybCkKICAgICB9CiAKICAg ICAvLyBkb2N1bWVudFVSTCBub3QgZm91bmQgb3IgaGFzIGJhZCB2YWx1ZQotICAgIHZhciByZXNv dXJjZVVSTCA9IHVybDsKLSAgICBmdW5jdGlvbiBjYWxsYmFjayhyZXNvdXJjZSkKLSAgICB7Ci0g ICAgICAgIGlmIChyZXNvdXJjZS5wYXRoID09PSB1cmwpIHsKLSAgICAgICAgICAgIHJlc291cmNl VVJMID0gcmVzb3VyY2UudXJsOwotICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgIH0K KyAgICBmb3IgKHZhciByZXNvdXJjZVVSTCBpbiBXZWJJbnNwZWN0b3IucmVzb3VyY2VVUkxNYXAp IHsKKyAgICAgICAgdmFyIHBhcnNlZFVSTCA9IHJlc291cmNlVVJMLmFzUGFyc2VkVVJMKCk7Cisg ICAgICAgIGlmIChwYXJzZWRVUkwgJiYgcGFyc2VkVVJMLnBhdGggPT09IHVybCkKKyAgICAgICAg ICAgIHJldHVybiByZXNvdXJjZVVSTDsKICAgICB9Ci0gICAgV2ViSW5zcGVjdG9yLmZvckFsbFJl c291cmNlcyhjYWxsYmFjayk7Ci0gICAgcmV0dXJuIHJlc291cmNlVVJMOwotfQorICAgIHJldHVy biB1cmw7Cit9LAogCiBXZWJJbnNwZWN0b3IuY29tcGxldGVVUkwgPSBmdW5jdGlvbihiYXNlVVJM LCBocmVmKQogewo=