69527 2011-10-06 08:05:37 -0700 Web Inspector: extract DOMPresentation, make EventListenersSidebar compile 2011-10-06 09:21:20 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 479162 0 pfeldman 2011-10-06 08:05:37 -0700 Patch to follow. 479163 1 109961 pfeldman 2011-10-06 08:11:42 -0700 Created attachment 109961 Patch 479186 2 109961 yurys 2011-10-06 08:58:33 -0700 Comment on attachment 109961 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=109961&action=review > Source/WebCore/inspector/front-end/DOMPresentation.js:32 > +WebInspector.DOMPresentation = {} I'd rather call it DOMPresentationUtils 479200 3 pfeldman 2011-10-06 09:21:20 -0700 Committed r96816: <http://trac.webkit.org/changeset/96816> 109961 2011-10-06 08:11:42 -0700 2011-10-06 08:58:33 -0700 Patch bug-69527-20111006191135.patch text/plain 25149 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTY4MDcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1MDFlYzU5YjQ2Yjc5MWMx ODhkYzJkMWZhZTM3YjZkOWY5NGY0ZWY1Li4zMzQwZGNkMDk1YjUwM2QyMjVlMGVlYTFhYjlmZDlm MjU4MDhlYmFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDEgQEAKIDIwMTEtMTAtMDYgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6 IGV4dHJhY3QgRE9NUHJlc2VudGF0aW9uLCBtYWtlIEV2ZW50TGlzdGVuZXJzU2lkZWJhciBjb21w aWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTUy NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5l dyB0ZXN0cy4gKE9PUFMhKQorCisgICAgICAgICogV2ViQ29yZS5neXBpOgorICAgICAgICAqIFdl YkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qOgorICAgICAgICAqIGluc3BlY3Rvci9jb21waWxl LWZyb250LWVuZC5zaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50Lmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTU5vZGUucHJvdG90eXBlLm5vZGVOYW1lSW5Db3Jy ZWN0Q2FzZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NTm9kZS5wcm90b3R5cGUubW92ZVRv KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01Ob2RlLnByb3RvdHlwZS5pc1hNTE5vZGUpOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRE9NQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50c1NpZGViYXJQYW5lLnByb3Rv dHlwZS5fc2V0QnJlYWtwb2ludCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9ET01Q cmVzZW50YXRpb24uanM6IEFkZGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVByZXNlbnRh dGlvbi5kZWNvcmF0ZU5vZGVMYWJlbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NUHJlc2Vu dGF0aW9uLmxpbmtpZnlOb2RlUmVmZXJlbmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01Q cmVzZW50YXRpb24ubGlua2lmeU5vZGVCeUlkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL0VsZW1lbnRzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5l bC5wcm90b3R5cGUudXBkYXRlQnJlYWRjcnVtYik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1l bnRzVHJlZU91dGxpbmUucHJvdG90eXBlLnNldCByb290RE9NTm9kZSk6CisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9FdmVudExpc3RlbmVyc1NpZGViYXJQYW5lLmpzOgorICAgICAgICAq IGluc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UHJvcGVydGllc1NlY3Rpb24uanM6CisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9wZXJ0aWVzU2VjdGlvbi5qczoKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL1NlY3Rpb24uanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZXNT aWRlYmFyUGFuZS5wcm90b3R5cGUuX3JlYnVpbGRTdHlsZVJ1bGVzKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5TdHlsZXNTaWRlYmFyUGFuZS5wcm90b3R5cGUuX3JlYnVpbGRTZWN0aW9uc0ZvclN0 eWxlUnVsZXMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYzoKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1sOgorCisyMDExLTEwLTA2 ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KKwogICAgICAgICBXZWIgSW5z cGVjdG9yOiBhZGQgYWxsIFJlc291cmNlIHBhbmVsIHZpZXdzIHRvIHRoZSBjb21waWxhdGlvbi4K ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5NTI2CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaSBiL1NvdXJjZS9XZWJDb3Jl L1dlYkNvcmUuZ3lwaQppbmRleCBhNWVlNWRlM2RhYjYyMGQ3ZGM0NDhiM2RjMTZkNzkzNzQ3ZDQz OWY3Li5kZTJmMzRlNTk4NTUyOTZlNjIyNjM4YTZiZDQyN2ZmOTUwZDNlNTBjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29y ZS5neXBpCkBAIC02MjQ3LDYgKzYyNDcsNyBAQAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9u dC1lbmQvRGV0YWlsZWRIZWFwc2hvdFZpZXcuanMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9m cm9udC1lbmQvRE9NQWdlbnQuanMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQv RE9NQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5qcycsCisgICAgICAgICAgICAnaW5zcGVjdG9yL2Zy b250LWVuZC9ET01QcmVzZW50YXRpb24uanMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9u dC1lbmQvRE9NU3RvcmFnZS5qcycsCiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9E T01TdG9yYWdlSXRlbXNWaWV3LmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5k L0RPTVN5bnRheEhpZ2hsaWdodGVyLmpzJywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dl YkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3By b2ovV2ViQ29yZS52Y3Byb2oKaW5kZXggMjVkNzBjN2E1NDg5NDYyY2QwZGY2OTRjMjMyZWZkMmM1 ZTNlMzM5NC4uOTJjNWM3OTdjYjQ4MWRkMDBlMDM5YTBjOGI5NTUyNzhlOThkNTMxMCAxMDA3NTUK LS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2oKKysrIGIv U291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2oKQEAgLTY5MjYxLDYg KzY5MjYxLDEwIEBACiAJCQkJCT4KIAkJCQk8L0ZpbGU+CiAJCQkJPEZpbGUKKwkJCQkJUmVsYXRp dmVQYXRoPSIuLlxpbnNwZWN0b3JcZnJvbnQtZW5kXERPTVByZXNlbnRhdGlvbi5qcyIKKwkJCQkJ PgorCQkJCTwvRmlsZT4KKwkJCQk8RmlsZQogCQkJCQlSZWxhdGl2ZVBhdGg9Ii4uXGluc3BlY3Rv clxmcm9udC1lbmRcRE9NQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5qcyIKIAkJCQkJPgogCQkJCTwv RmlsZT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9jb21waWxlLWZyb250 LWVuZC5zaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9jb21waWxlLWZyb250LWVuZC5zaApp bmRleCA3YmRlYzQyNzJiOWYyOTBiY2IzMzZkNzA5YTU1NmQyZjI3MGE1NmM3Li45MDI0NDFiOTVm MWUwMWE4ODg5NDA3YmEzMmY4NGJmOTZhNTJmYmIzIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQuc2gKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5kLnNoCkBAIC0xMDcsMTQgKzEwNywxNiBAQCBqYXZhIC1q YXIgfi9jbG9zdXJlL2NvbXBpbGVyLmphciAtLWNvbXBpbGF0aW9uX2xldmVsIFNJTVBMRV9PUFRJ TUlaQVRJT05TIC0td2FybgogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvVUlVdGlscy5qcyBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9WaWV3LmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1dlbGNvbWVWaWV3LmpzIFwKLSAgICAtLW1vZHVsZSBqc21vZHVsZV9p bnNwZWN0b3I6MjQ6anNtb2R1bGVfc2RrLGpzbW9kdWxlX3VpIFwKKyAgICAtLW1vZHVsZSBqc21v ZHVsZV9pbnNwZWN0b3I6MjY6anNtb2R1bGVfc2RrLGpzbW9kdWxlX3VpIFwKICAgICAgICAgLS1q cyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVNZXNzYWdlLmpzIFwK ICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVW aWV3LmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0Nvb2tpZUl0ZW1zVmlldy5qcyBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9EYXRhYmFzZVF1ZXJ5Vmlldy5qcyBcCiAgICAgICAgIC0tanMgU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EYXRhYmFzZVRhYmxlVmlldy5qcyBcCisgICAg ICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01QcmVzZW50YXRp b24uanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RE9NU3RvcmFnZUl0ZW1zVmlldy5qcyBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzIFwKKyAgICAgICAgLS1qcyBT b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V2ZW50TGlzdGVuZXJzU2lkZWJhclBh bmUuanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv Rm9udFZpZXcuanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvSW1hZ2VWaWV3LmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0phdmFTY3JpcHRDb250ZXh0TWFuYWdlci5qcyBcCkBAIC0xMzYsMTEgKzEz OCwxMiBAQCBqYXZhIC1qYXIgfi9jbG9zdXJlL2NvbXBpbGVyLmphciAtLWNvbXBpbGF0aW9uX2xl dmVsIFNJTVBMRV9PUFRJTUlaQVRJT05TIC0td2FybgogIyBUbyBiZSBjb21waWxlZC4uLgogIwog IyBbRWxlbWVudHNdCi0jIERPTUJyZWFrcG9pbnRzU2lkZWJhclBhbmUKKyMKICMgRWxlbWVudHNQ YW5lbAotIyBFdmVudExpc3RlbmVyc1NpZGViYXJQYW5lCisjIEJyZWFrcG9pbnRzU2lkZWJhclBh bmUKICMgTWV0cmljc1NpZGViYXJQYW5lCiAjIFN0eWxlc1NpZGViYXJQYW5lCisjIERPTUJyZWFr cG9pbnRzU2lkZWJhclBhbmUKICMKICMgW1Jlc291cmNlc10KICMgUmVzb3VyY2VzUGFuZWwKQEAg LTE1Niw3ICsxNTksNiBAQCBqYXZhIC1qYXIgfi9jbG9zdXJlL2NvbXBpbGVyLmphciAtLWNvbXBp bGF0aW9uX2xldmVsIFNJTVBMRV9PUFRJTUlaQVRJT05TIC0td2FybgogIyBTY3JpcHRGb3JtYXR0 ZXJXb3JrZXIKICMgU2NyaXB0c1BhbmVsCiAjIFdhdGNoRXhwcmVzc2lvbnNTaWRlYmFyUGFuZQot IyBCcmVha3BvaW50c1NpZGViYXJQYW5lCiAjIENhbGxTdGFja1NpZGViYXJQYW5lCiAjCiAjIFtU aW1lbGluZV0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RE9NQWdlbnQuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50 LmpzCmluZGV4IGJmMGQ3MDM2NDIxMTYzZTEwMmMzOGE2ZjgxMmQyYzYxOTNjY2I2OWMuLmMzMjdl YzQ5Y2NhNDk2MzgwNDZmMTFkZDUzODFiNzYzZmI4NTUwNWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanMKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qcwpAQCAtMTA1LDYgKzEwNSwxMSBAQCBX ZWJJbnNwZWN0b3IuRE9NTm9kZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0aGlzLl9u b2RlTmFtZTsKICAgICB9LAogCisgICAgbm9kZU5hbWVJbkNvcnJlY3RDYXNlOiBmdW5jdGlvbigp CisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5pc1hNTE5vZGUoKSA/IHRoaXMubm9kZU5hbWUo KSA6IHRoaXMubm9kZU5hbWUoKS50b0xvd2VyQ2FzZSgpOworICAgIH0sCisKICAgICBzZXROb2Rl TmFtZTogZnVuY3Rpb24obmFtZSwgY2FsbGJhY2spCiAgICAgewogICAgICAgICBET01BZ2VudC5z ZXROb2RlTmFtZSh0aGlzLmlkLCBuYW1lLCBjYWxsYmFjayk7CkBAIC0zNjQsNiArMzY5LDExIEBA IFdlYkluc3BlY3Rvci5ET01Ob2RlLnByb3RvdHlwZSA9IHsKICAgICBtb3ZlVG86IGZ1bmN0aW9u KHRhcmdldE5vZGUsIGFuY2hvck5vZGUsIGNhbGxiYWNrKQogICAgIHsKICAgICAgICAgRE9NQWdl bnQubW92ZVRvKHRoaXMuaWQsIHRhcmdldE5vZGUuaWQsIGFuY2hvck5vZGUgPyBhbmNob3JOb2Rl LmlkIDogdW5kZWZpbmVkLCBjYWxsYmFjayk7CisgICAgfSwKKworICAgIGlzWE1MTm9kZTogZnVu Y3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMub3duZXJEb2N1bWVudCAmJiAhIXRo aXMub3duZXJEb2N1bWVudC54bWxWZXJzaW9uOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01CcmVha3BvaW50c1NpZGViYXJQYW5l LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01CcmVha3BvaW50c1Np ZGViYXJQYW5lLmpzCmluZGV4IDE3YjQ4Y2YwYmEyNDNhNmQ0NjJhMzc2OGJkMzY0OGUyYzAzOGI3 ZTYuLmI4YjgxM2ZhNTQzYjljYWRjZWZlZDliZmFjOWZjMzZhZjU4ZjBkZTAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NQnJlYWtwb2ludHNTaWRlYmFy UGFuZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUJyZWFr cG9pbnRzU2lkZWJhclBhbmUuanMKQEAgLTEwNSwxMSArMTA1LDExIEBAIFdlYkluc3BlY3Rvci5E T01CcmVha3BvaW50c1NpZGViYXJQYW5lLnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHZh ciBtZXNzYWdlOwogICAgICAgICB2YXIgdHlwZUxhYmVsID0gdGhpcy5fYnJlYWtwb2ludFR5cGVM YWJlbHNbYXV4RGF0YS50eXBlXTsKLSAgICAgICAgdmFyIGxpbmtpZmllZE5vZGUgPSBXZWJJbnNw ZWN0b3IucGFuZWxzLmVsZW1lbnRzLmxpbmtpZnlOb2RlQnlJZChhdXhEYXRhLm5vZGVJZCk7Cisg ICAgICAgIHZhciBsaW5raWZpZWROb2RlID0gV2ViSW5zcGVjdG9yLkRPTVByZXNlbnRhdGlvbi5s aW5raWZ5Tm9kZUJ5SWQoYXV4RGF0YS5ub2RlSWQpOwogICAgICAgICB2YXIgc3Vic3RpdHV0aW9u cyA9IFt0eXBlTGFiZWwsIGxpbmtpZmllZE5vZGVdOwogICAgICAgICB2YXIgdGFyZ2V0Tm9kZSA9 ICIiOwogICAgICAgICBpZiAodGFyZ2V0Tm9kZUlkKQotICAgICAgICAgICAgdGFyZ2V0Tm9kZSA9 IFdlYkluc3BlY3Rvci5wYW5lbHMuZWxlbWVudHMubGlua2lmeU5vZGVCeUlkKHRhcmdldE5vZGVJ ZCk7CisgICAgICAgICAgICB0YXJnZXROb2RlID0gV2ViSW5zcGVjdG9yLkRPTVByZXNlbnRhdGlv bi5saW5raWZ5Tm9kZUJ5SWQodGFyZ2V0Tm9kZUlkKTsKIAogICAgICAgICBpZiAoYXV4RGF0YS50 eXBlID09PSB0aGlzLl9icmVha3BvaW50VHlwZXMuU3VidHJlZU1vZGlmaWVkKSB7CiAgICAgICAg ICAgICBpZiAoYXV4RGF0YS5pbnNlcnRpb24pIHsKQEAgLTE4NSw3ICsxODUsNyBAQCBXZWJJbnNw ZWN0b3IuRE9NQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZh ciBsYWJlbEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7CiAgICAgICAg IGVsZW1lbnQuYXBwZW5kQ2hpbGQobGFiZWxFbGVtZW50KTsKIAotICAgICAgICB2YXIgbGlua2lm aWVkTm9kZSA9IFdlYkluc3BlY3Rvci5wYW5lbHMuZWxlbWVudHMubGlua2lmeU5vZGVCeUlkKG5v ZGUuaWQpOworICAgICAgICB2YXIgbGlua2lmaWVkTm9kZSA9IFdlYkluc3BlY3Rvci5ET01QcmVz ZW50YXRpb24ubGlua2lmeU5vZGVCeUlkKG5vZGUuaWQpOwogICAgICAgICBsaW5raWZpZWROb2Rl LmFkZFN0eWxlQ2xhc3MoIm1vbm9zcGFjZSIpOwogICAgICAgICBsYWJlbEVsZW1lbnQuYXBwZW5k Q2hpbGQobGlua2lmaWVkTm9kZSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvRE9NUHJlc2VudGF0aW9uLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9ET01QcmVzZW50YXRpb24uanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMzExNTdmZmNiMDAz YjA4YTNmZjdiMGZjM2JkOTI1NTRkMzJmZjNmYQotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NUHJlc2VudGF0aW9uLmpzCkBAIC0wLDAgKzEs OTggQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTEgR29vZ2xlIEluYy4gIEFsbCByaWdodHMg cmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDcsIDIwMDggQXBwbGUgSW5jLiAgQWxsIHJp Z2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAwOCBNYXR0IExpbGVrIDx3ZWJraXRA bWF0dGxpbGVrLmNvbT4KKyAqIENvcHlyaWdodCAoQykgMjAwOSBKb3NlcGggUGVjb3Jhcm8KKyAq CisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3 aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0 aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqCisgKiAxLiAgUmVk aXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmln aHQKKyAqICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93 aW5nIGRpc2NsYWltZXIuCisgKiAyLiAgUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11 c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgICBub3RpY2UsIHRoaXMgbGlz dCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAg ICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhl IGRpc3RyaWJ1dGlvbi4KKyAqIDMuICBOZWl0aGVyIHRoZSBuYW1lIG9mIEFwcGxlIENvbXB1dGVy LCBJbmMuICgiQXBwbGUiKSBub3IgdGhlIG5hbWVzIG9mCisgKiAgICAgaXRzIGNvbnRyaWJ1dG9y cyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMgZGVyaXZlZAorICog ICAgIGZyb20gdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVy bWlzc2lvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIEFORCBJ VFMgQ09OVFJJQlVUT1JTICJBUyBJUyIgQU5EIEFOWQorICogRVhQUkVTUyBPUiBJTVBMSUVEIFdB UlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRAorICog V0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxB UiBQVVJQT1NFIEFSRQorICogRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgT1Ig SVRTIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWQorICogRElSRUNULCBJTkRJUkVDVCwg SU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMK KyAqIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJ VFVURSBHT09EUyBPUiBTRVJWSUNFUzsKKyAqIExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRT OyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORAorICogT04gQU5Z IFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJ VFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJ TkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRgorICogVEhJUyBTT0ZUV0FSRSwgRVZFTiBJ RiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCitXZWJJ bnNwZWN0b3IuRE9NUHJlc2VudGF0aW9uID0ge30KKworV2ViSW5zcGVjdG9yLkRPTVByZXNlbnRh dGlvbi5kZWNvcmF0ZU5vZGVMYWJlbCA9IGZ1bmN0aW9uKG5vZGUsIHBhcmVudEVsZW1lbnQpCit7 CisgICAgdmFyIHRpdGxlID0gbm9kZS5ub2RlTmFtZUluQ29ycmVjdENhc2UoKTsKKworICAgIHZh ciBuYW1lRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKKyAgICBuYW1l RWxlbWVudC50ZXh0Q29udGVudCA9IHRpdGxlOworICAgIHBhcmVudEVsZW1lbnQuYXBwZW5kQ2hp bGQobmFtZUVsZW1lbnQpOworCisgICAgdmFyIGlkQXR0cmlidXRlID0gbm9kZS5nZXRBdHRyaWJ1 dGUoImlkIik7CisgICAgaWYgKGlkQXR0cmlidXRlKSB7CisgICAgICAgIHZhciBpZEVsZW1lbnQg PSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7CisgICAgICAgIHBhcmVudEVsZW1lbnQu YXBwZW5kQ2hpbGQoaWRFbGVtZW50KTsKKworICAgICAgICB2YXIgcGFydCA9ICIjIiArIGlkQXR0 cmlidXRlOworICAgICAgICB0aXRsZSArPSBwYXJ0OworICAgICAgICBpZEVsZW1lbnQuYXBwZW5k Q2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUocGFydCkpOworCisgICAgICAgIC8vIE1hcmsg dGhlIG5hbWUgYXMgZXh0cmEsIHNpbmNlIHRoZSBJRCBpcyBtb3JlIGltcG9ydGFudC4KKyAgICAg ICAgbmFtZUVsZW1lbnQuY2xhc3NOYW1lID0gImV4dHJhIjsKKyAgICB9CisKKyAgICB2YXIgY2xh c3NBdHRyaWJ1dGUgPSBub2RlLmdldEF0dHJpYnV0ZSgiY2xhc3MiKTsKKyAgICBpZiAoY2xhc3NB dHRyaWJ1dGUpIHsKKyAgICAgICAgdmFyIGNsYXNzZXMgPSBjbGFzc0F0dHJpYnV0ZS5zcGxpdCgv XHMrLyk7CisgICAgICAgIHZhciBmb3VuZENsYXNzZXMgPSB7fTsKKworICAgICAgICBpZiAoY2xh c3Nlcy5sZW5ndGgpIHsKKyAgICAgICAgICAgIHZhciBjbGFzc2VzRWxlbWVudCA9IGRvY3VtZW50 LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKKyAgICAgICAgICAgIGNsYXNzZXNFbGVtZW50LmNsYXNz TmFtZSA9ICJleHRyYSI7CisgICAgICAgICAgICBwYXJlbnRFbGVtZW50LmFwcGVuZENoaWxkKGNs YXNzZXNFbGVtZW50KTsKKworICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBjbGFzc2Vz Lmxlbmd0aDsgKytpKSB7CisgICAgICAgICAgICAgICAgdmFyIGNsYXNzTmFtZSA9IGNsYXNzZXNb aV07CisgICAgICAgICAgICAgICAgaWYgKGNsYXNzTmFtZSAmJiAhKGNsYXNzTmFtZSBpbiBmb3Vu ZENsYXNzZXMpKSB7CisgICAgICAgICAgICAgICAgICAgIHZhciBwYXJ0ID0gIi4iICsgY2xhc3NO YW1lOworICAgICAgICAgICAgICAgICAgICB0aXRsZSArPSBwYXJ0OworICAgICAgICAgICAgICAg ICAgICBjbGFzc2VzRWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZShw YXJ0KSk7CisgICAgICAgICAgICAgICAgICAgIGZvdW5kQ2xhc3Nlc1tjbGFzc05hbWVdID0gdHJ1 ZTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9Cisg ICAgcGFyZW50RWxlbWVudC50aXRsZSA9IHRpdGxlOworfQorCitXZWJJbnNwZWN0b3IuRE9NUHJl c2VudGF0aW9uLmxpbmtpZnlOb2RlUmVmZXJlbmNlID0gZnVuY3Rpb24obm9kZSkKK3sKKyAgICB2 YXIgbGluayA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKKyAgICBsaW5rLmNsYXNz TmFtZSA9ICJub2RlLWxpbmsiOworICAgIFdlYkluc3BlY3Rvci5ET01QcmVzZW50YXRpb24uZGVj b3JhdGVOb2RlTGFiZWwobm9kZSwgbGluayk7CisKKyAgICBsaW5rLmFkZEV2ZW50TGlzdGVuZXIo ImNsaWNrIiwgV2ViSW5zcGVjdG9yLmRvbUFnZW50Lmluc3BlY3RFbGVtZW50LmJpbmQoV2ViSW5z cGVjdG9yLmRvbUFnZW50LCBub2RlLmlkKSwgZmFsc2UpOworICAgIGxpbmsuYWRkRXZlbnRMaXN0 ZW5lcigibW91c2VvdmVyIiwgV2ViSW5zcGVjdG9yLmRvbUFnZW50LmhpZ2hsaWdodERPTU5vZGUu YmluZChXZWJJbnNwZWN0b3IuZG9tQWdlbnQsIG5vZGUuaWQsICIiKSwgZmFsc2UpOworICAgIGxp bmsuYWRkRXZlbnRMaXN0ZW5lcigibW91c2VvdXQiLCBXZWJJbnNwZWN0b3IuZG9tQWdlbnQuaGlk ZURPTU5vZGVIaWdobGlnaHQuYmluZChXZWJJbnNwZWN0b3IuZG9tQWdlbnQpLCBmYWxzZSk7CisK KyAgICByZXR1cm4gbGluazsKK30KKworV2ViSW5zcGVjdG9yLkRPTVByZXNlbnRhdGlvbi5saW5r aWZ5Tm9kZUJ5SWQgPSBmdW5jdGlvbihub2RlSWQpCit7CisgICAgdmFyIG5vZGUgPSBXZWJJbnNw ZWN0b3IuZG9tQWdlbnQubm9kZUZvcklkKG5vZGVJZCk7CisgICAgaWYgKCFub2RlKQorICAgICAg ICByZXR1cm4gZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCI8 bm9kZT4iKSk7CisgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5ET01QcmVzZW50YXRpb24ubGlua2lm eU5vZGVSZWZlcmVuY2Uobm9kZSk7Cit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwuanMKaW5kZXggNGFjNjY5NzBiZWMyMmY0NDE1ZTcy MWRhMGMyMzI4Mzc1ZmVlOGU5NS4uMjYwODU0OTAxZTE1NmU4ZmQ2NzcwNzVmZTM0ZDFlZjk0ZmM3 ZDhlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVt ZW50c1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxl bWVudHNQYW5lbC5qcwpAQCAtNTI2LDcgKzUyNiw3IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1Bh bmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHZhciBjcnVtYlRpdGxlOwogICAgICAgICAg ICAgc3dpdGNoIChjdXJyZW50Lm5vZGVUeXBlKCkpIHsKICAgICAgICAgICAgICAgICBjYXNlIE5v ZGUuRUxFTUVOVF9OT0RFOgotICAgICAgICAgICAgICAgICAgICB0aGlzLmRlY29yYXRlTm9kZUxh YmVsKGN1cnJlbnQsIGNydW1iKTsKKyAgICAgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLkRP TVByZXNlbnRhdGlvbi5kZWNvcmF0ZU5vZGVMYWJlbChjdXJyZW50LCBjcnVtYik7CiAgICAgICAg ICAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgICAgICAgICAgY2FzZSBOb2RlLlRFWFRfTk9E RToKQEAgLTU0Miw3ICs1NDIsNyBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5 cGUgPSB7CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgICAgICAgICAgZGVm YXVsdDoKLSAgICAgICAgICAgICAgICAgICAgY3J1bWJUaXRsZSA9IHRoaXMudHJlZU91dGxpbmUu bm9kZU5hbWVUb0NvcnJlY3RDYXNlKGN1cnJlbnQubm9kZU5hbWUoKSk7CisgICAgICAgICAgICAg ICAgICAgIGNydW1iVGl0bGUgPSBjdXJyZW50Lm5vZGVOYW1lSW5Db3JyZWN0Q2FzZSgpOwogICAg ICAgICAgICAgfQogCiAgICAgICAgICAgICBpZiAoIWNydW1iLmNoaWxkTm9kZXMubGVuZ3RoKSB7 CkBAIC01NjgsNzIgKzU2OCw2IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVsLnByb3RvdHlw ZSA9IHsKICAgICAgICAgdGhpcy51cGRhdGVCcmVhZGNydW1iU2l6ZXMoKTsKICAgICB9LAogCi0g ICAgZGVjb3JhdGVOb2RlTGFiZWw6IGZ1bmN0aW9uKG5vZGUsIHBhcmVudEVsZW1lbnQpCi0gICAg ewotICAgICAgICB2YXIgdGl0bGUgPSB0aGlzLnRyZWVPdXRsaW5lLm5vZGVOYW1lVG9Db3JyZWN0 Q2FzZShub2RlLm5vZGVOYW1lKCkpOwotCi0gICAgICAgIHZhciBuYW1lRWxlbWVudCA9IGRvY3Vt ZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKLSAgICAgICAgbmFtZUVsZW1lbnQudGV4dENvbnRl bnQgPSB0aXRsZTsKLSAgICAgICAgcGFyZW50RWxlbWVudC5hcHBlbmRDaGlsZChuYW1lRWxlbWVu dCk7Ci0KLSAgICAgICAgdmFyIGlkQXR0cmlidXRlID0gbm9kZS5nZXRBdHRyaWJ1dGUoImlkIik7 Ci0gICAgICAgIGlmIChpZEF0dHJpYnV0ZSkgewotICAgICAgICAgICAgdmFyIGlkRWxlbWVudCA9 IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKLSAgICAgICAgICAgIHBhcmVudEVsZW1l bnQuYXBwZW5kQ2hpbGQoaWRFbGVtZW50KTsKLQotICAgICAgICAgICAgdmFyIHBhcnQgPSAiIyIg KyBpZEF0dHJpYnV0ZTsKLSAgICAgICAgICAgIHRpdGxlICs9IHBhcnQ7Ci0gICAgICAgICAgICBp ZEVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUocGFydCkpOwotCi0g ICAgICAgICAgICAvLyBNYXJrIHRoZSBuYW1lIGFzIGV4dHJhLCBzaW5jZSB0aGUgSUQgaXMgbW9y ZSBpbXBvcnRhbnQuCi0gICAgICAgICAgICBuYW1lRWxlbWVudC5jbGFzc05hbWUgPSAiZXh0cmEi OwotICAgICAgICB9Ci0KLSAgICAgICAgdmFyIGNsYXNzQXR0cmlidXRlID0gbm9kZS5nZXRBdHRy aWJ1dGUoImNsYXNzIik7Ci0gICAgICAgIGlmIChjbGFzc0F0dHJpYnV0ZSkgewotICAgICAgICAg ICAgdmFyIGNsYXNzZXMgPSBjbGFzc0F0dHJpYnV0ZS5zcGxpdCgvXHMrLyk7Ci0gICAgICAgICAg ICB2YXIgZm91bmRDbGFzc2VzID0ge307Ci0KLSAgICAgICAgICAgIGlmIChjbGFzc2VzLmxlbmd0 aCkgewotICAgICAgICAgICAgICAgIHZhciBjbGFzc2VzRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0 ZUVsZW1lbnQoInNwYW4iKTsKLSAgICAgICAgICAgICAgICBjbGFzc2VzRWxlbWVudC5jbGFzc05h bWUgPSAiZXh0cmEiOwotICAgICAgICAgICAgICAgIHBhcmVudEVsZW1lbnQuYXBwZW5kQ2hpbGQo Y2xhc3Nlc0VsZW1lbnQpOwotCi0gICAgICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBj bGFzc2VzLmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICAgICAgICAgIHZhciBjbGFzc05hbWUg PSBjbGFzc2VzW2ldOwotICAgICAgICAgICAgICAgICAgICBpZiAoY2xhc3NOYW1lICYmICEoY2xh c3NOYW1lIGluIGZvdW5kQ2xhc3NlcykpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIHZhciBw YXJ0ID0gIi4iICsgY2xhc3NOYW1lOwotICAgICAgICAgICAgICAgICAgICAgICAgdGl0bGUgKz0g cGFydDsKLSAgICAgICAgICAgICAgICAgICAgICAgIGNsYXNzZXNFbGVtZW50LmFwcGVuZENoaWxk KGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKHBhcnQpKTsKLSAgICAgICAgICAgICAgICAgICAgICAg IGZvdW5kQ2xhc3Nlc1tjbGFzc05hbWVdID0gdHJ1ZTsKLSAgICAgICAgICAgICAgICAgICAgfQot ICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIH0KLSAgICAgICAgfQotICAgICAgICBwYXJl bnRFbGVtZW50LnRpdGxlID0gdGl0bGU7Ci0gICAgfSwKLQotICAgIGxpbmtpZnlOb2RlUmVmZXJl bmNlOiBmdW5jdGlvbihub2RlKQotICAgIHsKLSAgICAgICAgdmFyIGxpbmsgPSBkb2N1bWVudC5j cmVhdGVFbGVtZW50KCJzcGFuIik7Ci0gICAgICAgIGxpbmsuY2xhc3NOYW1lID0gIm5vZGUtbGlu ayI7Ci0gICAgICAgIHRoaXMuZGVjb3JhdGVOb2RlTGFiZWwobm9kZSwgbGluayk7Ci0KLSAgICAg ICAgbGluay5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMucmV2ZWFsQW5kU2VsZWN0Tm9k ZS5iaW5kKHRoaXMsIG5vZGUuaWQpLCBmYWxzZSk7Ci0gICAgICAgIGxpbmsuYWRkRXZlbnRMaXN0 ZW5lcigibW91c2VvdmVyIiwgV2ViSW5zcGVjdG9yLmRvbUFnZW50LmhpZ2hsaWdodERPTU5vZGUu YmluZChXZWJJbnNwZWN0b3IuZG9tQWdlbnQsIG5vZGUuaWQsICIiKSwgZmFsc2UpOwotICAgICAg ICBsaW5rLmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlb3V0IiwgV2ViSW5zcGVjdG9yLmRvbUFnZW50 LmhpZGVET01Ob2RlSGlnaGxpZ2h0LmJpbmQoV2ViSW5zcGVjdG9yLmRvbUFnZW50KSwgZmFsc2Up OwotCi0gICAgICAgIHJldHVybiBsaW5rOwotICAgIH0sCi0KLSAgICBsaW5raWZ5Tm9kZUJ5SWQ6 IGZ1bmN0aW9uKG5vZGVJZCkKLSAgICB7Ci0gICAgICAgIHZhciBub2RlID0gV2ViSW5zcGVjdG9y LmRvbUFnZW50Lm5vZGVGb3JJZChub2RlSWQpOwotICAgICAgICBpZiAoIW5vZGUpCi0gICAgICAg ICAgICByZXR1cm4gZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCI8bm9kZT4iKSk7Ci0gICAgICAgIHJldHVybiB0aGlzLmxpbmtpZnlOb2RlUmVmZXJlbmNlKG5v ZGUpOwotICAgIH0sCi0KICAgICB1cGRhdGVCcmVhZGNydW1iU2l6ZXM6IGZ1bmN0aW9uKGZvY3Vz ZWRDcnVtYikKICAgICB7CiAgICAgICAgIGlmICghdGhpcy52aXNpYmxlKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5l LmpzCmluZGV4IDgxMTE4MDc4YTM0YjQ1OTgxYWY5Y2VmYWQ4NzAxMTczYmY3OTEzYTUuLjlmY2I5 MmYzMDkxYzQ3MWYzMWVhNzVkMDdkYzg5ZmZiNjkyNGFjYmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMK QEAgLTExMCw3ICsxMTAsNyBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlT3V0bGluZS5wcm90 b3R5cGUgPSB7CiAKICAgICAgICAgdGhpcy5fcm9vdERPTU5vZGUgPSB4OwogCi0gICAgICAgIHRo aXMuX2lzWE1MTWltZVR5cGUgPSB4ICYmICEheC54bWxWZXJzaW9uOworICAgICAgICB0aGlzLl9p c1hNTE1pbWVUeXBlID0geCAmJiB4LmlzWE1MTm9kZSgpOwogCiAgICAgICAgIHRoaXMudXBkYXRl KCk7CiAgICAgfSwKQEAgLTEyMCwxMSArMTIwLDYgQEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJl ZU91dGxpbmUucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gdGhpcy5faXNYTUxNaW1lVHlw ZTsKICAgICB9LAogCi0gICAgbm9kZU5hbWVUb0NvcnJlY3RDYXNlOiBmdW5jdGlvbihub2RlTmFt ZSkKLSAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLmlzWE1MTWltZVR5cGUgPyBub2RlTmFtZSA6 IG5vZGVOYW1lLnRvTG93ZXJDYXNlKCk7Ci0gICAgfSwKLQogICAgIHNlbGVjdGVkRE9NTm9kZTog ZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX3NlbGVjdGVkRE9NTm9kZTsK QEAgLTE1MzMsNyArMTUyOCw3IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVFbGVtZW50LnBy b3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICBicmVhazsKIAogICAgICAgICAgICAgY2FzZSBO b2RlLkVMRU1FTlRfTk9ERToKLSAgICAgICAgICAgICAgICB2YXIgdGFnTmFtZSA9IHRoaXMudHJl ZU91dGxpbmUubm9kZU5hbWVUb0NvcnJlY3RDYXNlKG5vZGUubm9kZU5hbWUoKSk7CisgICAgICAg ICAgICAgICAgdmFyIHRhZ05hbWUgPSBub2RlLm5vZGVOYW1lSW5Db3JyZWN0Q2FzZSgpOwogICAg ICAgICAgICAgICAgIGlmICh0aGlzLl9lbGVtZW50Q2xvc2VUYWcpIHsKICAgICAgICAgICAgICAg ICAgICAgdGhpcy5fYnVpbGRUYWdET00oaW5mby50aXRsZURPTSwgdGFnTmFtZSwgdHJ1ZSwgdHJ1 ZSk7CiAgICAgICAgICAgICAgICAgICAgIGluZm8uaGFzQ2hpbGRyZW4gPSBmYWxzZTsKQEAgLTE2 MTMsNyArMTYwOCw3IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVFbGVtZW50LnByb3RvdHlw ZSA9IHsKICAgICAgICAgICAgICAgICBjZGF0YUVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQu Y3JlYXRlVGV4dE5vZGUoIjwhW0NEQVRBWyIgKyBub2RlLm5vZGVWYWx1ZSgpICsgIl1dPiIpKTsK ICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAg ICAgICAgdmFyIGRlZmF1bHRFbGVtZW50ID0gaW5mby50aXRsZURPTS5hcHBlbmRDaGlsZChkb2N1 bWVudC5jcmVhdGVUZXh0Tm9kZSh0aGlzLnRyZWVPdXRsaW5lLm5vZGVOYW1lVG9Db3JyZWN0Q2Fz ZShub2RlLm5vZGVOYW1lKCkpLmNvbGxhcHNlV2hpdGVzcGFjZSgpKSk7CisgICAgICAgICAgICAg ICAgdmFyIGRlZmF1bHRFbGVtZW50ID0gaW5mby50aXRsZURPTS5hcHBlbmRDaGlsZChkb2N1bWVu dC5jcmVhdGVUZXh0Tm9kZShub2RlLm5vZGVOYW1lSW5Db3JyZWN0Q2FzZSgpLmNvbGxhcHNlV2hp dGVzcGFjZSgpKSk7CiAgICAgICAgIH0KIAogICAgICAgICByZXR1cm4gaW5mbzsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXZlbnRMaXN0ZW5lcnNTaWRl YmFyUGFuZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXZlbnRMaXN0 ZW5lcnNTaWRlYmFyUGFuZS5qcwppbmRleCA3OTVlNmIxOGQ1MTNjNGYxNGViYmIyY2E2NTg1MTVl Yzk2MGU0MWRjLi4yYjRhMWZkYTgxZTRjYWVjMzUxNTZlNWQ0MDdlZDFiNmZkYTZiYTUxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V2ZW50TGlzdGVuZXJz U2lkZWJhclBhbmUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9F dmVudExpc3RlbmVyc1NpZGViYXJQYW5lLmpzCkBAIC0yNyw2ICsyNywxMCBAQAogICogVEhJUyBT T0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFH RS4KICAqLwogCisvKioKKyAqIEBjb25zdHJ1Y3RvcgorICogQGV4dGVuZHMge1dlYkluc3BlY3Rv ci5TaWRlYmFyUGFuZX0KKyAqLwogV2ViSW5zcGVjdG9yLkV2ZW50TGlzdGVuZXJzU2lkZWJhclBh bmUgPSBmdW5jdGlvbigpCiB7CiAgICAgV2ViSW5zcGVjdG9yLlNpZGViYXJQYW5lLmNhbGwodGhp cywgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJFdmVudCBMaXN0ZW5lcnMiKSk7CkBAIC0xMjgsNiAr MTMyLDEwIEBAIFdlYkluc3BlY3Rvci5FdmVudExpc3RlbmVyc1NpZGViYXJQYW5lLnByb3RvdHlw ZSA9IHsKIAogV2ViSW5zcGVjdG9yLkV2ZW50TGlzdGVuZXJzU2lkZWJhclBhbmUucHJvdG90eXBl Ll9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5TaWRlYmFyUGFuZS5wcm90b3R5cGU7CiAKKy8qKgor ICogQGNvbnN0cnVjdG9yCisgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLlByb3BlcnRpZXNTZWN0 aW9ufQorICovCiBXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5lcnNTZWN0aW9uID0gZnVuY3Rpb24o dGl0bGUsIG5vZGVJZCwgbGlua2lmaWVyKQogewogICAgIHRoaXMuZXZlbnRMaXN0ZW5lcnMgPSBb XTsKQEAgLTE3NiwxMSArMTg0LDE2IEBAIFdlYkluc3BlY3Rvci5FdmVudExpc3RlbmVyc1NlY3Rp b24ucHJvdG90eXBlID0gewogCiBXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5lcnNTZWN0aW9uLnBy b3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuUHJvcGVydGllc1NlY3Rpb24ucHJvdG90 eXBlOwogCisvKioKKyAqIEBjb25zdHJ1Y3RvcgorICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5P YmplY3RQcm9wZXJ0aWVzU2VjdGlvbn0KKyAqLwogV2ViSW5zcGVjdG9yLkV2ZW50TGlzdGVuZXJC YXIgPSBmdW5jdGlvbihldmVudExpc3RlbmVyLCBub2RlSWQsIGxpbmtpZmllcikKIHsKKyAgICBX ZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydGllc1NlY3Rpb24uY2FsbCh0aGlzKTsKKwogICAgIHRo aXMuZXZlbnRMaXN0ZW5lciA9IGV2ZW50TGlzdGVuZXI7CiAgICAgdGhpcy5fbm9kZUlkID0gbm9k ZUlkOwotICAgIFdlYkluc3BlY3Rvci5PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbi5jYWxsKHRoaXMp OwogICAgIHRoaXMuX3NldE5vZGVUaXRsZSgpOwogICAgIHRoaXMuX3NldEZ1bmN0aW9uU3VidGl0 bGUobGlua2lmaWVyKTsKICAgICB0aGlzLmVkaXRhYmxlID0gZmFsc2U7CkBAIC0yMzMsNyArMjQ2 LDcgQEAgV2ViSW5zcGVjdG9yLkV2ZW50TGlzdGVuZXJCYXIucHJvdG90eXBlID0gewogICAgICAg ICB9CiAKICAgICAgICAgdGhpcy50aXRsZUVsZW1lbnQucmVtb3ZlQ2hpbGRyZW4oKTsKLSAgICAg ICAgdGhpcy50aXRsZUVsZW1lbnQuYXBwZW5kQ2hpbGQoV2ViSW5zcGVjdG9yLnBhbmVscy5lbGVt ZW50cy5saW5raWZ5Tm9kZVJlZmVyZW5jZSh0aGlzLmV2ZW50TGlzdGVuZXIubm9kZSkpOworICAg ICAgICB0aGlzLnRpdGxlRWxlbWVudC5hcHBlbmRDaGlsZChXZWJJbnNwZWN0b3IuRE9NUHJlc2Vu dGF0aW9uLmxpbmtpZnlOb2RlUmVmZXJlbmNlKHRoaXMuZXZlbnRMaXN0ZW5lci5ub2RlKSk7CiAg ICAgfSwKIAogICAgIF9zZXRGdW5jdGlvblN1YnRpdGxlOiBmdW5jdGlvbihsaW5raWZpZXIpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdFByb3Bl cnRpZXNTZWN0aW9uLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9PYmpl Y3RQcm9wZXJ0aWVzU2VjdGlvbi5qcwppbmRleCBjZDEyYzk2ODhiNTc4ZTY3OTcyZTdiZGI0Zjdm OWQ4MGYyMWVjNWRkLi4yZGViZjE4YTIzZDAyMDEyOTBkM2RkMmU2NTA5NDc2YmFhNjQ2NGMyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdFByb3Bl cnRpZXNTZWN0aW9uLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv T2JqZWN0UHJvcGVydGllc1NlY3Rpb24uanMKQEAgLTI3LDYgKzI3LDcgQEAKIC8qKgogICogQGNv bnN0cnVjdG9yCiAgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLlByb3BlcnRpZXNTZWN0aW9ufQor ICogQHBhcmFtIHsqPX0gb2JqZWN0CiAgKiBAcGFyYW0ge3N0cmluZz19IHRpdGxlCiAgKiBAcGFy YW0ge3N0cmluZz19IHN1YnRpdGxlCiAgKiBAcGFyYW0ge3N0cmluZz19IGVtcHR5UGxhY2Vob2xk ZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvcGVy dGllc1NlY3Rpb24uanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb3Bl cnRpZXNTZWN0aW9uLmpzCmluZGV4IGQ3YWMwYmNiNmMxOGViMzJkYmNiZmIwNWEwYTc2MWE4NjA1 YjY3Y2MuLjkzNWUyYmFhMjFkMGI1MmU5MDgyMGVkN2FlMjQ1ODUwOTdjMzczNWUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvcGVydGllc1NlY3Rpb24u anMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9wZXJ0aWVzU2Vj dGlvbi5qcwpAQCAtMzAsNiArMzAsNyBAQAogLyoqCiAgKiBAY29uc3RydWN0b3IKICAqIEBleHRl bmRzIHtXZWJJbnNwZWN0b3IuU2VjdGlvbn0KKyAqIEBwYXJhbSB7c3RyaW5nPX0gc3VidGl0bGUK ICAqLwogV2ViSW5zcGVjdG9yLlByb3BlcnRpZXNTZWN0aW9uID0gZnVuY3Rpb24odGl0bGUsIHN1 YnRpdGxlKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TZWN0aW9uLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZWN0aW9u LmpzCmluZGV4IDg1NWI3YzFlZGUzMzQ5MzdiNjkxZDAyZjUwN2I5MzIwYjllNzgwNjMuLjYzNDZj ZmEyYmJjZTcwYTY2NjM1YzcwODJlZDA0NTZhN2VmNjllNDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2VjdGlvbi5qcworKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NlY3Rpb24uanMKQEAgLTI5LDYgKzI5LDcgQEAKIAogLyoq CiAgKiBAY29uc3RydWN0b3IKKyAqIEBwYXJhbSB7c3RyaW5nPX0gc3VidGl0bGUKICAqLwogV2Vi SW5zcGVjdG9yLlNlY3Rpb24gPSBmdW5jdGlvbih0aXRsZSwgc3VidGl0bGUpCiB7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5l LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFu ZS5qcwppbmRleCA3MmQ2N2UyZGVmNTdkMjc0NzRmZDIyNGExM2IxZjZkNDFhY2JiZWEyLi5lNjBh ZDAzNmIyMDUyZDk0NDYyNjk1OWQ3NTY4NGNmZjRlOTM1ZjM2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMKQEAg LTM4OCw3ICszODgsNyBAQCBXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUucHJvdG90eXBl ID0gewogICAgICAgICB7CiAgICAgICAgICAgICBmb3IgKHZhciBuYW1lIGluIHN0eWxlcy5zdHls ZUF0dHJpYnV0ZXMpIHsKICAgICAgICAgICAgICAgICB2YXIgYXR0clN0eWxlID0geyBzdHlsZTog c3R5bGVzLnN0eWxlQXR0cmlidXRlc1tuYW1lXSwgZWRpdGFibGU6IGZhbHNlIH07Ci0gICAgICAg ICAgICAgICAgYXR0clN0eWxlLnNlbGVjdG9yVGV4dCA9IFdlYkluc3BlY3Rvci5wYW5lbHMuZWxl bWVudHMudHJlZU91dGxpbmUubm9kZU5hbWVUb0NvcnJlY3RDYXNlKG5vZGUubm9kZU5hbWUoKSkg KyAiWyIgKyBuYW1lOworICAgICAgICAgICAgICAgIGF0dHJTdHlsZS5zZWxlY3RvclRleHQgPSBu b2RlLm5vZGVOYW1lSW5Db3JyZWN0Q2FzZSgpICsgIlsiICsgbmFtZTsKICAgICAgICAgICAgICAg ICBpZiAobm9kZS5nZXRBdHRyaWJ1dGUobmFtZSkpCiAgICAgICAgICAgICAgICAgICAgIGF0dHJT dHlsZS5zZWxlY3RvclRleHQgKz0gIj0iICsgbm9kZS5nZXRBdHRyaWJ1dGUobmFtZSk7CiAgICAg ICAgICAgICAgICAgYXR0clN0eWxlLnNlbGVjdG9yVGV4dCArPSAiXSI7CkBAIC01NzMsNyArNTcz LDcgQEAgV2ViSW5zcGVjdG9yLlN0eWxlc1NpZGViYXJQYW5lLnByb3RvdHlwZSA9IHsKICAgICAg ICAgICAgICAgICB2YXIgc2VwYXJhdG9yRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo ImRpdiIpOwogICAgICAgICAgICAgICAgIHNlcGFyYXRvckVsZW1lbnQuY2xhc3NOYW1lID0gInN0 eWxlcy1zaWRlYmFyLXNlcGFyYXRvciI7CiAgICAgICAgICAgICAgICAgaWYgKHN0eWxlUnVsZS5u b2RlKSB7Ci0gICAgICAgICAgICAgICAgICAgIHZhciBsaW5rID0gV2ViSW5zcGVjdG9yLnBhbmVs cy5lbGVtZW50cy5saW5raWZ5Tm9kZVJlZmVyZW5jZShzdHlsZVJ1bGUubm9kZSk7CisgICAgICAg ICAgICAgICAgICAgIHZhciBsaW5rID0gV2ViSW5zcGVjdG9yLkRPTVByZXNlbnRhdGlvbi5saW5r aWZ5Tm9kZVJlZmVyZW5jZShzdHlsZVJ1bGUubm9kZSk7CiAgICAgICAgICAgICAgICAgICAgIHNl cGFyYXRvckVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJJbmhlcml0ZWQgZnJvbSIpICsgIiAiKSk7CiAgICAgICAgICAgICAg ICAgICAgIHNlcGFyYXRvckVsZW1lbnQuYXBwZW5kQ2hpbGQobGluayk7CiAgICAgICAgICAgICAg ICAgICAgIGlmICghc2VjdGlvbnMuaW5oZXJpdGVkUHJvcGVydGllc1NlcGFyYXRvckVsZW1lbnQp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dlYktpdC5x cmMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dlYktpdC5xcmMKaW5kZXgg NzgzMzFlOWNlOGI1OTFkYzdkMmFkYjE4YzkwODZmZDJlZTUyZjE4Ny4uMzZiNWVjODI2MjJiZTRh YWQ1NWEzZTJjZjE3MDRkMmIyYzE4MDRkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9XZWJLaXQucXJjCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvV2ViS2l0LnFyYwpAQCAtMzksNiArMzksNyBAQAogICAgIDxmaWxlPkRlYnVn Z2VyUHJlc2VudGF0aW9uTW9kZWwuanM8L2ZpbGU+CiAgICAgPGZpbGU+RE9NQWdlbnQuanM8L2Zp bGU+CiAgICAgPGZpbGU+RE9NQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5qczwvZmlsZT4KKyAgICA8 ZmlsZT5ET01QcmVzZW50YXRpb24uanM8L2ZpbGU+CiAgICAgPGZpbGU+RE9NU3RvcmFnZS5qczwv ZmlsZT4KICAgICA8ZmlsZT5ET01TdG9yYWdlSXRlbXNWaWV3LmpzPC9maWxlPgogICAgIDxmaWxl PkRPTVN5bnRheEhpZ2hsaWdodGVyLmpzPC9maWxlPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbCBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWwKaW5kZXggYzYyYjA0NWZkZWU3ZmM2Yzli NjQ5NThlNWM1MDY2ZjI1YmFkZGUzNi4uYTIwYTY3MDU2YjFhMGFjYTM3NTBkMjFkMGEyMDMxYzQ3 ODlkOTNmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9p bnNwZWN0b3IuaHRtbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2lu c3BlY3Rvci5odG1sCkBAIC04NCw2ICs4NCw3IEBAIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURW SVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgICAgPHNjcmlwdCB0eXBl PSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iU2NyaXB0LmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0 IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJTaWRlYmFyUGFuZS5qcyI+PC9zY3JpcHQ+CiAg ICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iRWxlbWVudHNUcmVlT3V0bGlu ZS5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0i RE9NUHJlc2VudGF0aW9uLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2 YXNjcmlwdCIgc3JjPSJTaWRlYmFyVHJlZUVsZW1lbnQuanMiPjwvc2NyaXB0PgogICAgIDxzY3Jp cHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IlNlY3Rpb24uanMiPjwvc2NyaXB0PgogICAg IDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IlByb3BlcnRpZXNTZWN0aW9uLmpz Ij48L3NjcmlwdD4K