206818 2020-01-26 23:17:50 -0800 Web Inspector: Sources: add a special breakpoint for controlling whether `debugger` statements pause 2020-02-05 18:20:15 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Local Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi commit-queue ews-watchlist hi inspector-bugzilla-changes joepeck keith_miller mark.lam msaboff saam timothy tzagallo webkit-bug-importer oldest_to_newest 1611314 0 hi 2020-01-26 23:17:50 -0800 This is useful in situations where the developer wants to use breakpoints set by the UI, but ignore those in code, as those in code are much harder to change than from the UI (e.g. updating a server). 1611315 1 388833 hi 2020-01-26 23:19:00 -0800 Created attachment 388833 Patch 1611316 2 ews-watchlist 2020-01-26 23:19:58 -0800 This patch modifies the inspector protocol. Please ensure that any frontend changes appropriately use feature checks for new protocol features. 1615468 3 388833 commit-queue 2020-02-05 18:19:17 -0800 Comment on attachment 388833 Patch Clearing flags on attachment: 388833 Committed r255887: <https://trac.webkit.org/changeset/255887> 1615469 4 commit-queue 2020-02-05 18:19:19 -0800 All reviewed patches have been landed. Closing bug. 1615472 5 webkit-bug-importer 2020-02-05 18:20:15 -0800 <rdar://problem/59210441> 388833 2020-01-26 23:19:00 -0800 2020-02-05 18:19:17 -0800 Patch bug-206818-20200126231900.patch text/plain 26714 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGYzNjQ1YzMyOGQ1OTFjMDJiMGM3NWI1MjhkOWIz MjQ4ZGNhNGNjNTguLjQzNjk0ZTdkYzBiOTRlNTAyNGMxNWE2ZTNiYWRiYTQ5N2VhYWZmNmEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIwLTAxLTI3ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBT b3VyY2VzOiBhZGQgYSBzcGVjaWFsIGJyZWFrcG9pbnQgZm9yIGNvbnRyb2xsaW5nIHdoZXRoZXIg YGRlYnVnZ2VyYCBzdGF0ZW1lbnRzIHBhdXNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMDY4MTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9wcm90b2NvbC9EZWJ1Z2dlci5qc29uOgor ICAgICAgICAqIGluc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oOgorICAg ICAgICAqIGluc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHA6CisgICAg ICAgIChJbnNwZWN0b3I6Okluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OnNldFBhdXNlT25EZWJ1Z2dl clN0YXRlbWVudHMpOiBBZGRlZC4KKworICAgICAgICAqIGJ5dGVjb21waWxlci9Ob2Rlc0NvZGVn ZW4uY3BwOgorICAgICAgICAoSlNDOjpEZWJ1Z2dlclN0YXRlbWVudE5vZGU6OmVtaXRCeXRlY29k ZSk6CisgICAgICAgICogYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcDoKKyAgICAgICAgKEpTQzo6Q29k ZUJsb2NrOjpmaW5pc2hDcmVhdGlvbik6CisgICAgICAgICogYnl0ZWNvZGUvVW5saW5rZWRDb2Rl QmxvY2suY3BwOgorICAgICAgICAoSlNDOjpkdW1wTGluZUNvbHVtbkVudHJ5KToKKyAgICAgICAg KiBpbnRlcnByZXRlci9JbnRlcnByZXRlci5oOgorICAgICAgICAqIGludGVycHJldGVyL0ludGVy cHJldGVyLmNwcDoKKyAgICAgICAgKEpTQzo6SW50ZXJwcmV0ZXI6OmRlYnVnKToKKyAgICAgICAg KFdURjo6cHJpbnRJbnRlcm5hbCk6CisgICAgICAgICogZGVidWdnZXIvRGVidWdnZXIuaDoKKyAg ICAgICAgKEpTQzo6RGVidWdnZXI6OnNldFBhdXNlT25EZWJ1Z2dlclN0YXRlbWVudHMpOiBBZGRl ZC4KKyAgICAgICAgKiBkZWJ1Z2dlci9EZWJ1Z2dlci5jcHA6CisgICAgICAgIChKU0M6OkRlYnVn Z2VyOjpkaWRSZWFjaERlYnVnZ2VyU3RhdGVtZW50KTogQWRkZWQuCisgICAgICAgIChKU0M6OkRl YnVnZ2VyOjpkaWRSZWFjaEJyZWFrcG9pbnQpOiBEZWxldGVkLgorICAgICAgICBSZXBsYWNlIGBE ZWJ1Z0hvb2tUeXBlOjpEaWRSZWFjaEJyZWFrcG9pbnRgIHdpdGggYERlYnVnSG9va1R5cGU6OkRp ZFJlYWNoRGVidWdnZXJTdGF0ZW1lbnRgLAorICAgICAgICBhcyBpdCBpcyBvbmx5IGFjdHVhbGx5 IHVzZWQgZm9yIGBkZWJ1Z2dlcjtgIHN0YXRlbWVudHMsIG5vdCBicmVha3BvaW50cy4KKwogMjAy MC0wMS0yNiAgQWxleGV5IFNodmF5a2EgIDxzaHZhaWthbGVzaEBnbWFpbC5jb20+CiAKICAgICAg ICAgSW52YWxpZCByYW5nZXMgaW4gY2hhcmFjdGVyIGNsYXNzZXMgc2hvdWxkIGJlIGJhbm5lZCBp biB1bmljb2RlIHBhdHRlcm5zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hh bmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAwNGIxNjVjY2Fk N2M3MDJhZmJjZjhjNjEwZDhkODc1YzRiZWMxMTA5Li5jMWI0ZTZmM2I3NGQzNTVmMDgyOTljNDQw NDFmMWQyY2E1MGQ0NzI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBA QAorMjAyMC0wMS0yNyAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisKKyAgICAg ICAgV2ViIEluc3BlY3RvcjogU291cmNlczogYWRkIGEgc3BlY2lhbCBicmVha3BvaW50IGZvciBj b250cm9sbGluZyB3aGV0aGVyIGBkZWJ1Z2dlcmAgc3RhdGVtZW50cyBwYXVzZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA2ODE4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Nv bnRyb2xsZXJzL0RlYnVnZ2VyTWFuYWdlci5qczoKKyAgICAgICAgKFdJLkRlYnVnZ2VyTWFuYWdl cik6CisgICAgICAgIChXSS5EZWJ1Z2dlck1hbmFnZXIucHJvdG90eXBlLmFzeW5jIGluaXRpYWxp emVUYXJnZXQpOgorICAgICAgICAoV0kuRGVidWdnZXJNYW5hZ2VyLnByb3RvdHlwZS5nZXQgZGVi dWdnZXJTdGF0ZW1lbnRzQnJlYWtwb2ludCk6IEFkZGVkLgorICAgICAgICAoV0kuRGVidWdnZXJN YW5hZ2VyLnByb3RvdHlwZS5pc0JyZWFrcG9pbnRSZW1vdmFibGUpOgorICAgICAgICAoV0kuRGVi dWdnZXJNYW5hZ2VyLnByb3RvdHlwZS5fYnJlYWtwb2ludERpc2FibGVkU3RhdGVEaWRDaGFuZ2Up OgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VzTmF2aWdhdGlvblNpZGVi YXJQYW5lbC5qczoKKyAgICAgICAgKFdJLlNvdXJjZXNOYXZpZ2F0aW9uU2lkZWJhclBhbmVsKToK KyAgICAgICAgKFdJLlNvdXJjZXNOYXZpZ2F0aW9uU2lkZWJhclBhbmVsLnByb3RvdHlwZS5faW5z ZXJ0RGVidWdnZXJUcmVlRWxlbWVudCk6CisgICAgICAgIChXSS5Tb3VyY2VzTmF2aWdhdGlvblNp ZGViYXJQYW5lbC5wcm90b3R5cGUuX2FkZEJyZWFrcG9pbnQpOgorCisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9CcmVha3BvaW50VHJlZUVsZW1lbnQuY3NzOgorICAgICAgICAoLmJyZWFr cG9pbnQtZGVidWdnZXItc3RhdGVtZW50LWljb24gLmljb24pOiBBZGRlZC4KKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL0ltYWdlcy9EZWJ1Z2dlclN0YXRlbWVudC5zdmc6IEFkZGVkLgorCisgICAg ICAgICogTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorCiAyMDIw LTAxLTIxICBLZWl0aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXgg dHZPUyB2YWx1ZXMgaW4gU1VQUE9SVEVEX1BMQVRGT1JNUwpkaWZmIC0tZ2l0IGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcAppbmRleCBiNzc4MGMyYTRkMTlhNjQxN2Q0YmZhZTJh Yzk3ODUyY2M4NTgzYzQ4Li5iMzAxM2I2OTJjMzA1YjMwMGNmMWQ1MmU3MzViYmU1MzVmYjViODMx IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNw cAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcApAQCAt NzU3LDcgKzc1Nyw3IEBAIGJvb2wgQ29kZUJsb2NrOjpmaW5pc2hDcmVhdGlvbihWTSYgdm0sIFNj cmlwdEV4ZWN1dGFibGUqIG93bmVyRXhlY3V0YWJsZSwgVW5saW5rCiAgICAgICAgIH0KIAogICAg ICAgICBjYXNlIG9wX2RlYnVnOiB7Ci0gICAgICAgICAgICBpZiAoaW5zdHJ1Y3Rpb24tPmFzPE9w RGVidWc+KCkubV9kZWJ1Z0hvb2tUeXBlID09IERpZFJlYWNoQnJlYWtwb2ludCkKKyAgICAgICAg ICAgIGlmIChpbnN0cnVjdGlvbi0+YXM8T3BEZWJ1Zz4oKS5tX2RlYnVnSG9va1R5cGUgPT0gRGlk UmVhY2hEZWJ1Z2dlclN0YXRlbWVudCkKICAgICAgICAgICAgICAgICBtX2hhc0RlYnVnZ2VyU3Rh dGVtZW50ID0gdHJ1ZTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvVW5saW5rZWRDb2RlQmxvY2suY3BwIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1VubGlua2VkQ29kZUJsb2NrLmNwcAppbmRl eCBkZGI0MTIxMTkxZmFmN2I0MjE1MzFlOGUyZTA1MjAyNWE2MTI3ZTM5Li5hNWU2MzRjZTc4ZDUx YjIwMDNiNDRmZGI4MzhhZTA0MzA0NDM5N2YwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvYnl0ZWNvZGUvVW5saW5rZWRDb2RlQmxvY2suY3BwCisrKyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ieXRlY29kZS9VbmxpbmtlZENvZGVCbG9jay5jcHAKQEAgLTE1Niw3ICsxNTYsNyBA QCBzdGF0aWMgdm9pZCBkdW1wTGluZUNvbHVtbkVudHJ5KHNpemVfdCBpbmRleCwgY29uc3QgSW5z dHJ1Y3Rpb25TdHJlYW0mIGluc3RydWN0aQogICAgICAgICBjYXNlIFdpbGxFeGVjdXRlUHJvZ3Jh bTogZXZlbnQgPSAiIFdpbGxFeGVjdXRlUHJvZ3JhbSI7IGJyZWFrOwogICAgICAgICBjYXNlIERp ZEV4ZWN1dGVQcm9ncmFtOiBldmVudCA9ICIgRGlkRXhlY3V0ZVByb2dyYW0iOyBicmVhazsKICAg ICAgICAgY2FzZSBEaWRFbnRlckNhbGxGcmFtZTogZXZlbnQgPSAiIERpZEVudGVyQ2FsbEZyYW1l IjsgYnJlYWs7Ci0gICAgICAgIGNhc2UgRGlkUmVhY2hCcmVha3BvaW50OiBldmVudCA9ICIgRGlk UmVhY2hCcmVha3BvaW50IjsgYnJlYWs7CisgICAgICAgIGNhc2UgRGlkUmVhY2hEZWJ1Z2dlclN0 YXRlbWVudDogZXZlbnQgPSAiIERpZFJlYWNoRGVidWdnZXJTdGF0ZW1lbnQiOyBicmVhazsKICAg ICAgICAgY2FzZSBXaWxsTGVhdmVDYWxsRnJhbWU6IGV2ZW50ID0gIiBXaWxsTGVhdmVDYWxsRnJh bWUiOyBicmVhazsKICAgICAgICAgY2FzZSBXaWxsRXhlY3V0ZVN0YXRlbWVudDogZXZlbnQgPSAi IFdpbGxFeGVjdXRlU3RhdGVtZW50IjsgYnJlYWs7CiAgICAgICAgIGNhc2UgV2lsbEV4ZWN1dGVF eHByZXNzaW9uOiBldmVudCA9ICIgV2lsbEV4ZWN1dGVFeHByZXNzaW9uIjsgYnJlYWs7CmRpZmYg LS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL05vZGVzQ29kZWdlbi5j cHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL05vZGVzQ29kZWdlbi5jcHAK aW5kZXggYWI5NmQ5NTA2M2U3NzRkNTdmZDg0ZTM1MjMyYTA2ZTU5MGM3MmQ0YS4uMzk4MWY3Y2Vj MDAzNjVkMzg4YjVlYjA5MzljZjA1M2VlZWFiZjJkZCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL2J5dGVjb21waWxlci9Ob2Rlc0NvZGVnZW4uY3BwCisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvTm9kZXNDb2RlZ2VuLmNwcApAQCAtMzA1OSw3ICszMDU5 LDcgQEAgdm9pZCBFbXB0eVN0YXRlbWVudE5vZGU6OmVtaXRCeXRlY29kZShCeXRlY29kZUdlbmVy YXRvciYsIFJlZ2lzdGVySUQqKQogCiB2b2lkIERlYnVnZ2VyU3RhdGVtZW50Tm9kZTo6ZW1pdEJ5 dGVjb2RlKEJ5dGVjb2RlR2VuZXJhdG9yJiBnZW5lcmF0b3IsIFJlZ2lzdGVySUQqKQogewotICAg IGdlbmVyYXRvci5lbWl0RGVidWdIb29rKERpZFJlYWNoQnJlYWtwb2ludCwgcG9zaXRpb24oKSk7 CisgICAgZ2VuZXJhdG9yLmVtaXREZWJ1Z0hvb2soRGlkUmVhY2hEZWJ1Z2dlclN0YXRlbWVudCwg cG9zaXRpb24oKSk7CiB9CiAKIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSBFeHBy U3RhdGVtZW50Tm9kZSAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvZGVidWdnZXIvRGVidWdnZXIuY3BwIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2RlYnVnZ2VyL0RlYnVnZ2VyLmNwcAppbmRleCAzYTM3ZmE3Y2Q0M2ZlODdiMmFh OWQ1YmJkNDZkMDE1NmFjNTFmMDVmLi5kM2QzYmQxZmVhOTZmYmMzODI5MDAzNTZlODZhNjNmMGYx MWU1NWJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGVidWdnZXIvRGVidWdn ZXIuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZWJ1Z2dlci9EZWJ1Z2dlci5jcHAK QEAgLTkxNCwxMSArOTE0LDE0IEBAIHZvaWQgRGVidWdnZXI6OmNsZWFyTmV4dFBhdXNlU3RhdGUo KQogICAgIG1fYWZ0ZXJCbGFja2JveGVkU2NyaXB0ID0gZmFsc2U7CiB9CiAKLXZvaWQgRGVidWdn ZXI6OmRpZFJlYWNoQnJlYWtwb2ludChDYWxsRnJhbWUqIGNhbGxGcmFtZSkKK3ZvaWQgRGVidWdn ZXI6OmRpZFJlYWNoRGVidWdnZXJTdGF0ZW1lbnQoQ2FsbEZyYW1lKiBjYWxsRnJhbWUpCiB7CiAg ICAgaWYgKG1faXNQYXVzZWQpCiAgICAgICAgIHJldHVybjsKIAorICAgIGlmICghbV9wYXVzZU9u RGVidWdnZXJTdGF0ZW1lbnRzKQorICAgICAgICByZXR1cm47CisKICAgICBQYXVzZVJlYXNvbkRl Y2xhcmF0aW9uIHJlYXNvbigqdGhpcywgUGF1c2VkRm9yRGVidWdnZXJTdGF0ZW1lbnQpOwogICAg IG1fcGF1c2VBdE5leHRPcHBvcnR1bml0eSA9IHRydWU7CiAgICAgc2V0U3RlcHBpbmdNb2RlKFN0 ZXBwaW5nTW9kZUVuYWJsZWQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Rl YnVnZ2VyL0RlYnVnZ2VyLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGVidWdnZXIvRGVidWdn ZXIuaAppbmRleCBjZGEzODYzYTU0YThjYTc3Y2JkNmYzOTQ1ZTJlYjk1NzUyNWMzNGU0Li5mZjdh MjE5ZDRlMTg5OTEwZmI3ZTNiODllMzE1MTQwMzE3ZmQwYjQyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGVidWdnZXIvRGVidWdnZXIuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvZGVidWdnZXIvRGVidWdnZXIuaApAQCAtODksNiArODksOCBAQCBwdWJsaWM6CiAgICAg UGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSBwYXVzZU9uRXhjZXB0aW9uc1N0YXRlKCkgY29uc3QgeyBy ZXR1cm4gbV9wYXVzZU9uRXhjZXB0aW9uc1N0YXRlOyB9CiAgICAgdm9pZCBzZXRQYXVzZU9uRXhj ZXB0aW9uc1N0YXRlKFBhdXNlT25FeGNlcHRpb25zU3RhdGUpOwogCisgICAgdm9pZCBzZXRQYXVz ZU9uRGVidWdnZXJTdGF0ZW1lbnRzKGJvb2wgZW5hYmxlZCkgeyBtX3BhdXNlT25EZWJ1Z2dlclN0 YXRlbWVudHMgPSBlbmFibGVkOyB9CisKICAgICBlbnVtIFJlYXNvbkZvclBhdXNlIHsKICAgICAg ICAgTm90UGF1c2VkLAogICAgICAgICBQYXVzZWRGb3JFeGNlcHRpb24sCkBAIC0xMzIsNyArMTM0 LDcgQEAgcHVibGljOgogICAgIHZvaWQgdW53aW5kRXZlbnQoQ2FsbEZyYW1lKik7CiAgICAgdm9p ZCB3aWxsRXhlY3V0ZVByb2dyYW0oQ2FsbEZyYW1lKik7CiAgICAgdm9pZCBkaWRFeGVjdXRlUHJv Z3JhbShDYWxsRnJhbWUqKTsKLSAgICB2b2lkIGRpZFJlYWNoQnJlYWtwb2ludChDYWxsRnJhbWUq KTsKKyAgICB2b2lkIGRpZFJlYWNoRGVidWdnZXJTdGF0ZW1lbnQoQ2FsbEZyYW1lKik7CiAKICAg ICB2aXJ0dWFsIHZvaWQgcmVjb21waWxlQWxsSlNGdW5jdGlvbnMoKTsKIApAQCAtMjI2LDYgKzIy OCw3IEBAIHByaXZhdGU6CiAgICAgSGFzaE1hcDxTb3VyY2VJRCwgQmxhY2tib3hUeXBlLCBXVEY6 OkludEhhc2g8U291cmNlSUQ+LCBXVEY6OlVuc2lnbmVkV2l0aFplcm9LZXlIYXNoVHJhaXRzPFNv dXJjZUlEPj4gbV9ibGFja2JveGVkU2NyaXB0czsKIAogICAgIFBhdXNlT25FeGNlcHRpb25zU3Rh dGUgbV9wYXVzZU9uRXhjZXB0aW9uc1N0YXRlOworICAgIGJvb2wgbV9wYXVzZU9uRGVidWdnZXJT dGF0ZW1lbnRzIDogMTsKICAgICBib29sIG1fcGF1c2VBdE5leHRPcHBvcnR1bml0eSA6IDE7CiAg ICAgYm9vbCBtX3BhdXNlT25TdGVwT3V0IDogMTsKICAgICBib29sIG1fcGFzdEZpcnN0RXhwcmVz c2lvbkluU3RhdGVtZW50IDogMTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9p bnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAKaW5k ZXggNDVjZWU4NmIwMDczOWI5Nzc2Y2QzODMwNDVlY2I3NjA0NjIwOGNhOS4uYmFhZThiOTNlODll ZGNiZTgzZTc0MzM3ZGUwNjMyMmEyNWU3NmI0NyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAKKysrIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yRGVidWdnZXJB Z2VudC5jcHAKQEAgLTgzMiw2ICs4MzIsMTEgQEAgdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50 OjpkaWRCZWNvbWVJZGxlKCkKICAgICB9CiB9CiAKK3ZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2Vu dDo6c2V0UGF1c2VPbkRlYnVnZ2VyU3RhdGVtZW50cyhFcnJvclN0cmluZyYsIGJvb2wgZW5hYmxl ZCkKK3sKKyAgICBtX3NjcmlwdERlYnVnU2VydmVyLnNldFBhdXNlT25EZWJ1Z2dlclN0YXRlbWVu dHMoZW5hYmxlZCk7Cit9CisKIHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6c2V0UGF1c2VP bkV4Y2VwdGlvbnMoRXJyb3JTdHJpbmcmIGVycm9yU3RyaW5nLCBjb25zdCBTdHJpbmcmIHN0cmlu Z1BhdXNlU3RhdGUpCiB7CiAgICAgSlNDOjpEZWJ1Z2dlcjo6UGF1c2VPbkV4Y2VwdGlvbnNTdGF0 ZSBwYXVzZVN0YXRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rv ci9hZ2VudHMvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oCmluZGV4IDdhY2MxZDFk ODA3OTI5YTFlZGVjNjk5YWIwMmRlZjY1NTI3MDRlYmMuLjE2YTk3MjdmMGZkY2JiMzhmMDZhZmMy MzA1NmZhODAwZWU4ZGI3YWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNw ZWN0b3IvYWdlbnRzL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaAorKysgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmgKQEAgLTgw LDYgKzgwLDcgQEAgcHVibGljOgogICAgIHZvaWQgc2VhcmNoSW5Db250ZW50KEVycm9yU3RyaW5n JiwgY29uc3QgU3RyaW5nJiBzY3JpcHRJRCwgY29uc3QgU3RyaW5nJiBxdWVyeSwgY29uc3QgYm9v bCogb3B0aW9uYWxDYXNlU2Vuc2l0aXZlLCBjb25zdCBib29sKiBvcHRpb25hbElzUmVnZXgsIFJl ZlB0cjxKU09OOjpBcnJheU9mPFByb3RvY29sOjpHZW5lcmljVHlwZXM6OlNlYXJjaE1hdGNoPj4m KSBmaW5hbDsKICAgICB2b2lkIGdldFNjcmlwdFNvdXJjZShFcnJvclN0cmluZyYsIGNvbnN0IFN0 cmluZyYgc2NyaXB0SUQsIFN0cmluZyogc2NyaXB0U291cmNlKSBmaW5hbDsKICAgICB2b2lkIGdl dEZ1bmN0aW9uRGV0YWlscyhFcnJvclN0cmluZyYsIGNvbnN0IFN0cmluZyYgZnVuY3Rpb25JZCwg UmVmUHRyPFByb3RvY29sOjpEZWJ1Z2dlcjo6RnVuY3Rpb25EZXRhaWxzPiYpIGZpbmFsOworICAg IHZvaWQgc2V0UGF1c2VPbkRlYnVnZ2VyU3RhdGVtZW50cyhFcnJvclN0cmluZyYsIGJvb2wgZW5h YmxlZCkgZmluYWw7CiAgICAgdm9pZCBzZXRQYXVzZU9uRXhjZXB0aW9ucyhFcnJvclN0cmluZyYs IGNvbnN0IFN0cmluZyYgcGF1c2VTdGF0ZSkgZmluYWw7CiAgICAgdm9pZCBzZXRQYXVzZU9uQXNz ZXJ0aW9ucyhFcnJvclN0cmluZyYsIGJvb2wgZW5hYmxlZCkgZmluYWw7CiAgICAgdm9pZCBzZXRQ YXVzZU9uTWljcm90YXNrcyhFcnJvclN0cmluZyYsIGJvb2wgZW5hYmxlZCkgZmluYWw7CmRpZmYg LS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Byb3RvY29sL0RlYnVnZ2Vy Lmpzb24gYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Byb3RvY29sL0RlYnVnZ2Vy Lmpzb24KaW5kZXggODgyODdhMTgwZDY4MDFlZGE3MjZiNzQ1NjZjMzFiZTg1NWU0YWM0NS4uMjQ5 MGE0NTUxMWRhNWNkNGFmNTk1ODk0ODRmNDJiYWMxNmE4MDNjYyAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9wcm90b2NvbC9EZWJ1Z2dlci5qc29uCisrKyBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcHJvdG9jb2wvRGVidWdnZXIuanNvbgpAQCAt MjQ4LDYgKzI0OCwxMyBAQAogICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZGV0YWlscyIsICIk cmVmIjogIkZ1bmN0aW9uRGV0YWlscyIsICJkZXNjcmlwdGlvbiI6ICJJbmZvcm1hdGlvbiBhYm91 dCB0aGUgZnVuY3Rpb24uIiB9CiAgICAgICAgICAgICBdCiAgICAgICAgIH0sCisgICAgICAgIHsK KyAgICAgICAgICAgICJuYW1lIjogInNldFBhdXNlT25EZWJ1Z2dlclN0YXRlbWVudHMiLAorICAg ICAgICAgICAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgd2hldGhlciB0aGUgZGVidWdnZXIgcGF1 c2VzIGV4ZWN1dGlvbiBiZWZvcmUgYGRlYnVnZ2VyYCBzdGF0ZW1lbnRzLiIsCisgICAgICAgICAg ICAicGFyYW1ldGVycyI6IFsKKyAgICAgICAgICAgICAgICB7ICJuYW1lIjogImVuYWJsZWQiLCAi dHlwZSI6ICJib29sZWFuIiB9CisgICAgICAgICAgICBdCisgICAgICAgIH0sCiAgICAgICAgIHsK ICAgICAgICAgICAgICJuYW1lIjogInNldFBhdXNlT25FeGNlcHRpb25zIiwKICAgICAgICAgICAg ICJkZXNjcmlwdGlvbiI6ICJEZWZpbmVzIHBhdXNlIG9uIGV4Y2VwdGlvbnMgc3RhdGUuIENhbiBi ZSBzZXQgdG8gc3RvcCBvbiBhbGwgZXhjZXB0aW9ucywgdW5jYXVnaHQgZXhjZXB0aW9ucyBvciBu byBleGNlcHRpb25zLiBJbml0aWFsIHBhdXNlIG9uIGV4Y2VwdGlvbnMgc3RhdGUgaXMgPGNvZGU+ bm9uZTwvY29kZT4uIiwKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnBy ZXRlci9JbnRlcnByZXRlci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIv SW50ZXJwcmV0ZXIuY3BwCmluZGV4IGZmMzY4YTQ0YjczNThhZTU5NTc1MzNiM2IyN2M3Nzc0ZjNk MWRmMmUuLmJmMjk4NGExMjg5YjNhMjlhYjQyODk4OTVlNmE0Nzg5MDFiYTBkNzkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9JbnRlcnByZXRlci5jcHAKKysr IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0ludGVycHJldGVyLmNwcApAQCAt MTI1Miw4ICsxMjUyLDggQEAgTkVWRVJfSU5MSU5FIHZvaWQgSW50ZXJwcmV0ZXI6OmRlYnVnKENh bGxGcmFtZSogY2FsbEZyYW1lLCBEZWJ1Z0hvb2tUeXBlIGRlYnVnSG8KICAgICAgICAgY2FzZSBE aWRFeGVjdXRlUHJvZ3JhbToKICAgICAgICAgICAgIGRlYnVnZ2VyLT5kaWRFeGVjdXRlUHJvZ3Jh bShjYWxsRnJhbWUpOwogICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgRGlkUmVhY2hC cmVha3BvaW50OgotICAgICAgICAgICAgZGVidWdnZXItPmRpZFJlYWNoQnJlYWtwb2ludChjYWxs RnJhbWUpOworICAgICAgICBjYXNlIERpZFJlYWNoRGVidWdnZXJTdGF0ZW1lbnQ6CisgICAgICAg ICAgICBkZWJ1Z2dlci0+ZGlkUmVhY2hEZWJ1Z2dlclN0YXRlbWVudChjYWxsRnJhbWUpOwogICAg ICAgICAgICAgYnJlYWs7CiAgICAgfQogICAgIHNjb3BlLmFzc2VydE5vRXhjZXB0aW9uKCk7CkBA IC0xMjc1LDggKzEyNzUsOCBAQCB2b2lkIHByaW50SW50ZXJuYWwoUHJpbnRTdHJlYW0mIG91dCwg SlNDOjpEZWJ1Z0hvb2tUeXBlIHR5cGUpCiAgICAgY2FzZSBKU0M6OkRpZEVudGVyQ2FsbEZyYW1l OgogICAgICAgICBvdXQucHJpbnQoIkRpZEVudGVyQ2FsbEZyYW1lIik7CiAgICAgICAgIHJldHVy bjsKLSAgICBjYXNlIEpTQzo6RGlkUmVhY2hCcmVha3BvaW50OgotICAgICAgICBvdXQucHJpbnQo IkRpZFJlYWNoQnJlYWtwb2ludCIpOworICAgIGNhc2UgSlNDOjpEaWRSZWFjaERlYnVnZ2VyU3Rh dGVtZW50OgorICAgICAgICBvdXQucHJpbnQoIkRpZFJlYWNoRGVidWdnZXJTdGF0ZW1lbnQiKTsK ICAgICAgICAgcmV0dXJuOwogICAgIGNhc2UgSlNDOjpXaWxsTGVhdmVDYWxsRnJhbWU6CiAgICAg ICAgIG91dC5wcmludCgiV2lsbExlYXZlQ2FsbEZyYW1lIik7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvSW50ZXJwcmV0ZXIuaCBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9pbnRlcnByZXRlci9JbnRlcnByZXRlci5oCmluZGV4IDZmMTQ5OTc3OTEwZTY2ZWNm NmI2MzU3ZTY3NmMyNjQ4NzU3MDdhNDkuLjkwYTlkYjVjNWE5ZmIwMjU2YzU3ZDFkNmNlNDk5YTdm ZTczMWUwODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9J bnRlcnByZXRlci5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9JbnRl cnByZXRlci5oCkBAIC02Nyw3ICs2Nyw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBXaWxs RXhlY3V0ZVByb2dyYW0sCiAgICAgICAgIERpZEV4ZWN1dGVQcm9ncmFtLAogICAgICAgICBEaWRF bnRlckNhbGxGcmFtZSwKLSAgICAgICAgRGlkUmVhY2hCcmVha3BvaW50LAorICAgICAgICBEaWRS ZWFjaERlYnVnZ2VyU3RhdGVtZW50LAogICAgICAgICBXaWxsTGVhdmVDYWxsRnJhbWUsCiAgICAg ICAgIFdpbGxFeGVjdXRlU3RhdGVtZW50LAogICAgICAgICBXaWxsRXhlY3V0ZUV4cHJlc3Npb24s CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJv ai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlv bnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCAwMzhlMDY1OTM5N2MwYmYzZGZh OTI1NzNiN2U2YjkyNTIyZWYwMGRlLi43MGNjZDJiMzYxYjBkODU2NGUxNWQyZWQ5MWVhODI4MjU5 NTZlMDcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9l bi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9M b2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKQEAgLTM1MSw2ICszNTEs NyBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJEYXRlIl0gPSAiRGF0ZSI7CiBsb2NhbGl6ZWRTdHJpbmdz WyJEZWJ1ZzogIl0gPSAiRGVidWc6ICI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJEZWJ1Z2dlciBQYXVz ZWQiXSA9ICJEZWJ1Z2dlciBQYXVzZWQiOwogbG9jYWxpemVkU3RyaW5nc1siRGVidWdnZXIgU3Rh dGVtZW50Il0gPSAiRGVidWdnZXIgU3RhdGVtZW50IjsKK2xvY2FsaXplZFN0cmluZ3NbIkRlYnVn Z2VyIFN0YXRlbWVudHMiXSA9ICJEZWJ1Z2dlciBTdGF0ZW1lbnRzIjsKIGxvY2FsaXplZFN0cmlu Z3NbIkRlYnVnZ2VyIGRpc2FibGVkIGR1cmluZyBBdWRpdCJdID0gIkRlYnVnZ2VyIGRpc2FibGVk IGR1cmluZyBBdWRpdCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJEZWJ1Z2dlciBkaXNhYmxlZCBkdXJp bmcgVGltZWxpbmUgcmVjb3JkaW5nIl0gPSAiRGVidWdnZXIgZGlzYWJsZWQgZHVyaW5nIFRpbWVs aW5lIHJlY29yZGluZyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJEZWJ1Z2dpbmc6Il0gPSAiRGVidWdn aW5nOiI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9D b250cm9sbGVycy9EZWJ1Z2dlck1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Db250cm9sbGVycy9EZWJ1Z2dlck1hbmFnZXIuanMKaW5kZXggMTk4N2EwMjY5 NWUzODI5NWEyNWE4MGMwZWI5NTY0NTRlYTMxOGVmNC4uNDA5ZjY0ZjA5NDVhNjM1OWY2ODQ1ZWI3 NDQ2NmRiYjg3YjZlNzYzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvQ29udHJvbGxlcnMvRGVidWdnZXJNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RlYnVnZ2VyTWFuYWdlci5qcwpA QCAtNTUsNiArNTUsMTIgQEAgV0kuRGVidWdnZXJNYW5hZ2VyID0gY2xhc3MgRGVidWdnZXJNYW5h Z2VyIGV4dGVuZHMgV0kuT2JqZWN0CiAKICAgICAgICAgY29uc3Qgc3BlY2lhbEJyZWFrcG9pbnRM b2NhdGlvbiA9IG5ldyBXSS5Tb3VyY2VDb2RlTG9jYXRpb24obnVsbCwgSW5maW5pdHksIEluZmlu aXR5KTsKIAorICAgICAgICB0aGlzLl9kZWJ1Z2dlclN0YXRlbWVudHNCcmVha3BvaW50RW5hYmxl ZFNldHRpbmcgPSBuZXcgV0kuU2V0dGluZygiYnJlYWstb24tZGVidWdnZXItc3RhdGVtZW50cyIs IHRydWUpOworICAgICAgICB0aGlzLl9kZWJ1Z2dlclN0YXRlbWVudHNCcmVha3BvaW50ID0gbmV3 IFdJLkJyZWFrcG9pbnQoc3BlY2lhbEJyZWFrcG9pbnRMb2NhdGlvbiwgeworICAgICAgICAgICAg ZGlzYWJsZWQ6ICF0aGlzLl9kZWJ1Z2dlclN0YXRlbWVudHNCcmVha3BvaW50RW5hYmxlZFNldHRp bmcudmFsdWUsCisgICAgICAgIH0pOworICAgICAgICB0aGlzLl9kZWJ1Z2dlclN0YXRlbWVudHNC cmVha3BvaW50LnJlc29sdmVkID0gdHJ1ZTsKKwogICAgICAgICB0aGlzLl9hbGxFeGNlcHRpb25z QnJlYWtwb2ludEVuYWJsZWRTZXR0aW5nID0gbmV3IFdJLlNldHRpbmcoImJyZWFrLW9uLWFsbC1l eGNlcHRpb25zIiwgZmFsc2UpOwogICAgICAgICB0aGlzLl9hbGxFeGNlcHRpb25zQnJlYWtwb2lu dCA9IG5ldyBXSS5CcmVha3BvaW50KHNwZWNpYWxCcmVha3BvaW50TG9jYXRpb24sIHsKICAgICAg ICAgICAgIGRpc2FibGVkOiAhdGhpcy5fYWxsRXhjZXB0aW9uc0JyZWFrcG9pbnRFbmFibGVkU2V0 dGluZy52YWx1ZSwKQEAgLTE0Nyw2ICsxNTMsMTEgQEAgV0kuRGVidWdnZXJNYW5hZ2VyID0gY2xh c3MgRGVidWdnZXJNYW5hZ2VyIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgIC8vIEluaXRpYWxp emUgZ2xvYmFsIHN0YXRlLgogICAgICAgICB0YXJnZXQuRGVidWdnZXJBZ2VudC5lbmFibGUoKTsK ICAgICAgICAgdGFyZ2V0LkRlYnVnZ2VyQWdlbnQuc2V0QnJlYWtwb2ludHNBY3RpdmUodGhpcy5f YnJlYWtwb2ludHNFbmFibGVkU2V0dGluZy52YWx1ZSk7CisKKyAgICAgICAgLy8gQ09NUEFUSUJJ TElUWSAoaU9TIDEzLjEpOiBEZWJ1Z2dlci5zZXRQYXVzZU9uRGVidWdnZXJTdGF0ZW1lbnRzIGRp ZCBub3QgZXhpc3QgeWV0LgorICAgICAgICBpZiAodGFyZ2V0Lmhhc0NvbW1hbmQoIkRlYnVnZ2Vy LnNldFBhdXNlT25EZWJ1Z2dlclN0YXRlbWVudHMiKSkKKyAgICAgICAgICAgIHRhcmdldC5EZWJ1 Z2dlckFnZW50LnNldFBhdXNlT25EZWJ1Z2dlclN0YXRlbWVudHMoIXRoaXMuX2RlYnVnZ2VyU3Rh dGVtZW50c0JyZWFrcG9pbnQuZGlzYWJsZWQpOworCiAgICAgICAgIHRhcmdldC5EZWJ1Z2dlckFn ZW50LnNldFBhdXNlT25FeGNlcHRpb25zKHRoaXMuX2JyZWFrT25FeGNlcHRpb25zU3RhdGUpOwog CiAgICAgICAgIC8vIENPTVBBVElCSUxJVFkgKGlPUyAxMCk6IERlYnVnZ2VyQWdlbnQuc2V0UGF1 c2VPbkFzc2VydGlvbnMgZGlkIG5vdCBleGlzdCB5ZXQuCkBAIC0yODgsNiArMjk5LDcgQEAgV0ku RGVidWdnZXJNYW5hZ2VyID0gY2xhc3MgRGVidWdnZXJNYW5hZ2VyIGV4dGVuZHMgV0kuT2JqZWN0 CiAgICAgICAgIHJldHVybiB0YXJnZXREYXRhOwogICAgIH0KIAorICAgIGdldCBkZWJ1Z2dlclN0 YXRlbWVudHNCcmVha3BvaW50KCkgeyByZXR1cm4gdGhpcy5fZGVidWdnZXJTdGF0ZW1lbnRzQnJl YWtwb2ludDsgfQogICAgIGdldCBhbGxFeGNlcHRpb25zQnJlYWtwb2ludCgpIHsgcmV0dXJuIHRo aXMuX2FsbEV4Y2VwdGlvbnNCcmVha3BvaW50OyB9CiAgICAgZ2V0IHVuY2F1Z2h0RXhjZXB0aW9u c0JyZWFrcG9pbnQoKSB7IHJldHVybiB0aGlzLl91bmNhdWdodEV4Y2VwdGlvbnNCcmVha3BvaW50 OyB9CiAgICAgZ2V0IGFzc2VydGlvbkZhaWx1cmVzQnJlYWtwb2ludCgpIHsgcmV0dXJuIHRoaXMu X2Fzc2VydGlvbkZhaWx1cmVzQnJlYWtwb2ludDsgfQpAQCAtMzM3LDcgKzM0OSw4IEBAIFdJLkRl YnVnZ2VyTWFuYWdlciA9IGNsYXNzIERlYnVnZ2VyTWFuYWdlciBleHRlbmRzIFdJLk9iamVjdAog CiAgICAgaXNCcmVha3BvaW50UmVtb3ZhYmxlKGJyZWFrcG9pbnQpCiAgICAgewotICAgICAgICBy ZXR1cm4gYnJlYWtwb2ludCAhPT0gdGhpcy5fYWxsRXhjZXB0aW9uc0JyZWFrcG9pbnQKKyAgICAg ICAgcmV0dXJuIGJyZWFrcG9pbnQgIT09IHRoaXMuX2RlYnVnZ2VyU3RhdGVtZW50c0JyZWFrcG9p bnQKKyAgICAgICAgICAgICYmIGJyZWFrcG9pbnQgIT09IHRoaXMuX2FsbEV4Y2VwdGlvbnNCcmVh a3BvaW50CiAgICAgICAgICAgICAmJiBicmVha3BvaW50ICE9PSB0aGlzLl91bmNhdWdodEV4Y2Vw dGlvbnNCcmVha3BvaW50OwogICAgIH0KIApAQCAtMTE2MCw2ICsxMTczLDE0IEBAIFdJLkRlYnVn Z2VyTWFuYWdlciA9IGNsYXNzIERlYnVnZ2VyTWFuYWdlciBleHRlbmRzIFdJLk9iamVjdAogICAg IHsKICAgICAgICAgbGV0IGJyZWFrcG9pbnQgPSBldmVudC50YXJnZXQ7CiAgICAgICAgIHN3aXRj aCAoYnJlYWtwb2ludCkgeworICAgICAgICBjYXNlIHRoaXMuX2RlYnVnZ2VyU3RhdGVtZW50c0Jy ZWFrcG9pbnQ6CisgICAgICAgICAgICBpZiAoIWJyZWFrcG9pbnQuZGlzYWJsZWQgJiYgIXRoaXMu YnJlYWtwb2ludHNEaXNhYmxlZFRlbXBvcmFyaWx5KQorICAgICAgICAgICAgICAgIHRoaXMuYnJl YWtwb2ludHNFbmFibGVkID0gdHJ1ZTsKKyAgICAgICAgICAgIHRoaXMuX2RlYnVnZ2VyU3RhdGVt ZW50c0JyZWFrcG9pbnRFbmFibGVkU2V0dGluZy52YWx1ZSA9ICFicmVha3BvaW50LmRpc2FibGVk OworICAgICAgICAgICAgZm9yIChsZXQgdGFyZ2V0IG9mIFdJLnRhcmdldHMpCisgICAgICAgICAg ICAgICAgdGFyZ2V0LkRlYnVnZ2VyQWdlbnQuc2V0UGF1c2VPbkRlYnVnZ2VyU3RhdGVtZW50cygh YnJlYWtwb2ludC5kaXNhYmxlZCk7CisgICAgICAgICAgICByZXR1cm47CisKICAgICAgICAgY2Fz ZSB0aGlzLl9hbGxFeGNlcHRpb25zQnJlYWtwb2ludDoKICAgICAgICAgICAgIGlmICghYnJlYWtw b2ludC5kaXNhYmxlZCAmJiAhdGhpcy5icmVha3BvaW50c0Rpc2FibGVkVGVtcG9yYXJpbHkpCiAg ICAgICAgICAgICAgICAgdGhpcy5icmVha3BvaW50c0VuYWJsZWQgPSB0cnVlOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0RlYnVnZ2VyU3Rh dGVtZW50LnN2ZyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9E ZWJ1Z2dlclN0YXRlbWVudC5zdmcKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZWM4MjFiYWM4MTQ0MWFhMWM5NGM1Mzc5 MGZkYzliNGE1MjM0OGRlNgotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9EZWJ1Z2dlclN0YXRlbWVudC5zdmcKQEAgLTAsMCArMSw4 IEBACis8P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJ1dGYtOCI/PgorPCEtLSBDb3B5cmln aHQgwqkgMjAxMyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuIC0tPgorPHN2ZyB4bWxu cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGlkPSJyb290IiB2ZXJzaW9uPSIxLjEiIHZp ZXdCb3g9IjAgMCAxNiAxNiI+CisgICAgPHBhdGggZmlsbD0icmdiKDE0OCwgMTgzLCAyMTkpIiBk PSJNIDEzIDEgTCAzIDEgQyAxLjg5ODQzOCAxIDEgMS44OTg0MzggMSAzIEwgMSAxMyBDIDEgMTQu MTAxNTYyIDEuODk4NDM4IDE1IDMgMTUgTCAxMyAxNSBDIDE0LjEwMTU2MiAxNSAxNSAxNC4xMDE1 NjIgMTUgMTMgTCAxNSAzIEMgMTUgMS44OTg0MzggMTQuMTAxNTYyIDEgMTMgMSBaIi8+CisgICAg PHBhdGggZmlsbD0icmdiKDEwNiwgMTM2LCAxNzApIiBkPSJNIDEzIDEgTCAzIDEgQyAxLjg5ODQz OCAxIDEgMS44OTg0MzggMSAzIEwgMSAxMyBDIDEgMTQuMTAxNTYyIDEuODk4NDM4IDE1IDMgMTUg TCAxMyAxNSBDIDE0LjEwMTU2MiAxNSAxNSAxNC4xMDE1NjIgMTUgMTMgTCAxNSAzIEMgMTUgMS44 OTg0MzggMTQuMTAxNTYyIDEgMTMgMSBNIDEzIDIgQyAxMy41NTA3ODEgMiAxNCAyLjQ0OTIxOSAx NCAzIEwgMTQgMTMgQyAxNCAxMy41NTA3ODEgMTMuNTUwNzgxIDE0IDEzIDE0IEwgMyAxNCBDIDIu NDQ5MjE5IDE0IDIgMTMuNTUwNzgxIDIgMTMgTCAyIDMgQyAyIDIuNDQ5MjE5IDIuNDQ5MjE5IDIg MyAyIEwgMTMgMiIvPgorICAgIDxwYXRoIGZpbGw9InJnYigxMTMsIDE0NiwgMTg0KSIgZD0iTSA0 LjQ0NTMxMiAxMi43NDIxODggQyAzLjg5MDYyNSAxMi43NDIxODggMy40NDUzMTIgMTIuMjkyOTY5 IDMuNDQ1MzEyIDExLjc0MjE4OCBMIDMuNDQ1MzEyIDMuNzkyOTY5IEMgMy40NDUzMTIgMy4yNDIx ODggMy44OTA2MjUgMi43OTI5NjkgNC40NDUzMTIgMi43OTI5NjkgTCA3Ljg2NzE4OCAyLjc5Mjk2 OSBDIDkuMzY3MTg4IDIuNzkyOTY5IDEwLjU1NDY4OCAzLjIyMjY1NiAxMS40MDIzNDQgNC4wNjI1 IEMgMTIuMjUgNC45MTAxNTYgMTIuNjc5Njg4IDYuMTAxNTYyIDEyLjY3OTY4OCA3LjYwMTU2MiBD IDEyLjY3OTY4OCA5LjE3MTg3NSAxMi4yMzQzNzUgMTAuNDI5Njg4IDExLjM1OTM3NSAxMS4zNDc2 NTYgQyAxMC40NzI2NTYgMTIuMjczNDM4IDkuMjQ2MDk0IDEyLjc0MjE4OCA3LjcxODc1IDEyLjc0 MjE4OCBMIDQuNDQ1MzEyIDEyLjc0MjE4OCBNIDcuMzM1OTM4IDkuNjEzMjgxIEMgOC4xODc1IDku NjEzMjgxIDguNDQ5MjE5IDkuMzI0MjE5IDguNTM1MTU2IDkuMjI2NTYyIEMgOC43ODkwNjIgOC45 NDE0MDYgOC45MjE4NzUgOC40MTQwNjIgOC45MjE4NzUgNy42OTkyMTkgQyA4LjkyMTg3NSA3LjE0 MDYyNSA4LjgxMjUgNi43MDMxMjUgOC41NzgxMjUgNi4zNjMyODEgQyA4LjQ1NzAzMSA2LjE4MzU5 NCA4LjMyODEyNSA2LjA3MDMxMiA4LjE4NzUgNi4wMTE3MTkgQyA4LjA2MjUgNS45NjQ4NDQgNy43 NjE3MTkgNS44ODI4MTIgNy4wOTc2NTYgNS44ODI4MTIgQyA3LjA5NzY1NiA2Ljk2MDkzOCA3LjA5 NzY1NiA4LjUzOTA2MiA3LjA5NzY1NiA5LjYxMzI4MSBDIDcuMTcxODc1IDkuNjEzMjgxIDcuMzM1 OTM4IDkuNjEzMjgxIDcuMzM1OTM4IDkuNjEzMjgxIi8+CisgICAgPHBhdGggZmlsbD0id2hpdGUi IGQ9Ik0gNC40NDUzMTIgMTEuNzQyMTg4IEwgNC40NDUzMTIgMy43OTI5NjkgTCA3Ljg2NzE4OCAz Ljc5Mjk2OSBDIDkuMDk3NjU2IDMuNzkyOTY5IDEwLjAzOTA2MiA0LjEyMTA5NCAxMC42OTUzMTIg NC43NzM0MzggQyAxMS4zNTE1NjIgNS40MjU3ODEgMTEuNjc5Njg4IDYuMzcxMDk0IDExLjY3OTY4 OCA3LjYwMTU2MiBDIDExLjY3OTY4OCA4LjkxMDE1NiAxMS4zMzIwMzEgOS45Mjk2ODggMTAuNjM2 NzE5IDEwLjY1NjI1IEMgOS45NDE0MDYgMTEuMzc4OTA2IDguOTY4NzUgMTEuNzQyMTg4IDcuNzE4 NzUgMTEuNzQyMTg4IFogTSA2LjA5NzY1NiAxMC42MTMyODEgTCA3LjMzMjAzMSAxMC42MTMyODEg QyA4LjIwMzEyNSAxMC42MTMyODEgOC44NTE1NjIgMTAuMzc1IDkuMjgxMjUgOS44OTA2MjUgQyA5 LjcwNzAzMSA5LjQxMDE1NiA5LjkyMTg3NSA4LjY3OTY4OCA5LjkyMTg3NSA3LjY5OTIxOSBDIDku OTIxODc1IDYuOTM3NSA5Ljc1IDYuMzA4NTk0IDkuNDA2MjUgNS44MDA3ODEgQyA5LjE3MTg3NSA1 LjQ1MzEyNSA4Ljg4NjcxOSA1LjIxNDg0NCA4LjU1NDY4OCA1LjA4MjAzMSBDIDguMjE4NzUgNC45 NDkyMTkgNy43MzQzNzUgNC44ODI4MTIgNy4wOTc2NTYgNC44ODI4MTIgTCA2LjA5NzY1NiA0Ljg4 MjgxMiBaIi8+Cis8L3N2Zz4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0JyZWFrcG9pbnRUcmVlRWxlbWVudC5jc3MgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9CcmVha3BvaW50VHJlZUVsZW1lbnQuY3NzCmlu ZGV4IGYyYjJlOTUzYjNmNzZmMjQ4YjY1MzY0YzA3YWNmNTBkYzFhM2EwMzkuLmNiMjZkNjYxYzAx NjYxYTNhMTM2NjVjYjc5YTdiZDQ3YmVjYjQwMTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0JyZWFrcG9pbnRUcmVlRWxlbWVudC5jc3MKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQnJlYWtwb2ludFRy ZWVFbGVtZW50LmNzcwpAQCAtNjMsNiArNjMsMTAgQEAKICAgICBmb250LXN0eWxlOiBpdGFsaWM7 CiB9CiAKKy5icmVha3BvaW50LWRlYnVnZ2VyLXN0YXRlbWVudC1pY29uIC5pY29uIHsKKyAgICBj b250ZW50OiB1cmwoLi4vSW1hZ2VzL0RlYnVnZ2VyU3RhdGVtZW50LnN2Zyk7Cit9CisKIC5icmVh a3BvaW50LWV4Y2VwdGlvbi1pY29uIC5pY29uIHsKICAgICBjb250ZW50OiB1cmwoLi4vSW1hZ2Vz L0V4Y2VwdGlvbi5zdmcpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VzTmF2aWdhdGlvblNp ZGViYXJQYW5lbC5qcwppbmRleCBlNTZlNGQyNTJlMWUxNTRhZTA2Y2QzN2I1Zjc2NmY5ODA3Nzgw OTEzLi42ZTQ5NjM3NWJhYmI2Y2YzZjhmYWRjMDcxMmIyOGI2YzUzYmRhZWM5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VzTmF2aWdh dGlvblNpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9Tb3VyY2VzTmF2aWdhdGlvblNpZGViYXJQYW5lbC5qcwpAQCAtMzMxLDYgKzMz MSwxMCBAQCBXSS5Tb3VyY2VzTmF2aWdhdGlvblNpZGViYXJQYW5lbCA9IGNsYXNzIFNvdXJjZXNO YXZpZ2F0aW9uU2lkZWJhclBhbmVsIGV4dGVuZHMgVwogICAgICAgICAgICAgfSwgdGhpcyk7CiAg ICAgICAgIH0KIAorICAgICAgICAvLyBDT01QQVRJQklMSVRZIChpT1MgMTMuMSk6IERlYnVnZ2Vy LnNldFBhdXNlT25EZWJ1Z2dlclN0YXRlbWVudHMgZGlkIG5vdCBleGlzdCB5ZXQuCisgICAgICAg IGlmIChJbnNwZWN0b3JCYWNrZW5kLmhhc0NvbW1hbmQoIkRlYnVnZ2VyLnNldFBhdXNlT25EZWJ1 Z2dlclN0YXRlbWVudHMiKSkKKyAgICAgICAgICAgIFdJLmRlYnVnZ2VyTWFuYWdlci5hZGRCcmVh a3BvaW50KFdJLmRlYnVnZ2VyTWFuYWdlci5kZWJ1Z2dlclN0YXRlbWVudHNCcmVha3BvaW50KTsK KwogICAgICAgICBXSS5kZWJ1Z2dlck1hbmFnZXIuYWRkQnJlYWtwb2ludChXSS5kZWJ1Z2dlck1h bmFnZXIuYWxsRXhjZXB0aW9uc0JyZWFrcG9pbnQpOwogICAgICAgICBXSS5kZWJ1Z2dlck1hbmFn ZXIuYWRkQnJlYWtwb2ludChXSS5kZWJ1Z2dlck1hbmFnZXIudW5jYXVnaHRFeGNlcHRpb25zQnJl YWtwb2ludCk7CiAKQEAgLTEwOTMsNiArMTA5Nyw3IEBAIFdJLlNvdXJjZXNOYXZpZ2F0aW9uU2lk ZWJhclBhbmVsID0gY2xhc3MgU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwgZXh0ZW5kcyBX CiAgICAgewogICAgICAgICBsZXQgY29tcGFyYXRvciA9IChhLCBiKSA9PiB7CiAgICAgICAgICAg ICBjb25zdCByYW5rRnVuY3Rpb25zID0gWworICAgICAgICAgICAgICAgICh0cmVlRWxlbWVudCkg PT4gdHJlZUVsZW1lbnQucmVwcmVzZW50ZWRPYmplY3QgPT09IFdJLmRlYnVnZ2VyTWFuYWdlci5k ZWJ1Z2dlclN0YXRlbWVudHNCcmVha3BvaW50LAogICAgICAgICAgICAgICAgICh0cmVlRWxlbWVu dCkgPT4gdHJlZUVsZW1lbnQucmVwcmVzZW50ZWRPYmplY3QgPT09IFdJLmRlYnVnZ2VyTWFuYWdl ci5hbGxFeGNlcHRpb25zQnJlYWtwb2ludCwKICAgICAgICAgICAgICAgICAodHJlZUVsZW1lbnQp ID0+IHRyZWVFbGVtZW50LnJlcHJlc2VudGVkT2JqZWN0ID09PSBXSS5kZWJ1Z2dlck1hbmFnZXIu dW5jYXVnaHRFeGNlcHRpb25zQnJlYWtwb2ludCwKICAgICAgICAgICAgICAgICAodHJlZUVsZW1l bnQpID0+IHRyZWVFbGVtZW50LnJlcHJlc2VudGVkT2JqZWN0ID09PSBXSS5kZWJ1Z2dlck1hbmFn ZXIuYXNzZXJ0aW9uRmFpbHVyZXNCcmVha3BvaW50LApAQCAtMTE2Myw3ICsxMTY4LDEwIEBAIFdJ LlNvdXJjZXNOYXZpZ2F0aW9uU2lkZWJhclBhbmVsID0gY2xhc3MgU291cmNlc05hdmlnYXRpb25T aWRlYmFyUGFuZWwgZXh0ZW5kcyBXCiAgICAgICAgICAgICByZXR1cm4gZG9tTm9kZVRyZWVFbGVt ZW50OwogICAgICAgICB9OwogCi0gICAgICAgIGlmIChicmVha3BvaW50ID09PSBXSS5kZWJ1Z2dl ck1hbmFnZXIuYWxsRXhjZXB0aW9uc0JyZWFrcG9pbnQpIHsKKyAgICAgICAgaWYgKGJyZWFrcG9p bnQgPT09IFdJLmRlYnVnZ2VyTWFuYWdlci5kZWJ1Z2dlclN0YXRlbWVudHNCcmVha3BvaW50KSB7 CisgICAgICAgICAgICBvcHRpb25zLmNsYXNzTmFtZSA9ICJicmVha3BvaW50LWRlYnVnZ2VyLXN0 YXRlbWVudC1pY29uIjsKKyAgICAgICAgICAgIG9wdGlvbnMudGl0bGUgPSBXSS5VSVN0cmluZygi RGVidWdnZXIgU3RhdGVtZW50cyIpOworICAgICAgICB9IGVsc2UgaWYgKGJyZWFrcG9pbnQgPT09 IFdJLmRlYnVnZ2VyTWFuYWdlci5hbGxFeGNlcHRpb25zQnJlYWtwb2ludCkgewogICAgICAgICAg ICAgb3B0aW9ucy5jbGFzc05hbWUgPSAiYnJlYWtwb2ludC1leGNlcHRpb24taWNvbiI7CiAgICAg ICAgICAgICBvcHRpb25zLnRpdGxlID0gV0kucmVwZWF0ZWRVSVN0cmluZy5hbGxFeGNlcHRpb25z KCk7CiAgICAgICAgIH0gZWxzZSBpZiAoYnJlYWtwb2ludCA9PT0gV0kuZGVidWdnZXJNYW5hZ2Vy LnVuY2F1Z2h0RXhjZXB0aW9uc0JyZWFrcG9pbnQpIHsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBjNDU0YjAzZDFkMDhiZjNl Y2I5YzU4MDAwMGQ0NTM3ZTRlNGFjOThmLi5iMGM0YWUwZDNmMjAxMWViMGRkODA4NjU3ZTEwYTc2 OTRlMWQ1OTI4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAtMDEtMjcgIERldmluIFJvdXNz byAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFNvdXJjZXM6 IGFkZCBhIHNwZWNpYWwgYnJlYWtwb2ludCBmb3IgY29udHJvbGxpbmcgd2hldGhlciBgZGVidWdn ZXJgIHN0YXRlbWVudHMgcGF1c2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIwNjgxOAorCisgICAgICAgIFJldmlld2VkIGJ5IFRpbW90aHkgSGF0Y2hl ci4KKworICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9zZXRQYXVzZU9uRGVidWdnZXJTdGF0 ZW1lbnRzLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9zZXRQYXVz ZU9uRGVidWdnZXJTdGF0ZW1lbnRzLWV4cGVjdGVkLnR4dDogQWRkZWQuCisKIDIwMjAtMDEtMjYg IFNhaWQgQWJvdS1IYWxsYXdhICA8c2FpZEBhcHBsZS5jb20+CiAKICAgICAgICAgVGhyb3R0bGlu ZyByZXF1ZXN0QW5pbWF0aW9uRnJhbWUgc2hvdWxkIGJlIGNvbnRyb2xsZWQgYnkgUmVuZGVyaW5n VXBkYXRlU2NoZWR1bGVyCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdn ZXIvc2V0UGF1c2VPbkRlYnVnZ2VyU3RhdGVtZW50cy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvZGVidWdnZXIvc2V0UGF1c2VPbkRlYnVnZ2VyU3RhdGVtZW50cy1leHBlY3Rl ZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMC4uODA2Njk1NDgyNjQwMzBjNTJmZGVlOWRiN2ZjMzVkNzAzMGFjM2Q1 ZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zZXRQ YXVzZU9uRGVidWdnZXJTdGF0ZW1lbnRzLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDEwIEBACitU ZXN0cyBmb3IgRGVidWdnZXIuc2V0UGF1c2VPbkRlYnVnZ2VyU3RhdGVtZW50cyBjb21tYW5kLgor CisKKz09IFJ1bm5pbmcgdGVzdCBzdWl0ZTogRGVidWdnZXIuc2V0UGF1c2VPbkRlYnVnZ2VyU3Rh dGVtZW50cworLS0gUnVubmluZyB0ZXN0IGNhc2U6IERlYnVnZ2VyLnNldFBhdXNlT25EZWJ1Z2dl clN0YXRlbWVudHMuRGlzYWJsZWQKK1BBU1M6IFNob3VsZCBub3QgcGF1c2UuCisKKy0tIFJ1bm5p bmcgdGVzdCBjYXNlOiBEZWJ1Z2dlci5zZXRQYXVzZU9uRGVidWdnZXJTdGF0ZW1lbnRzLkVuYWJs ZWQKK1BBU1M6IFNob3VsZCBwYXVzZWQuCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9kZWJ1Z2dlci9zZXRQYXVzZU9uRGVidWdnZXJTdGF0ZW1lbnRzLmh0bWwgYi9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2V0UGF1c2VPbkRlYnVnZ2VyU3RhdGVtZW50cy5odG1s Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLmQ4OGMwOTA5OWRhNDQ4YWVhZDI5YzlkMDNhMzMzMTAyYzJlYzFhNGEKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2V0UGF1c2VP bkRlYnVnZ2VyU3RhdGVtZW50cy5odG1sCkBAIC0wLDAgKzEsNjEgQEAKKzwhRE9DVFlQRSBodG1s PgorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9odHRwL3Rlc3RzL2luc3BlY3Rv ci9yZXNvdXJjZXMvaW5zcGVjdG9yLXRlc3QuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4KK2Z1bmN0 aW9uIHRyaWdnZXJEZWJ1Z2dlclN0YXRlbWVudCgpIHsKKyAgICBkZWJ1Z2dlcjsKK30KKworZnVu Y3Rpb24gdGVzdCgpCit7CisgICAgbGV0IHN1aXRlID0gSW5zcGVjdG9yVGVzdC5jcmVhdGVBc3lu Y1N1aXRlKCJEZWJ1Z2dlci5zZXRQYXVzZU9uRGVidWdnZXJTdGF0ZW1lbnRzIik7CisKKyAgICBz dWl0ZS5hZGRUZXN0Q2FzZSh7CisgICAgICAgIG5hbWU6ICJEZWJ1Z2dlci5zZXRQYXVzZU9uRGVi dWdnZXJTdGF0ZW1lbnRzLkRpc2FibGVkIiwKKyAgICAgICAgZGVzY3JpcHRpb246ICJUZXN0IHRo YXQgdGhlIGRlYnVnZ2VyIGRvZXMgbm90IHBhdXNlIG9uIGBkZWJ1Z2dlcmAgc3RhdGVtZW50cyB3 aGVuIGBzZXRQYXVzZU9uRGVidWdnZXJTdGF0ZW1lbnRzYCBpcyBkaXNhYmxlZC4iLAorICAgICAg ICB0ZXN0KHJlc29sdmUsIHJlamVjdCkgeworICAgICAgICAgICAgV0kuZGVidWdnZXJNYW5hZ2Vy LmRlYnVnZ2VyU3RhdGVtZW50c0JyZWFrcG9pbnQuZGlzYWJsZWQgPSB0cnVlOworCisgICAgICAg ICAgICBsZXQgbGlzdGVuZXIgPSBXSS5kZWJ1Z2dlck1hbmFnZXIuc2luZ2xlRmlyZUV2ZW50TGlz dGVuZXIoV0kuRGVidWdnZXJNYW5hZ2VyLkV2ZW50LlBhdXNlZCwgKGV2ZW50KSA9PiB7CisgICAg ICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5mYWlsKCJTaG91bGQgbm90IGhhdmUgcGF1c2VkLiIp OworICAgICAgICAgICAgICAgIHJlamVjdCgpOworICAgICAgICAgICAgfSk7CisKKyAgICAgICAg ICAgIEluc3BlY3RvclRlc3QuZXZhbHVhdGVJblBhZ2UoInRyaWdnZXJEZWJ1Z2dlclN0YXRlbWVu dCgpIiwgKCkgPT4geworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QucGFzcygiU2hvdWxk IG5vdCBwYXVzZS4iKTsKKyAgICAgICAgICAgICAgICBXSS5kZWJ1Z2dlck1hbmFnZXIucmVtb3Zl RXZlbnRMaXN0ZW5lcihXSS5EZWJ1Z2dlck1hbmFnZXIuRXZlbnQuUGF1c2VkLCBsaXN0ZW5lcik7 CisgICAgICAgICAgICAgICAgcmVzb2x2ZSgpOworICAgICAgICAgICAgfSk7CisgICAgICAgIH0K KyAgICB9KTsKKworICAgIHN1aXRlLmFkZFRlc3RDYXNlKHsKKyAgICAgICAgbmFtZTogIkRlYnVn Z2VyLnNldFBhdXNlT25EZWJ1Z2dlclN0YXRlbWVudHMuRW5hYmxlZCIsCisgICAgICAgIGRlc2Ny aXB0aW9uOiAiVGVzdCB0aGF0IHRoZSBkZWJ1Z2dlciBkb2VzIHBhdXNlIG9uIGBkZWJ1Z2dlcmAg c3RhdGVtZW50cyB3aGVuIGBzZXRQYXVzZU9uRGVidWdnZXJTdGF0ZW1lbnRzYCBpcyBlbmFibGVk LiIsCisgICAgICAgIHRlc3QocmVzb2x2ZSwgcmVqZWN0KSB7CisgICAgICAgICAgICBXSS5kZWJ1 Z2dlck1hbmFnZXIuZGVidWdnZXJTdGF0ZW1lbnRzQnJlYWtwb2ludC5kaXNhYmxlZCA9IGZhbHNl OworCisgICAgICAgICAgICBsZXQgZGlkUGF1c2UgPSBmYWxzZTsKKyAgICAgICAgICAgIGxldCBs aXN0ZW5lciA9IFdJLmRlYnVnZ2VyTWFuYWdlci5zaW5nbGVGaXJlRXZlbnRMaXN0ZW5lcihXSS5E ZWJ1Z2dlck1hbmFnZXIuRXZlbnQuUGF1c2VkLCAoZXZlbnQpID0+IHsKKyAgICAgICAgICAgICAg ICBJbnNwZWN0b3JUZXN0LnBhc3MoIlNob3VsZCBwYXVzZWQuIik7CisgICAgICAgICAgICAgICAg V0kuZGVidWdnZXJNYW5hZ2VyLnJlc3VtZSgpOworICAgICAgICAgICAgICAgIGRpZFBhdXNlID0g dHJ1ZTsKKyAgICAgICAgICAgIH0pOworCisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV2YWx1 YXRlSW5QYWdlKCJ0cmlnZ2VyRGVidWdnZXJTdGF0ZW1lbnQoKSIsICgpID0+IHsKKyAgICAgICAg ICAgICAgICBpZiAoIWRpZFBhdXNlKQorICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0 LmZhaWwoIlNob3VsZCBoYXZlIHBhdXNlZC4iKTsKKyAgICAgICAgICAgICAgICByZXNvbHZlKCk7 CisgICAgICAgICAgICB9KTsKKyAgICAgICAgfQorICAgIH0pOworCisgICAgc3VpdGUucnVuVGVz dENhc2VzQW5kRmluaXNoKCk7Cit9Cis8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IG9ubG9hZD0i cnVuVGVzdCgpIj4KKzxwPlRlc3RzIGZvciBEZWJ1Z2dlci5zZXRQYXVzZU9uRGVidWdnZXJTdGF0 ZW1lbnRzIGNvbW1hbmQuPC9wPgorPC9ib2R5PgorPC9odG1sPgo=