69268 2011-10-03 10:51:32 -0700 REGRESSION(r96500): Breaks inspector, change landed with no test. (Requested by pfeldman on #webkit). 2011-10-03 10:59:08 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 69146 1 webkit.review.bot webkit.review.bot abarth loislo yurys oldest_to_newest 477073 0 webkit.review.bot 2011-10-03 10:51:32 -0700 http://trac.webkit.org/changeset/96500 broke the build: Breaks inspector, change landed with no test. (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 477074 1 109495 webkit.review.bot 2011-10-03 10:52:06 -0700 Created attachment 109495 ROLLOUT of r96500 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 where ATTACHMENT_ID is the ID of this attachment. 477080 2 109495 abarth 2011-10-03 10:59:03 -0700 Comment on attachment 109495 ROLLOUT of r96500 Clearing flags on attachment: 109495 Committed r96519: <http://trac.webkit.org/changeset/96519> 477081 3 abarth 2011-10-03 10:59:08 -0700 All reviewed patches have been landed. Closing bug. 109495 2011-10-03 10:52:06 -0700 2011-10-03 10:59:03 -0700 ROLLOUT of r96500 bug-69268-20111003175005.patch text/plain 31291 webkit.review.bot U3VidmVyc2lvbiBSZXZpc2lvbjogOTY1MTgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxYzE3OTBmZjVmMzg5NzM1 ZDZlNzMxZDg4MGRmMGMyOGM0MDg4ZjYyLi5jZGEyM2JkZTI5MWY5YTQ3YzY5NGIxNzlkZjFlMTMz NzFjMGYxNWY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTAgQEAKKzIwMTEtMTAtMDMgIFNoZXJp ZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgorCisgICAgICAgIFVucmV2aWV3 ZWQsIHJvbGxpbmcgb3V0IHI5NjUwMC4KKyAgICAgICAgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9j aGFuZ2VzZXQvOTY1MDAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTY5MjY4CisKKyAgICAgICAgQnJlYWtzIGluc3BlY3RvciwgY2hhbmdlIGxhbmRlZCB3 aXRoIG5vIHRlc3QuIChSZXF1ZXN0ZWQgYnkKKyAgICAgICAgcGZlbGRtYW4gb24gI3dlYmtpdCku CisKKyAgICAgICAgKiBXZWJDb3JlLmd5cGk6CisgICAgICAgICogV2ViQ29yZS52Y3Byb2ovV2Vi Q29yZS52Y3Byb2o6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlTWVzc2Fn ZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZUltcGwucHJvdG90eXBl Ll9saW5raWZ5TG9jYXRpb24pOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ29uc29s ZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlLl9j b25zb2xlQ2xlYXJlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclBy ZXNlbnRhdGlvbk1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2Vu dGF0aW9uTW9kZWwucHJvdG90eXBlLmxpbmtpZnlMb2NhdGlvbi51cGRhdGVBbmNob3IpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLmxp bmtpZnlMb2NhdGlvbik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9FdmVudExpc3Rl bmVyc1NpZGViYXJQYW5lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkV2ZW50TGlzdGVuZXJz U2lkZWJhclBhbmUucHJvdG90eXBlLnVwZGF0ZS5jYWxsYmFjayk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuRXZlbnRMaXN0ZW5lcnNTaWRlYmFyUGFuZS5wcm90b3R5cGUudXBkYXRlKToKKyAgICAg ICAgKCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9MaW5raWZpZXIuanM6IFJlbW92 ZWQuCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0xvZ1ZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9y Lk5ldHdvcmtMb2dWaWV3LnByb3RvdHlwZS5fcmVzZXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9y Lk5ldHdvcmtEYXRhR3JpZE5vZGUucHJvdG90eXBlLl9yZWZyZXNoSW5pdGlhdG9yQ2VsbCk6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlRGF0YUdyaWRUcmVlLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVEYXRhR3JpZE5vZGUucHJvdG90eXBlLmNyZWF0ZUNl bGwpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZVZpZXcuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuQ1BVUHJvZmlsZVZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkNQVVByb2ZpbGVWaWV3LnByb3RvdHlwZS5fcmVzZXRDbGlja2VkKToKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu VGltZWxpbmVQYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90 b3R5cGUuX2NsZWFyUGFuZWwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwu Rm9ybWF0dGVkUmVjb3JkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLkZv cm1hdHRlZFJlY29yZC5wcm90b3R5cGUuX2dlbmVyYXRlUG9wdXBDb250ZW50KToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLkZvcm1hdHRlZFJlY29yZC5wcm90b3R5cGUuX2dl dFJlY29yZERldGFpbHMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwuRm9y bWF0dGVkUmVjb3JkLnByb3RvdHlwZS5fbGlua2lmeUxvY2F0aW9uKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5UaW1lbGluZVBhbmVsLkZvcm1hdHRlZFJlY29yZC5wcm90b3R5cGUuX2xpbmtpZnlD YWxsRnJhbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwuUG9wdXBDb250 ZW50SGVscGVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLlBvcHVwQ29u dGVudEhlbHBlci5wcm90b3R5cGUuX2FwcGVuZExpbmtSb3cpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlRpbWVsaW5lUGFuZWwuUG9wdXBDb250ZW50SGVscGVyLnByb3RvdHlwZS5fYXBwZW5kU3Rh Y2tUcmFjZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9XZWJLaXQucXJjOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWw6CisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanM6CisKIDIwMTEtMDktMzAgIEFudHRpIEtvaXZp c3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBleGFjdCBtYXRjaCBhdHRyaWJ1 dGUgc2VsZWN0b3JzIHRvIHRoZSBmYXN0IHBhdGgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L1dlYkNvcmUuZ3lwaSBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaQppbmRleCA2ZmIyYmUw OTlmYjIxMzAxMmI1ZDE2Zjg5N2I3OTllYzQzYTA5NjNjLi5mYTNmOTEyM2RjNzllMTM0NjNmY2Vm MDU3NmUwZTA4NGQxYjkzMTYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5 cGkKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXBpCkBAIC02MjM0LDcgKzYyMzQsNiBA QAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvRGF0YUdyaWQuanMnLAogICAgICAg ICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qcycsCiAgICAgICAgICAg ICAnaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzJywKLSAg ICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL0xpbmtpZmllci5qcycsCiAgICAgICAgICAg ICAnaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90R3JpZE5vZGVzLmpzJywKICAg ICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RWaWV3LmpzJywK ICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzJywKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qIGIvU291cmNl L1dlYkNvcmUvV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2oKaW5kZXggMmNkODIyMDllMTYy ZWVlZGUyNTUxMzk4YTBiNTI2NGY3MDUxOTBjMS4uZmU5ZmJmNWVkMjAyZGZhYWEyY2E4ODA5ZGEx NGMzZTRkMmRkYzExZCAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3Byb2ov V2ViQ29yZS52Y3Byb2oKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3Byb2ovV2ViQ29y ZS52Y3Byb2oKQEAgLTY5MzQ5LDEwICs2OTM0OSw2IEBACiAJCQkJCT4KIAkJCQk8L0ZpbGU+CiAJ CQkJPEZpbGUKLQkJCQkJUmVsYXRpdmVQYXRoPSIuLlxpbnNwZWN0b3JcZnJvbnQtZW5kXExpbmtp Zmllci5qcyIKLQkJCQkJPgotCQkJCTwvRmlsZT4KLQkJCQk8RmlsZQogCQkJCQlSZWxhdGl2ZVBh dGg9Ii4uXGluc3BlY3Rvclxmcm9udC1lbmRcTWV0cmljc1NpZGViYXJQYW5lLmpzIgogCQkJCQk+ CiAJCQkJPC9GaWxlPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Db25zb2xlTWVzc2FnZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvQ29uc29sZU1lc3NhZ2UuanMKaW5kZXggNDU2YmRkMDkzOTUwMDM1NjJlNWVhNmZiMGUzYzgy N2IzOTFiMzZkMC4uM2U3MDgzZjUyOGViNTFmNjFjMzBkODExNmEzZGZmNjRjYmYxNjJjZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlTWVzc2Fn ZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVNZXNz YWdlLmpzCkBAIC0xOTQsNyArMTk0LDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlSW1w bC5wcm90b3R5cGUgPSB7CiAgICAgICAgIC8vIEZJWE1FKDYyNzI1KTogc3RhY2sgdHJhY2UgbGlu ZS9jb2x1bW4gbnVtYmVycyBhcmUgb25lLWJhc2VkLgogICAgICAgICBsaW5lTnVtYmVyID0gbGlu ZU51bWJlciA/IGxpbmVOdW1iZXIgLSAxIDogdW5kZWZpbmVkOwogICAgICAgICBjb2x1bW5OdW1i ZXIgPSBjb2x1bW5OdW1iZXIgPyBjb2x1bW5OdW1iZXIgLSAxIDogMDsKLSAgICAgICAgcmV0dXJu IFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5saW5raWZpZXIubGlua2lmeUxvY2F0aW9uKHVybCwg bGluZU51bWJlciwgY29sdW1uTnVtYmVyLCAiY29uc29sZS1tZXNzYWdlLXVybCIpOworICAgICAg ICByZXR1cm4gV2ViSW5zcGVjdG9yLmRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwubGlua2lmeUxv Y2F0aW9uKHVybCwgbGluZU51bWJlciwgY29sdW1uTnVtYmVyLCAiY29uc29sZS1tZXNzYWdlLXVy bCIpOwogICAgIH0sCiAKICAgICBfbGlua2lmeUNhbGxGcmFtZTogZnVuY3Rpb24oY2FsbEZyYW1l KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xl Vmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcu anMKaW5kZXggNWQxMzJhMWVkMWMzYTk3Y2EwM2MzNjdjODAyZTlmZDQwZjMyMGZlYS4uNTRiMWJh MGI0ZGQ5MzBiYWQwMWRkOWMyNGFlNDhmMWI2ZGVhZWI4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCkBAIC0xMDksOCArMTA5LDYg QEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3ID0gZnVuY3Rpb24oKQogCiAgICAgV2ViSW5zcGVj dG9yLmNvbnNvbGUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuQ29uc29sZU1vZGVsLkV2 ZW50cy5NZXNzYWdlQWRkZWQsIHRoaXMuX2NvbnNvbGVNZXNzYWdlQWRkZWQsIHRoaXMpOwogICAg IFdlYkluc3BlY3Rvci5jb25zb2xlLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkNvbnNv bGVNb2RlbC5FdmVudHMuQ29uc29sZUNsZWFyZWQsIHRoaXMuX2NvbnNvbGVDbGVhcmVkLCB0aGlz KTsKLQotICAgIFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5saW5raWZpZXIgPSBuZXcgV2ViSW5z cGVjdG9yLkxpbmtpZmllcihXZWJJbnNwZWN0b3IuZGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbCk7 CiB9CiAKIFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5FdmVudHMgPSB7CkBAIC0zMzAsOCArMzI4 LDYgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgZGVs ZXRlIHRoaXMucHJldmlvdXNNZXNzYWdlOwogCiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRv TGlzdGVuZXJzKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5FdmVudHMuQ29uc29sZUNsZWFyZWQp OwotCi0gICAgICAgIFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5saW5raWZpZXIucmVzZXQoKTsK ICAgICB9LAogCiAgICAgY29tcGxldGlvbnM6IGZ1bmN0aW9uKHdvcmRSYW5nZSwgYmVzdE1hdGNo T25seSwgY29tcGxldGlvbnNSZWFkeUNhbGxiYWNrKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVs LmpzCmluZGV4IDRhMjg3NWM2MTk3NjMyMDg0OGI2MGM0ZWNjZGRhYjcwMTUxYTNjNGQuLjNiMmY4 ODQ5ODY5Y2RiZDdiYzU5NWE3ZDc4OTI3YTZkZWM4YmJkN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0 aW9uTW9kZWwuanMKQEAgLTY2LDYgKzY2LDMyIEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNl bnRhdGlvbk1vZGVsLkV2ZW50cyA9IHsKIH0KIAogV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2Vu dGF0aW9uTW9kZWwucHJvdG90eXBlID0geworICAgIGxpbmtpZnlMb2NhdGlvbjogZnVuY3Rpb24o c291cmNlVVJMLCBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIsIGNsYXNzZXMpCisgICAgeworICAg ICAgICB2YXIgbGlua1RleHQgPSBXZWJJbnNwZWN0b3IuZm9ybWF0TGlua1RleHQoc291cmNlVVJM LCBsaW5lTnVtYmVyKTsKKyAgICAgICAgdmFyIGFuY2hvciA9IFdlYkluc3BlY3Rvci5saW5raWZ5 VVJMQXNOb2RlKHNvdXJjZVVSTCwgbGlua1RleHQsIGNsYXNzZXMsIGZhbHNlKTsKKworICAgICAg ICB2YXIgcmF3U291cmNlQ29kZSA9IHRoaXMuX3Jhd1NvdXJjZUNvZGVGb3JTY3JpcHQoc291cmNl VVJMKTsKKyAgICAgICAgaWYgKCFyYXdTb3VyY2VDb2RlKSB7CisgICAgICAgICAgICBhbmNob3Iu c2V0QXR0cmlidXRlKCJwcmVmZXJyZWRfcGFuZWwiLCAicmVzb3VyY2VzIik7CisgICAgICAgICAg ICBhbmNob3Iuc2V0QXR0cmlidXRlKCJsaW5lX251bWJlciIsIGxpbmVOdW1iZXIpOworICAgICAg ICAgICAgcmV0dXJuIGFuY2hvcjsKKyAgICAgICAgfQorCisgICAgICAgIGZ1bmN0aW9uIHVwZGF0 ZUFuY2hvcigpCisgICAgICAgIHsKKyAgICAgICAgICAgIHZhciB1aUxvY2F0aW9uID0gcmF3U291 cmNlQ29kZS5zb3VyY2VNYXBwaW5nLnJhd0xvY2F0aW9uVG9VSUxvY2F0aW9uKHsgbGluZU51bWJl cjogbGluZU51bWJlciwgY29sdW1uTnVtYmVyOiBjb2x1bW5OdW1iZXIgfSk7CisgICAgICAgICAg ICBhbmNob3IudGV4dENvbnRlbnQgPSBXZWJJbnNwZWN0b3IuZm9ybWF0TGlua1RleHQodWlMb2Nh dGlvbi51aVNvdXJjZUNvZGUudXJsLCB1aUxvY2F0aW9uLmxpbmVOdW1iZXIpOworICAgICAgICAg ICAgYW5jaG9yLnNldEF0dHJpYnV0ZSgicHJlZmVycmVkX3BhbmVsIiwgInNjcmlwdHMiKTsKKyAg ICAgICAgICAgIGFuY2hvci51aVNvdXJjZUNvZGUgPSB1aUxvY2F0aW9uLnVpU291cmNlQ29kZTsK KyAgICAgICAgICAgIGFuY2hvci5saW5lTnVtYmVyID0gdWlMb2NhdGlvbi5saW5lTnVtYmVyOwor ICAgICAgICB9CisgICAgICAgIGlmIChyYXdTb3VyY2VDb2RlLnNvdXJjZU1hcHBpbmcpCisgICAg ICAgICAgICB1cGRhdGVBbmNob3IuY2FsbCh0aGlzKTsKKyAgICAgICAgcmF3U291cmNlQ29kZS5h ZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlLkV2ZW50cy5Tb3VyY2VN YXBwaW5nVXBkYXRlZCwgdXBkYXRlQW5jaG9yLCB0aGlzKTsKKyAgICAgICAgcmV0dXJuIGFuY2hv cjsKKyAgICB9LAorCiAgICAgX3BhcnNlZFNjcmlwdFNvdXJjZTogZnVuY3Rpb24oZXZlbnQpCiAg ICAgewogICAgICAgICB0aGlzLl9hZGRTY3JpcHQoZXZlbnQuZGF0YSk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V2ZW50TGlzdGVuZXJzU2lkZWJhclBh bmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V2ZW50TGlzdGVuZXJz U2lkZWJhclBhbmUuanMKaW5kZXggZGVlMzMxNDJmZWJiOTJjOTdjNDc5YzNkYWYwMWQ4MGEzNzUz OWFmMi4uMmViODY0OTYwMWJmYzMwNDhmMDVmZTdhZGNiNTZjYjUyMzhmYzNkZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FdmVudExpc3RlbmVyc1NpZGVi YXJQYW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXZlbnRM aXN0ZW5lcnNTaWRlYmFyUGFuZS5qcwpAQCAtNTYsOCArNTYsNiBAQCBXZWJJbnNwZWN0b3IuRXZl bnRMaXN0ZW5lcnNTaWRlYmFyUGFuZSA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLnNldHRpbmdzU2Vs ZWN0RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjaGFuZ2UiLCB0aGlzLl9jaGFuZ2VTZXR0aW5n LmJpbmQodGhpcyksIGZhbHNlKTsKIAogICAgIHRoaXMudGl0bGVFbGVtZW50LmFwcGVuZENoaWxk KHRoaXMuc2V0dGluZ3NTZWxlY3RFbGVtZW50KTsKLQotICAgIHRoaXMuX2xpbmtpZmllciA9IG5l dyBXZWJJbnNwZWN0b3IuTGlua2lmaWVyKFdlYkluc3BlY3Rvci5kZWJ1Z2dlclByZXNlbnRhdGlv bk1vZGVsKTsKIH0KIAogV2ViSW5zcGVjdG9yLkV2ZW50TGlzdGVuZXJzU2lkZWJhclBhbmUuX29i amVjdEdyb3VwTmFtZSA9ICJldmVudC1saXN0ZW5lcnMtc2lkZWJhci1wYW5lIjsKQEAgLTY2LDgg KzY0LDYgQEAgV2ViSW5zcGVjdG9yLkV2ZW50TGlzdGVuZXJzU2lkZWJhclBhbmUucHJvdG90eXBl ID0gewogICAgIHVwZGF0ZTogZnVuY3Rpb24obm9kZSkKICAgICB7CiAgICAgICAgIFJ1bnRpbWVB Z2VudC5yZWxlYXNlT2JqZWN0R3JvdXAoV2ViSW5zcGVjdG9yLkV2ZW50TGlzdGVuZXJzU2lkZWJh clBhbmUuX29iamVjdEdyb3VwTmFtZSk7Ci0gICAgICAgIHRoaXMuX2xpbmtpZmllci5yZXNldCgp OwotCiAgICAgICAgIHZhciBib2R5ID0gdGhpcy5ib2R5RWxlbWVudDsKICAgICAgICAgYm9keS5y ZW1vdmVDaGlsZHJlbigpOwogICAgICAgICB0aGlzLnNlY3Rpb25zID0gW107CkBAIC04OCw3ICs4 NCw3IEBAIFdlYkluc3BlY3Rvci5FdmVudExpc3RlbmVyc1NpZGViYXJQYW5lLnByb3RvdHlwZSA9 IHsKICAgICAgICAgICAgICAgICB2YXIgdHlwZSA9IGV2ZW50TGlzdGVuZXIudHlwZTsKICAgICAg ICAgICAgICAgICB2YXIgc2VjdGlvbiA9IHNlY3Rpb25NYXBbdHlwZV07CiAgICAgICAgICAgICAg ICAgaWYgKCFzZWN0aW9uKSB7Ci0gICAgICAgICAgICAgICAgICAgIHNlY3Rpb24gPSBuZXcgV2Vi SW5zcGVjdG9yLkV2ZW50TGlzdGVuZXJzU2VjdGlvbih0eXBlLCBub2RlLmlkLCBzZWxmLl9saW5r aWZpZXIpOworICAgICAgICAgICAgICAgICAgICBzZWN0aW9uID0gbmV3IFdlYkluc3BlY3Rvci5F dmVudExpc3RlbmVyc1NlY3Rpb24odHlwZSwgbm9kZS5pZCk7CiAgICAgICAgICAgICAgICAgICAg IHNlY3Rpb25NYXBbdHlwZV0gPSBzZWN0aW9uOwogICAgICAgICAgICAgICAgICAgICBzZWN0aW9u TmFtZXMucHVzaCh0eXBlKTsKICAgICAgICAgICAgICAgICAgICAgc2VsZi5zZWN0aW9ucy5wdXNo KHNlY3Rpb24pOwpAQCAtMTI4LDExICsxMjQsMTAgQEAgV2ViSW5zcGVjdG9yLkV2ZW50TGlzdGVu ZXJzU2lkZWJhclBhbmUucHJvdG90eXBlID0gewogCiBXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5l cnNTaWRlYmFyUGFuZS5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLlNpZGViYXJQ YW5lLnByb3RvdHlwZTsKIAotV2ViSW5zcGVjdG9yLkV2ZW50TGlzdGVuZXJzU2VjdGlvbiA9IGZ1 bmN0aW9uKHRpdGxlLCBub2RlSWQsIGxpbmtpZmllcikKK1dlYkluc3BlY3Rvci5FdmVudExpc3Rl bmVyc1NlY3Rpb24gPSBmdW5jdGlvbih0aXRsZSwgbm9kZUlkKQogewogICAgIHRoaXMuZXZlbnRM aXN0ZW5lcnMgPSBbXTsKICAgICB0aGlzLl9ub2RlSWQgPSBub2RlSWQ7Ci0gICAgdGhpcy5fbGlu a2lmaWVyID0gbGlua2lmaWVyOwogICAgIFdlYkluc3BlY3Rvci5Qcm9wZXJ0aWVzU2VjdGlvbi5j YWxsKHRoaXMsIHRpdGxlKTsKIAogICAgIC8vIENoYW5nZWQgZnJvbSBhIFByb3BlcnRpZXMgTGlz dApAQCAtMTYzLDcgKzE1OCw3IEBAIFdlYkluc3BlY3Rvci5FdmVudExpc3RlbmVyc1NlY3Rpb24u cHJvdG90eXBlID0gewogICAgICAgICB2YXIgbGVuZ3RoID0gZmlsdGVyZWRFdmVudExpc3RlbmVy cy5sZW5ndGg7CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbGVuZ3RoOyArK2kpIHsKICAg ICAgICAgICAgIHZhciBldmVudExpc3RlbmVyID0gZmlsdGVyZWRFdmVudExpc3RlbmVyc1tpXTsK LSAgICAgICAgICAgIHZhciBldmVudExpc3RlbmVyQmFyID0gbmV3IFdlYkluc3BlY3Rvci5FdmVu dExpc3RlbmVyQmFyKGV2ZW50TGlzdGVuZXIsIHRoaXMuX25vZGVJZCwgdGhpcy5fbGlua2lmaWVy KTsKKyAgICAgICAgICAgIHZhciBldmVudExpc3RlbmVyQmFyID0gbmV3IFdlYkluc3BlY3Rvci5F dmVudExpc3RlbmVyQmFyKGV2ZW50TGlzdGVuZXIsIHRoaXMuX25vZGVJZCk7CiAgICAgICAgICAg ICB0aGlzLmV2ZW50QmFycy5hcHBlbmRDaGlsZChldmVudExpc3RlbmVyQmFyLmVsZW1lbnQpOwog ICAgICAgICB9CiAgICAgfSwKQEAgLTE3NiwxMyArMTcxLDEzIEBAIFdlYkluc3BlY3Rvci5FdmVu dExpc3RlbmVyc1NlY3Rpb24ucHJvdG90eXBlID0gewogCiBXZWJJbnNwZWN0b3IuRXZlbnRMaXN0 ZW5lcnNTZWN0aW9uLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuUHJvcGVydGll c1NlY3Rpb24ucHJvdG90eXBlOwogCi1XZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5lckJhciA9IGZ1 bmN0aW9uKGV2ZW50TGlzdGVuZXIsIG5vZGVJZCwgbGlua2lmaWVyKQorV2ViSW5zcGVjdG9yLkV2 ZW50TGlzdGVuZXJCYXIgPSBmdW5jdGlvbihldmVudExpc3RlbmVyLCBub2RlSWQpCiB7CiAgICAg dGhpcy5ldmVudExpc3RlbmVyID0gZXZlbnRMaXN0ZW5lcjsKICAgICB0aGlzLl9ub2RlSWQgPSBu b2RlSWQ7CiAgICAgV2ViSW5zcGVjdG9yLk9iamVjdFByb3BlcnRpZXNTZWN0aW9uLmNhbGwodGhp cyk7CiAgICAgdGhpcy5fc2V0Tm9kZVRpdGxlKCk7Ci0gICAgdGhpcy5fc2V0RnVuY3Rpb25TdWJ0 aXRsZShsaW5raWZpZXIpOworICAgIHRoaXMuX3NldEZ1bmN0aW9uU3VidGl0bGUoKTsKICAgICB0 aGlzLmVkaXRhYmxlID0gZmFsc2U7CiAgICAgdGhpcy5lbGVtZW50LmNsYXNzTmFtZSA9ICJldmVu dC1iYXIiOyAvKiBDaGFuZ2VkIGZyb20gInNlY3Rpb24iICovCiAgICAgdGhpcy5oZWFkZXJFbGVt ZW50LmFkZFN0eWxlQ2xhc3MoInNvdXJjZS1jb2RlIik7CkBAIC0yMzYsNyArMjMxLDcgQEAgV2Vi SW5zcGVjdG9yLkV2ZW50TGlzdGVuZXJCYXIucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLnRp dGxlRWxlbWVudC5hcHBlbmRDaGlsZChXZWJJbnNwZWN0b3IucGFuZWxzLmVsZW1lbnRzLmxpbmtp ZnlOb2RlUmVmZXJlbmNlKHRoaXMuZXZlbnRMaXN0ZW5lci5ub2RlKSk7CiAgICAgfSwKIAotICAg IF9zZXRGdW5jdGlvblN1YnRpdGxlOiBmdW5jdGlvbihsaW5raWZpZXIpCisgICAgX3NldEZ1bmN0 aW9uU3VidGl0bGU6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIC8vIFJlcXVpcmVzIHRoYXQg RnVuY3Rpb24udG9TdHJpbmcoKSByZXR1cm4gYXQgbGVhc3QgdGhlIGZ1bmN0aW9uJ3Mgc2lnbmF0 dXJlLgogICAgICAgICBpZiAodGhpcy5ldmVudExpc3RlbmVyLmxvY2F0aW9uKSB7CkBAIC0yNDUs NyArMjQwLDcgQEAgV2ViSW5zcGVjdG9yLkV2ZW50TGlzdGVuZXJCYXIucHJvdG90eXBlID0gewog ICAgICAgICAgICAgdmFyIHVybCA9IHRoaXMuZXZlbnRMaXN0ZW5lci5sb2NhdGlvbi5zY3JpcHRJ ZDsKICAgICAgICAgICAgIHZhciBsaW5lTnVtYmVyID0gdGhpcy5ldmVudExpc3RlbmVyLmxvY2F0 aW9uLmxpbmVOdW1iZXIgLSAxOwogICAgICAgICAgICAgdmFyIGNvbHVtbk51bWJlciA9IDA7Ci0g ICAgICAgICAgICB2YXIgdXJsRWxlbWVudCA9IGxpbmtpZmllci5saW5raWZ5TG9jYXRpb24odXJs LCBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIpOworICAgICAgICAgICAgdmFyIHVybEVsZW1lbnQg PSBXZWJJbnNwZWN0b3IuZGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5saW5raWZ5TG9jYXRpb24o dXJsLCBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIpOwogICAgICAgICAgICAgdGhpcy5zdWJ0aXRs ZUVsZW1lbnQuYXBwZW5kQ2hpbGQodXJsRWxlbWVudCk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAg ICAgICAgICB2YXIgbWF0Y2ggPSB0aGlzLmV2ZW50TGlzdGVuZXIuaGFuZGxlckJvZHkubWF0Y2go L2Z1bmN0aW9uIChbXlwoXSs/KVwoLyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0xpbmtpZmllci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvTGlua2lmaWVyLmpzCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCA5MGRj N2Y3MDc1ODZjYzVlNGIxNzdmMjZlNjk2MGIxODVmODU4MzYwLi4wMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwCi0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvTGlua2lmaWVyLmpzCisrKyAvZGV2L251bGwKQEAgLTEsOTcgKzAsMCBAQAotLyoKLSAq IENvcHlyaWdodCAoQykgMjAxMSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotICoK LSAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdp dGggb3Igd2l0aG91dAotICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRo YXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQotICogbWV0OgotICoKLSAqICAgICAqIFJl ZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJp Z2h0Ci0gKiBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5n IGRpc2NsYWltZXIuCi0gKiAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVz dCByZXByb2R1Y2UgdGhlIGFib3ZlCi0gKiBjb3B5cmlnaHQgbm90aWNlLCB0aGlzIGxpc3Qgb2Yg Y29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyCi0gKiBpbiB0aGUgZG9jdW1l bnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlCi0gKiBkaXN0 cmlidXRpb24uCi0gKiAgICAgKiBOZWl0aGVyIHRoZSBuYW1lIG9mIEdvb2dsZSBJbmMuIG5vciB0 aGUgbmFtZXMgb2YgaXRzCi0gKiBjb250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBv ciBwcm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQgZnJvbQotICogdGhpcyBzb2Z0d2FyZSB3aXRob3V0 IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVybWlzc2lvbi4KLSAqCi0gKiBUSElTIFNPRlRXQVJF IElTIFBST1ZJREVEIEJZIFRIRSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09OVFJJQlVUT1JTCi0g KiAiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElO RywgQlVUIE5PVAotICogTElNSVRFRCBUTywgVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJD SEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SCi0gKiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUg RElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgVEhFIENPUFlSSUdIVAotICogT1dORVIgT1Ig Q09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5U QUwsCi0gKiBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5D TFVESU5HLCBCVVQgTk9UCi0gKiBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRF IEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwKLSAqIERBVEEsIE9SIFBST0ZJVFM7IE9S IEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWQotICogVEhF T1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwg T1IgVE9SVAotICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJ TiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCi0gKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFE VklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgotICovCi0KLS8qKgotICog QGNvbnN0cnVjdG9yCi0gKi8KLVdlYkluc3BlY3Rvci5MaW5raWZpZXIgPSBmdW5jdGlvbihkZWJ1 Z2dlclByZXNlbnRhdGlvbk1vZGVsKQotewotICAgIHRoaXMuX2RlYnVnZ2VyUHJlc2VudGF0aW9u TW9kZWwgPSBkZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsOwotICAgIHRoaXMuX2FuY2hvcnNGb3JV UkwgPSB7fTsKLX0KLQotV2ViSW5zcGVjdG9yLkxpbmtpZmllci5wcm90b3R5cGUgPSB7Ci0gICAg bGlua2lmeUxvY2F0aW9uOiBmdW5jdGlvbihzb3VyY2VVUkwsIGxpbmVOdW1iZXIsIGNvbHVtbk51 bWJlciwgY2xhc3NlcykKLSAgICB7Ci0gICAgICAgIHZhciBsaW5rVGV4dCA9IFdlYkluc3BlY3Rv ci5mb3JtYXRMaW5rVGV4dChzb3VyY2VVUkwsIGxpbmVOdW1iZXIpOwotICAgICAgICB2YXIgYW5j aG9yID0gV2ViSW5zcGVjdG9yLmxpbmtpZnlVUkxBc05vZGUoc291cmNlVVJMLCBsaW5rVGV4dCwg Y2xhc3NlcywgZmFsc2UpOwotICAgICAgICBhbmNob3IucmF3TG9jYXRpb24gPSB7IGxpbmVOdW1i ZXI6IGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlcjogY29sdW1uTnVtYmVyIH07Ci0KLSAgICAgICAg dmFyIHJhd1NvdXJjZUNvZGUgPSB0aGlzLl9kZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLl9yYXdT b3VyY2VDb2RlRm9yU2NyaXB0KHNvdXJjZVVSTCk7Ci0gICAgICAgIGlmICghcmF3U291cmNlQ29k ZSkgewotICAgICAgICAgICAgYW5jaG9yLnNldEF0dHJpYnV0ZSgicHJlZmVycmVkX3BhbmVsIiwg InJlc291cmNlcyIpOwotICAgICAgICAgICAgYW5jaG9yLnNldEF0dHJpYnV0ZSgibGluZV9udW1i ZXIiLCBsaW5lTnVtYmVyKTsKLSAgICAgICAgICAgIHJldHVybiBhbmNob3I7Ci0gICAgICAgIH0K LQotICAgICAgICB2YXIgYW5jaG9ycyA9IHRoaXMuX2FuY2hvcnNGb3JVUkxbc291cmNlVVJMXTsK LSAgICAgICAgaWYgKCFhbmNob3JzKSB7Ci0gICAgICAgICAgICBhbmNob3JzID0gW107Ci0gICAg ICAgICAgICB0aGlzLl9hbmNob3JzRm9yVVJMW3NvdXJjZVVSTF0gPSBhbmNob3JzOwotICAgICAg ICAgICAgcmF3U291cmNlQ29kZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5SYXdTb3Vy Y2VDb2RlLkV2ZW50cy5Tb3VyY2VNYXBwaW5nVXBkYXRlZCwgdGhpcy5fdXBkYXRlU291cmNlQW5j aG9ycywgdGhpcyk7Ci0gICAgICAgIH0KLQotICAgICAgICBpZiAocmF3U291cmNlQ29kZS5zb3Vy Y2VNYXBwaW5nKQotICAgICAgICAgICAgdGhpcy5fdXBkYXRlQW5jaG9yKHJhd1NvdXJjZUNvZGUs IGFuY2hvcik7Ci0gICAgICAgIGFuY2hvcnMucHVzaChhbmNob3IpOwotICAgICAgICByZXR1cm4g YW5jaG9yOwotICAgIH0sCi0KLSAgICByZXNldDogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAg Zm9yICh2YXIgc291cmNlVVJMIGluIHRoaXMuX2FuY2hvcnNGb3JVUkwpIHsKLSAgICAgICAgICAg IHZhciByYXdTb3VyY2VDb2RlID0gdGhpcy5fZGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5fcmF3 U291cmNlQ29kZUZvclNjcmlwdChzb3VyY2VVUkwpOwotICAgICAgICAgICAgaWYgKHJhd1NvdXJj ZUNvZGUpCi0gICAgICAgICAgICAgICAgcmF3U291cmNlQ29kZS5yZW1vdmVFdmVudExpc3RlbmVy KFdlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlLkV2ZW50cy5Tb3VyY2VNYXBwaW5nVXBkYXRlZCwg dGhpcy5fdXBkYXRlU291cmNlQW5jb3JzLCB0aGlzKTsKLSAgICAgICAgfQotICAgICAgICB0aGlz Ll9hbmNob3JzRm9yVVJMID0ge307Ci0gICAgfSwKLQotICAgIF91cGRhdGVTb3VyY2VBbmNob3Jz OiBmdW5jdGlvbihldmVudCkKLSAgICB7Ci0gICAgICAgIHZhciByYXdTb3VyY2VDb2RlID0gZXZl bnQudGFyZ2V0OwotICAgICAgICB2YXIgYW5jaG9ycyA9IHRoaXMuX2FuY2hvcnNGb3JVUkxbcmF3 U291cmNlQ29kZS51cmxdOwotICAgICAgICBpZiAoIWFuY2hvcnMpCi0gICAgICAgICAgICByZXR1 cm47Ci0KLSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBhbmNob3JzLmxlbmd0aDsgKytpKQot ICAgICAgICAgICAgdGhpcy5fdXBkYXRlQW5jaG9yKHJhd1NvdXJjZUNvZGUsIGFuY2hvcnNbaV0p OwotICAgIH0sCi0KLSAgICBfdXBkYXRlQW5jaG9yOiBmdW5jdGlvbihyYXdTb3VyY2VDb2RlLCBh bmNob3IpCi0gICAgewotICAgICAgICB2YXIgdWlMb2NhdGlvbiA9IHJhd1NvdXJjZUNvZGUuc291 cmNlTWFwcGluZy5yYXdMb2NhdGlvblRvVUlMb2NhdGlvbihhbmNob3IucmF3TG9jYXRpb24pOwot ICAgICAgICBhbmNob3IudGV4dENvbnRlbnQgPSBXZWJJbnNwZWN0b3IuZm9ybWF0TGlua1RleHQo dWlMb2NhdGlvbi51aVNvdXJjZUNvZGUudXJsLCB1aUxvY2F0aW9uLmxpbmVOdW1iZXIpOwotICAg ICAgICBhbmNob3Iuc2V0QXR0cmlidXRlKCJwcmVmZXJyZWRfcGFuZWwiLCAic2NyaXB0cyIpOwot ICAgICAgICBhbmNob3IudWlTb3VyY2VDb2RlID0gdWlMb2NhdGlvbi51aVNvdXJjZUNvZGU7Ci0g ICAgICAgIGFuY2hvci5saW5lTnVtYmVyID0gdWlMb2NhdGlvbi5saW5lTnVtYmVyOwotICAgIH0K LX0KLQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3 b3JrUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQ YW5lbC5qcwppbmRleCAzYmU5ZTQ3ZmIzODYzM2Q5Yzk3ZTE1MjE5OTlkMGM0MWUxNGRjOGZiLi41 YmJiNTliNDkyMjdjOWM4ZTA5YTZhMGUyYThhNDM4M2Q5OGFlOTMxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcwpAQCAtNTYsNyAr NTYsNiBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0xvZ1ZpZXcgPSBmdW5jdGlvbihwYXJlbnRFbGVt ZW50KQogCiAgICAgdGhpcy5fY3JlYXRlU3RhdHVzYmFyQnV0dG9ucygpOwogICAgIHRoaXMuX2Ny ZWF0ZUZpbHRlclN0YXR1c0Jhckl0ZW1zKCk7Ci0gICAgdGhpcy5fbGlua2lmaWVyID0gbmV3IFdl Ykluc3BlY3Rvci5MaW5raWZpZXIoV2ViSW5zcGVjdG9yLmRlYnVnZ2VyUHJlc2VudGF0aW9uTW9k ZWwpOwogCiAgICAgV2ViSW5zcGVjdG9yLm5ldHdvcmtNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIo V2ViSW5zcGVjdG9yLk5ldHdvcmtNYW5hZ2VyLkV2ZW50VHlwZXMuUmVzb3VyY2VTdGFydGVkLCB0 aGlzLl9vblJlc291cmNlU3RhcnRlZCwgdGhpcyk7CiAgICAgV2ViSW5zcGVjdG9yLm5ldHdvcmtN YW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLk5ldHdvcmtNYW5hZ2VyLkV2ZW50 VHlwZXMuUmVzb3VyY2VVcGRhdGVkLCB0aGlzLl9vblJlc291cmNlVXBkYXRlZCwgdGhpcyk7CkBA IC03MzYsNyArNzM1LDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtMb2dWaWV3LnByb3RvdHlwZSA9 IHsKIAogICAgICAgICB0aGlzLl9tYWluUmVzb3VyY2VMb2FkVGltZSA9IC0xOwogICAgICAgICB0 aGlzLl9tYWluUmVzb3VyY2VET01Db250ZW50VGltZSA9IC0xOwotICAgICAgICB0aGlzLl9saW5r aWZpZXIucmVzZXQoKTsKKwogICAgIH0sCiAKICAgICBnZXQgcmVzb3VyY2VzKCkKQEAgLTIwNDIs NyArMjA0MSw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrRGF0YUdyaWROb2RlLnByb3RvdHlwZSA9 IHsKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgICAgIH0KICAgICAg ICAgICAgICAgICB0aGlzLl9pbml0aWF0b3JDZWxsLnRpdGxlID0gdG9wRnJhbWUudXJsICsgIjoi ICsgdG9wRnJhbWUubGluZU51bWJlcjsKLSAgICAgICAgICAgICAgICB2YXIgdXJsRWxlbWVudCA9 IHRoaXMuX3BhcmVudFZpZXcuX2xpbmtpZmllci5saW5raWZ5TG9jYXRpb24odG9wRnJhbWUudXJs LCB0b3BGcmFtZS5saW5lTnVtYmVyIC0gMSwgMCk7CisgICAgICAgICAgICAgICAgdmFyIHVybEVs ZW1lbnQgPSBXZWJJbnNwZWN0b3IuZGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5saW5raWZ5TG9j YXRpb24odG9wRnJhbWUudXJsLCB0b3BGcmFtZS5saW5lTnVtYmVyIC0gMSwgMCk7CiAgICAgICAg ICAgICAgICAgdGhpcy5faW5pdGlhdG9yQ2VsbC5hcHBlbmRDaGlsZCh1cmxFbGVtZW50KTsKICAg ICAgICAgICAgICAgICB0aGlzLl9hcHBlbmRTdWJ0aXRsZSh0aGlzLl9pbml0aWF0b3JDZWxsLCBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNjcmlwdCIpKTsKICAgICAgICAgICAgIH0gZWxzZSB7IC8v IGluaXRpYXRvci50eXBlID09PSAicGFyc2VyIgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlRGF0YUdyaWRUcmVlLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlRGF0YUdyaWRUcmVlLmpzCmluZGV4IGNmNDBi YzI2ZTc5MDkzMDUzZmQ3OTJiMzczNzUyOGIzNDlhZmI0ZjAuLjU4NTU2OGMzYWJhMDY5ODFjZWM4 NTI5ZjExNDJiOTBmMjY0M2I4N2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvUHJvZmlsZURhdGFHcmlkVHJlZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVEYXRhR3JpZFRyZWUuanMKQEAgLTk4LDcgKzk4LDcg QEAgV2ViSW5zcGVjdG9yLlByb2ZpbGVEYXRhR3JpZE5vZGUucHJvdG90eXBlID0gewogICAgICAg ICBpZiAodGhpcy5wcm9maWxlTm9kZS51cmwpIHsKICAgICAgICAgICAgIC8vIEZJWE1FKDYyNzI1 KTogcHJvZmlsZU5vZGUgc2hvdWxkIHJlZmVyZW5jZSBhIGRlYnVnZ2VyIGxvY2F0aW9uLgogICAg ICAgICAgICAgdmFyIGxpbmVOdW1iZXIgPSB0aGlzLnByb2ZpbGVOb2RlLmxpbmVOdW1iZXIgPyB0 aGlzLnByb2ZpbGVOb2RlLmxpbmVOdW1iZXIgLSAxIDogMDsKLSAgICAgICAgICAgIHZhciB1cmxF bGVtZW50ID0gdGhpcy5wcm9maWxlVmlldy5fbGlua2lmaWVyLmxpbmtpZnlMb2NhdGlvbih0aGlz LnByb2ZpbGVOb2RlLnVybCwgbGluZU51bWJlciwgMCwgInByb2ZpbGUtbm9kZS1maWxlIik7Cisg ICAgICAgICAgICB2YXIgdXJsRWxlbWVudCA9IFdlYkluc3BlY3Rvci5kZWJ1Z2dlclByZXNlbnRh dGlvbk1vZGVsLmxpbmtpZnlMb2NhdGlvbih0aGlzLnByb2ZpbGVOb2RlLnVybCwgbGluZU51bWJl ciwgMCwgInByb2ZpbGUtbm9kZS1maWxlIik7CiAgICAgICAgICAgICB1cmxFbGVtZW50LnN0eWxl Lm1heFdpZHRoID0gIjc1JSI7CiAgICAgICAgICAgICBjZWxsLmluc2VydEJlZm9yZSh1cmxFbGVt ZW50LCBjZWxsLmZpcnN0Q2hpbGQpOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlVmlldy5qcwppbmRleCA2MmNmZmMwYjkwMGVmNzcy OTM0OTUzODYzNTIzNjFlZjE3NGZjMDFiLi4yYTAzZjgzMDUxZGE1NDFlZmU0MTQwOWMxMWJkZDJh ZTg5NDMxY2UyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1Byb2ZpbGVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv UHJvZmlsZVZpZXcuanMKQEAgLTk2LDggKzk2LDYgQEAgV2ViSW5zcGVjdG9yLkNQVVByb2ZpbGVW aWV3ID0gZnVuY3Rpb24ocHJvZmlsZSkKICAgICAgICAgc2VsZi5fdXBkYXRlUGVyY2VudEJ1dHRv bigpOwogICAgIH0KIAotICAgIHRoaXMuX2xpbmtpZmllciA9IG5ldyBXZWJJbnNwZWN0b3IuTGlu a2lmaWVyKFdlYkluc3BlY3Rvci5kZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsKTsKLQogICAgIFBy b2ZpbGVyQWdlbnQuZ2V0UHJvZmlsZSh0aGlzLnByb2ZpbGUudHlwZUlkLCB0aGlzLnByb2ZpbGUu dWlkLCBwcm9maWxlQ2FsbGJhY2spOwogfQogCkBAIC00ODcsNyArNDg1LDYgQEAgV2ViSW5zcGVj dG9yLkNQVVByb2ZpbGVWaWV3LnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHRoaXMucmVz ZXRCdXR0b24udmlzaWJsZSA9IGZhbHNlOwogICAgICAgICB0aGlzLnByb2ZpbGVEYXRhR3JpZFRy ZWUucmVzdG9yZSgpOwotICAgICAgICB0aGlzLl9saW5raWllci5yZXNldCgpOwogICAgICAgICB0 aGlzLnJlZnJlc2goKTsKICAgICAgICAgdGhpcy5yZWZyZXNoVmlzaWJsZURhdGEoKTsKICAgICB9 LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGlu ZVBhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBh bmVsLmpzCmluZGV4IGE5MjJmYjExYmMyYjFlMjEzMGViNWU4Y2QwZjc1OTQ4Njc1Y2U5N2UuLmUy ODFjNWNmMjY0MGU5NTVjZjk1ZTI0YzI2OTI0NTU4ODNjYTkzOTEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKQEAgLTEwOSw3 ICsxMDksNiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbCA9IGZ1bmN0aW9uKCkKIAogICAg IHRoaXMuX3JlZ2lzdGVyU2hvcnRjdXRzKCk7CiAgICAgV2ViSW5zcGVjdG9yLnRpbWVsaW5lTWFu YWdlci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIuRXZlbnRU eXBlcy5UaW1lbGluZUV2ZW50UmVjb3JkZWQsIHRoaXMuX29uVGltZWxpbmVFdmVudFJlY29yZGVk LCB0aGlzKTsKLSAgICB0aGlzLl9saW5raWZpZXIgPSBuZXcgV2ViSW5zcGVjdG9yLkxpbmtpZmll cihXZWJJbnNwZWN0b3IuZGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbCk7CiB9CiAKIC8vIERlZmlu ZSByb3cgaGVpZ2h0LCBzaG91bGQgYmUgaW4gc3luYyB3aXRoIHN0eWxlcyBmb3IgdGltZWxpbmUg Z3JhcGhzLgpAQCAtMTE3LDE5ICsxMTYsNiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5y b3dIZWlnaHQgPSAxODsKIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnNob3J0UmVjb3JkVGhy ZXNob2xkID0gMC4wMTU7CiAKIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZSA9 IHsKLSAgICBfbGlua2lmeUxvY2F0aW9uOiBmdW5jdGlvbih1cmwsIGxpbmVOdW1iZXIsIGNvbHVt bk51bWJlcikKLSAgICB7Ci0gICAgICAgIC8vIEZJWE1FKDYyNzI1KTogc3RhY2sgdHJhY2UgbGlu ZS9jb2x1bW4gbnVtYmVycyBhcmUgb25lLWJhc2VkLgotICAgICAgICBsaW5lTnVtYmVyID0gbGlu ZU51bWJlciA/IGxpbmVOdW1iZXIgLSAxIDogbGluZU51bWJlcjsKLSAgICAgICAgY29sdW1uTnVt YmVyID0gY29sdW1uTnVtYmVyID8gY29sdW1uTnVtYmVyIC0gMSA6IDA7Ci0gICAgICAgIHJldHVy biB0aGlzLl9saW5raWZpZXIubGlua2lmeUxvY2F0aW9uKHVybCwgbGluZU51bWJlciwgY29sdW1u TnVtYmVyLCAidGltZWxpbmUtZGV0YWlscyIpOwotICAgIH0sCi0KLSAgICBfbGlua2lmeUNhbGxG cmFtZTogZnVuY3Rpb24oY2FsbEZyYW1lKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX2xp bmtpZnlMb2NhdGlvbihjYWxsRnJhbWUudXJsLCBjYWxsRnJhbWUubGluZU51bWJlciwgY2FsbEZy YW1lLmNvbHVtbk51bWJlcik7Ci0gICAgfSwKLQogICAgIF9jcmVhdGVUb3BQYW5lOiBmdW5jdGlv bigpIHsKICAgICAgICAgdmFyIHRvcFBhbmVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgiZGl2Iik7CiAgICAgICAgIHRvcFBhbmVFbGVtZW50LmlkID0gInRpbWVsaW5lLW92ZXJ2aWV3 LXBhbmVsIjsKQEAgLTU0Miw3ICs1MjgsNiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5w cm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX3JlZnJlc2goKTsKICAgICAgICAgdGhpcy5fY2xv c2VSZWNvcmREZXRhaWxzKCk7CiAgICAgICAgIHRoaXMuX21vZGVsLl9yZXNldCgpOwotICAgICAg ICB0aGlzLl9saW5raWZpZXIucmVzZXQoKTsKICAgICB9LAogCiAgICAgZWxlbWVudHNUb1Jlc3Rv cmVTY3JvbGxQb3NpdGlvbnNGb3I6IGZ1bmN0aW9uKCkKQEAgLTk3Niw3ICs5NjEsNiBAQCBXZWJJ bnNwZWN0b3IuVGltZWxpbmVSZWNvcmRHcmFwaFJvdy5wcm90b3R5cGUgPSB7CiAKIFdlYkluc3Bl Y3Rvci5UaW1lbGluZVBhbmVsLkZvcm1hdHRlZFJlY29yZCA9IGZ1bmN0aW9uKHJlY29yZCwgcGFy ZW50UmVjb3JkLCBwYW5lbCwgc2NyaXB0RGV0YWlscykKIHsKLSAgICB0aGlzLl9wYW5lbCA9IHBh bmVsOwogICAgIHZhciByZWNvcmRUeXBlcyA9IFdlYkluc3BlY3Rvci5UaW1lbGluZUFnZW50LlJl Y29yZFR5cGU7CiAgICAgdmFyIHN0eWxlID0gcGFuZWwuX3JlY29yZFN0eWxlc1tyZWNvcmQudHlw ZV07CiAgICAgdGhpcy5wYXJlbnQgPSBwYXJlbnRSZWNvcmQ7CkBAIC0xMDY3LDcgKzEwNTEsNyBA QCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5Gb3JtYXR0ZWRSZWNvcmQucHJvdG90eXBlID0g ewogCiAgICAgX2dlbmVyYXRlUG9wdXBDb250ZW50OiBmdW5jdGlvbihjYWxjdWxhdG9yLCBjYXRl Z29yaWVzKQogICAgIHsKLSAgICAgICAgdmFyIGNvbnRlbnRIZWxwZXIgPSBuZXcgV2ViSW5zcGVj dG9yLlRpbWVsaW5lUGFuZWwuUG9wdXBDb250ZW50SGVscGVyKHRoaXMudGl0bGUsIHRoaXMuX3Bh bmVsKTsKKyAgICAgICAgdmFyIGNvbnRlbnRIZWxwZXIgPSBuZXcgV2ViSW5zcGVjdG9yLlRpbWVs aW5lUGFuZWwuUG9wdXBDb250ZW50SGVscGVyKHRoaXMudGl0bGUpOwogCiAgICAgICAgIGlmICh0 aGlzLl9jaGlsZHJlbiAmJiB0aGlzLl9jaGlsZHJlbi5sZW5ndGgpIHsKICAgICAgICAgICAgIGNv bnRlbnRIZWxwZXIuX2FwcGVuZFRleHRSb3coV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTZWxmIFRp bWUiKSwgTnVtYmVyLnNlY29uZHNUb1N0cmluZyh0aGlzLl9zZWxmVGltZSArIDAuMDAwMSkpOwpA QCAtMTE1MiwyNiArMTEzNiwyNiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5Gb3JtYXR0 ZWRSZWNvcmQucHJvdG90eXBlID0gewogICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuVGlt ZWxpbmVBZ2VudC5SZWNvcmRUeXBlLkdDRXZlbnQ6CiAgICAgICAgICAgICAgICAgcmV0dXJuIFdl Ykluc3BlY3Rvci5VSVN0cmluZygiJXMgY29sbGVjdGVkIiwgTnVtYmVyLmJ5dGVzVG9TdHJpbmco dGhpcy5kYXRhLnVzZWRIZWFwU2l6ZURlbHRhKSk7CiAgICAgICAgICAgICBjYXNlIFdlYkluc3Bl Y3Rvci5UaW1lbGluZUFnZW50LlJlY29yZFR5cGUuVGltZXJGaXJlOgotICAgICAgICAgICAgICAg IHJldHVybiB0aGlzLnNjcmlwdE5hbWUgPyB0aGlzLl9wYW5lbC5fbGlua2lmeUxvY2F0aW9uKHRo aXMuc2NyaXB0TmFtZSwgdGhpcy5zY3JpcHRMaW5lLCAwKSA6IHRoaXMuZGF0YS50aW1lcklkOwor ICAgICAgICAgICAgICAgIHJldHVybiB0aGlzLnNjcmlwdE5hbWUgPyB0aGlzLl9saW5raWZ5TG9j YXRpb24odGhpcy5zY3JpcHROYW1lLCB0aGlzLnNjcmlwdExpbmUsIDApIDogdGhpcy5kYXRhLnRp bWVySWQ7CiAgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZUFnZW50LlJlY29y ZFR5cGUuRnVuY3Rpb25DYWxsOgotICAgICAgICAgICAgICAgIHJldHVybiB0aGlzLnNjcmlwdE5h bWUgPyB0aGlzLl9wYW5lbC5fbGlua2lmeUxvY2F0aW9uKHRoaXMuc2NyaXB0TmFtZSwgdGhpcy5z Y3JpcHRMaW5lLCAwKSA6IG51bGw7CisgICAgICAgICAgICAgICAgcmV0dXJuIHRoaXMuc2NyaXB0 TmFtZSA/IHRoaXMuX2xpbmtpZnlMb2NhdGlvbih0aGlzLnNjcmlwdE5hbWUsIHRoaXMuc2NyaXB0 TGluZSwgMCkgOiBudWxsOwogICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVB Z2VudC5SZWNvcmRUeXBlLkZpcmVBbmltYXRpb25GcmFtZUV2ZW50OgotICAgICAgICAgICAgICAg IHJldHVybiB0aGlzLnNjcmlwdE5hbWUgPyB0aGlzLl9wYW5lbC5fbGlua2lmeUxvY2F0aW9uKHRo aXMuc2NyaXB0TmFtZSwgdGhpcy5zY3JpcHRMaW5lLCAwKSA6IHRoaXMuZGF0YS5pZDsKKyAgICAg ICAgICAgICAgICByZXR1cm4gdGhpcy5zY3JpcHROYW1lID8gdGhpcy5fbGlua2lmeUxvY2F0aW9u KHRoaXMuc2NyaXB0TmFtZSwgdGhpcy5zY3JpcHRMaW5lLCAwKSA6IHRoaXMuZGF0YS5pZDsKICAg ICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lQWdlbnQuUmVjb3JkVHlwZS5FdmVu dERpc3BhdGNoOgogICAgICAgICAgICAgICAgIHJldHVybiB0aGlzLmRhdGEgPyB0aGlzLmRhdGEu dHlwZSA6IG51bGw7CiAgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZUFnZW50 LlJlY29yZFR5cGUuUGFpbnQ6CiAgICAgICAgICAgICAgICAgcmV0dXJuIHRoaXMuZGF0YS53aWR0 aCArICJcdTIwMDlcdTAwZDdcdTIwMDkiICsgdGhpcy5kYXRhLmhlaWdodDsKICAgICAgICAgICAg IGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lQWdlbnQuUmVjb3JkVHlwZS5UaW1lckluc3RhbGw6 CiAgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZUFnZW50LlJlY29yZFR5cGUu VGltZXJSZW1vdmU6Ci0gICAgICAgICAgICAgICAgcmV0dXJuIHRoaXMuc3RhY2tUcmFjZSA/IHRo aXMuX3BhbmVsLl9saW5raWZ5Q2FsbEZyYW1lKHRoaXMuc3RhY2tUcmFjZVswXSkgOiB0aGlzLmRh dGEudGltZXJJZDsKKyAgICAgICAgICAgICAgICByZXR1cm4gdGhpcy5zdGFja1RyYWNlID8gdGhp cy5fbGlua2lmeUNhbGxGcmFtZSh0aGlzLnN0YWNrVHJhY2VbMF0pIDogdGhpcy5kYXRhLnRpbWVy SWQ7CiAgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZUFnZW50LlJlY29yZFR5 cGUuUmVnaXN0ZXJBbmltYXRpb25GcmFtZUNhbGxiYWNrOgogICAgICAgICAgICAgY2FzZSBXZWJJ bnNwZWN0b3IuVGltZWxpbmVBZ2VudC5SZWNvcmRUeXBlLkNhbmNlbEFuaW1hdGlvbkZyYW1lQ2Fs bGJhY2s6Ci0gICAgICAgICAgICAgICAgcmV0dXJuIHRoaXMuc3RhY2tUcmFjZSA/IHRoaXMuX3Bh bmVsLl9saW5raWZ5Q2FsbEZyYW1lKHRoaXMuc3RhY2tUcmFjZVswXSkgOiB0aGlzLmRhdGEuaWQ7 CisgICAgICAgICAgICAgICAgcmV0dXJuIHRoaXMuc3RhY2tUcmFjZSA/IHRoaXMuX2xpbmtpZnlD YWxsRnJhbWUodGhpcy5zdGFja1RyYWNlWzBdKSA6IHRoaXMuZGF0YS5pZDsKICAgICAgICAgICAg IGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lQWdlbnQuUmVjb3JkVHlwZS5QYXJzZUhUTUw6CiAg ICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZUFnZW50LlJlY29yZFR5cGUuUmVj YWxjdWxhdGVTdHlsZXM6Ci0gICAgICAgICAgICAgICAgcmV0dXJuIHRoaXMuc3RhY2tUcmFjZSA/ IHRoaXMuX3BhbmVsLl9saW5raWZ5Q2FsbEZyYW1lKHRoaXMuc3RhY2tUcmFjZVswXSkgOiBudWxs OworICAgICAgICAgICAgICAgIHJldHVybiB0aGlzLnN0YWNrVHJhY2UgPyB0aGlzLl9saW5raWZ5 Q2FsbEZyYW1lKHRoaXMuc3RhY2tUcmFjZVswXSkgOiBudWxsOwogICAgICAgICAgICAgY2FzZSBX ZWJJbnNwZWN0b3IuVGltZWxpbmVBZ2VudC5SZWNvcmRUeXBlLkV2YWx1YXRlU2NyaXB0OgotICAg ICAgICAgICAgICAgIHJldHVybiB0aGlzLnVybCA/IHRoaXMuX3BhbmVsLl9saW5raWZ5TG9jYXRp b24odGhpcy51cmwsIHRoaXMuZGF0YS5saW5lTnVtYmVyLCAwKSA6IG51bGw7CisgICAgICAgICAg ICAgICAgcmV0dXJuIHRoaXMudXJsID8gdGhpcy5fbGlua2lmeUxvY2F0aW9uKHRoaXMudXJsLCB0 aGlzLmRhdGEubGluZU51bWJlciwgMCkgOiBudWxsOwogICAgICAgICAgICAgY2FzZSBXZWJJbnNw ZWN0b3IuVGltZWxpbmVBZ2VudC5SZWNvcmRUeXBlLlhIUlJlYWR5U3RhdGVDaGFuZ2U6CiAgICAg ICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZUFnZW50LlJlY29yZFR5cGUuWEhSTG9h ZDoKICAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lQWdlbnQuUmVjb3JkVHlw ZS5TY2hlZHVsZVJlc291cmNlUmVxdWVzdDoKQEAgLTExODcsNiArMTE3MSwxOSBAQCBXZWJJbnNw ZWN0b3IuVGltZWxpbmVQYW5lbC5Gb3JtYXR0ZWRSZWNvcmQucHJvdG90eXBlID0gewogICAgICAg ICB9CiAgICAgfSwKIAorICAgIF9saW5raWZ5TG9jYXRpb246IGZ1bmN0aW9uKHVybCwgbGluZU51 bWJlciwgY29sdW1uTnVtYmVyKQorICAgIHsKKyAgICAgICAgLy8gRklYTUUoNjI3MjUpOiBzdGFj ayB0cmFjZSBsaW5lL2NvbHVtbiBudW1iZXJzIGFyZSBvbmUtYmFzZWQuCisgICAgICAgIGxpbmVO dW1iZXIgPSBsaW5lTnVtYmVyID8gbGluZU51bWJlciAtIDEgOiBsaW5lTnVtYmVyOworICAgICAg ICBjb2x1bW5OdW1iZXIgPSBjb2x1bW5OdW1iZXIgPyBjb2x1bW5OdW1iZXIgLSAxIDogMDsKKyAg ICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5kZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmxpbmtp ZnlMb2NhdGlvbih1cmwsIGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlciwgInRpbWVsaW5lLWRldGFp bHMiKTsKKyAgICB9LAorCisgICAgX2xpbmtpZnlDYWxsRnJhbWU6IGZ1bmN0aW9uKGNhbGxGcmFt ZSkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9saW5raWZ5TG9jYXRpb24oY2FsbEZyYW1l LnVybCwgY2FsbEZyYW1lLmxpbmVOdW1iZXIsIGNhbGxGcmFtZS5jb2x1bW5OdW1iZXIpOworICAg IH0sCisKICAgICBfY2FsY3VsYXRlQWdncmVnYXRlZFN0YXRzOiBmdW5jdGlvbihjYXRlZ29yaWVz KQogICAgIHsKICAgICAgICAgdGhpcy5fYWdncmVnYXRlZFN0YXRzID0ge307CkBAIC0xMjA3LDkg KzEyMDQsOCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5Gb3JtYXR0ZWRSZWNvcmQucHJv dG90eXBlID0gewogICAgIH0KIH0KIAotV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwuUG9wdXBD b250ZW50SGVscGVyID0gZnVuY3Rpb24odGl0bGUsIHBhbmVsKQorV2ViSW5zcGVjdG9yLlRpbWVs aW5lUGFuZWwuUG9wdXBDb250ZW50SGVscGVyID0gZnVuY3Rpb24odGl0bGUpCiB7Ci0gICAgdGhp cy5fcGFuZWwgPSBwYW5lbDsKICAgICB0aGlzLl9jb250ZW50VGFibGUgPSBkb2N1bWVudC5jcmVh dGVFbGVtZW50KCJ0YWJsZSIpOzsKICAgICB2YXIgdGl0bGVDZWxsID0gdGhpcy5fY3JlYXRlQ2Vs bChXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIiVzIC0gRGV0YWlscyIsIHRpdGxlKSwgInRpbWVsaW5l LWRldGFpbHMtdGl0bGUiKTsKICAgICB0aXRsZUNlbGwuY29sU3BhbiA9IDI7CkBAIC0xMjU1LDcg KzEyNTEsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5Qb3B1cENvbnRlbnRIZWxwZXIu cHJvdG90eXBlID0gewogCiAgICAgX2FwcGVuZExpbmtSb3c6IGZ1bmN0aW9uKHRpdGxlLCBzY3Jp cHROYW1lLCBzY3JpcHRMaW5lKQogICAgIHsKLSAgICAgICAgdmFyIGxpbmsgPSB0aGlzLl9wYW5l bC5fbGlua2lmeUxvY2F0aW9uKHNjcmlwdE5hbWUsIHNjcmlwdExpbmUsIDAsICJ0aW1lbGluZS1k ZXRhaWxzIik7CisgICAgICAgIHZhciBsaW5rID0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwu Rm9ybWF0dGVkUmVjb3JkLnByb3RvdHlwZS5fbGlua2lmeUxvY2F0aW9uKHNjcmlwdE5hbWUsIHNj cmlwdExpbmUsIDAsICJ0aW1lbGluZS1kZXRhaWxzIik7CiAgICAgICAgIHRoaXMuX2FwcGVuZEVs ZW1lbnRSb3codGl0bGUsIGxpbmspOwogICAgIH0sCiAKQEAgLTEyNzAsNyArMTI2Niw3IEBAIFdl Ykluc3BlY3Rvci5UaW1lbGluZVBhbmVsLlBvcHVwQ29udGVudEhlbHBlci5wcm90b3R5cGUgPSB7 CiAgICAgICAgICAgICByb3cuYXBwZW5kQ2hpbGQodGhpcy5fY3JlYXRlQ2VsbChzdGFja0ZyYW1l LmZ1bmN0aW9uTmFtZSA/IHN0YWNrRnJhbWUuZnVuY3Rpb25OYW1lIDogV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCIoYW5vbnltb3VzIGZ1bmN0aW9uKSIpLCAidGltZWxpbmUtZnVuY3Rpb24tbmFtZSIp KTsKICAgICAgICAgICAgIHJvdy5hcHBlbmRDaGlsZCh0aGlzLl9jcmVhdGVDZWxsKCIgQCAiKSk7 CiAgICAgICAgICAgICB2YXIgbGlua0NlbGwgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJ0ZCIp OwotICAgICAgICAgICAgdmFyIHVybEVsZW1lbnQgPSB0aGlzLl9wYW5lbC5fbGlua2lmeUNhbGxG cmFtZShzdGFja0ZyYW1lKTsKKyAgICAgICAgICAgIHZhciB1cmxFbGVtZW50ID0gV2ViSW5zcGVj dG9yLlRpbWVsaW5lUGFuZWwuRm9ybWF0dGVkUmVjb3JkLnByb3RvdHlwZS5fbGlua2lmeUNhbGxG cmFtZShzdGFja0ZyYW1lKTsKICAgICAgICAgICAgIGxpbmtDZWxsLmFwcGVuZENoaWxkKHVybEVs ZW1lbnQpOwogICAgICAgICAgICAgcm93LmFwcGVuZENoaWxkKGxpbmtDZWxsKTsKICAgICAgICAg ICAgIGZyYW1lc1RhYmxlLmFwcGVuZENoaWxkKHJvdyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dlYktpdC5xcmMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1dlYktpdC5xcmMKaW5kZXggZjJjMjExM2YzYTM3YmY3OWFlMGQ1MDhj N2MyNjM4MGYzZjFlYTc5OC4uNTJhYzkzNDI0M2IwYTlmYjViNDIwMWQ3M2Q3MWY2NjhhYmQyNDZj NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9XZWJLaXQu cXJjCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYwpA QCAtMzYsNyArMzYsNiBAQAogICAgIDxmaWxlPkRhdGFHcmlkLmpzPC9maWxlPgogICAgIDxmaWxl PkRlYnVnZ2VyTW9kZWwuanM8L2ZpbGU+CiAgICAgPGZpbGU+RGVidWdnZXJQcmVzZW50YXRpb25N b2RlbC5qczwvZmlsZT4KLSAgICA8ZmlsZT5MaW5raWZpZXIuanM8L2ZpbGU+CiAgICAgPGZpbGU+ RE9NQWdlbnQuanM8L2ZpbGU+CiAgICAgPGZpbGU+RE9NQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5q czwvZmlsZT4KICAgICA8ZmlsZT5ET01TdG9yYWdlLmpzPC9maWxlPgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbCBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWwKaW5kZXggMjlhNDRhODU5 NzMyNTI2Y2UwNjM4ZTUyM2U3NGVmZDQ4MTU0NDE4MC4uODViMTdhYWNlMWM5NzZmY2IxMzZkYzgz NjFhZmQzYTYxNGVhZGVmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9pbnNwZWN0b3IuaHRtbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL2luc3BlY3Rvci5odG1sCkBAIC0xNTgsNyArMTU4LDYgQEAgVEhJUyBTT0ZUV0FSRSwg RVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAgICA8 c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJEZXRhaWxlZEhlYXBzaG90Vmlldy5q cyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iRGVi dWdnZXJNb2RlbC5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3Jp cHQiIHNyYz0iRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcyI+PC9zY3JpcHQ+Ci0gICAgPHNj cmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iTGlua2lmaWVyLmpzIj48L3NjcmlwdD4K ICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJCcmVha3BvaW50TWFuYWdl ci5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0i VUlTb3VyY2VDb2RlLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNj cmlwdCIgc3JjPSJDb250ZW50UHJvdmlkZXJzLmpzIj48L3NjcmlwdD4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXggZTI3NjA2MzdjYTZk NTY3Y2UyMTZiNjJjYzVlNzFmMDlkOGVlZTA2MC4uOWI4ZmJlNWYzMzNkNDQ4NDY2NWNlYTEyNmEz M2EyMTIxNjY0MmE5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9pbnNwZWN0b3IuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9pbnNwZWN0b3IuanMKQEAgLTUwOSw5ICs1MDksNiBAQCBXZWJJbnNwZWN0b3IuZG9Mb2FkZWRE b25lID0gZnVuY3Rpb24oKQogICAgIHRoaXMuY29uc29sZS5hZGRFdmVudExpc3RlbmVyKFdlYklu c3BlY3Rvci5Db25zb2xlTW9kZWwuRXZlbnRzLk1lc3NhZ2VBZGRlZCwgdGhpcy5fdXBkYXRlRXJy b3JBbmRXYXJuaW5nQ291bnRzLCB0aGlzKTsKICAgICB0aGlzLmNvbnNvbGUuYWRkRXZlbnRMaXN0 ZW5lcihXZWJJbnNwZWN0b3IuQ29uc29sZU1vZGVsLkV2ZW50cy5SZXBlYXRDb3VudFVwZGF0ZWQs IHRoaXMuX3VwZGF0ZUVycm9yQW5kV2FybmluZ0NvdW50cywgdGhpcyk7CiAKLSAgICB0aGlzLmRl YnVnZ2VyTW9kZWwgPSBuZXcgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwoKTsKLSAgICB0aGlz LmRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwgPSBuZXcgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJl c2VudGF0aW9uTW9kZWwoKTsKLQogICAgIHRoaXMuZHJhd2VyID0gbmV3IFdlYkluc3BlY3Rvci5E cmF3ZXIoKTsKICAgICB0aGlzLmNvbnNvbGVWaWV3ID0gbmV3IFdlYkluc3BlY3Rvci5Db25zb2xl VmlldygpOwogCkBAIC01MjQsNiArNTIxLDggQEAgV2ViSW5zcGVjdG9yLmRvTG9hZGVkRG9uZSA9 IGZ1bmN0aW9uKCkKICAgICBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVySW5zcGVjdG9yRGlzcGF0 Y2hlcih0aGlzKTsKIAogICAgIHRoaXMuY3NzTW9kZWwgPSBuZXcgV2ViSW5zcGVjdG9yLkNTU1N0 eWxlTW9kZWwoKTsKKyAgICB0aGlzLmRlYnVnZ2VyTW9kZWwgPSBuZXcgV2ViSW5zcGVjdG9yLkRl YnVnZ2VyTW9kZWwoKTsKKyAgICB0aGlzLmRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwgPSBuZXcg V2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwoKTsKIAogICAgIHRoaXMuc2Vh cmNoQ29udHJvbGxlciA9IG5ldyBXZWJJbnNwZWN0b3IuU2VhcmNoQ29udHJvbGxlcigpOwogCg==