127712 2014-01-27 14:37:25 -0800 Web Inspector: Feature Check all Protocol Generated Interfaces to get JSContext Inspection working 2014-01-27 15:20:44 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck webkit-unassigned commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 972582 0 joepeck 2014-01-27 14:37:25 -0800 Attempting to open an inspector for a JSContext results in runtime exceptions for protocol generated interfaces (e.g. NetworkAgent, CSSAgent, DOMAgent, etc) that were expected to exist when debugging a WebCore::Page but do not exist when debugging a JSContext. Feature check all of these points before they are used, and JSContext inspection works! 972583 1 webkit-bug-importer 2014-01-27 14:37:46 -0800 <rdar://problem/15919014> 972590 2 222366 joepeck 2014-01-27 14:48:53 -0800 Created attachment 222366 [PATCH] Proposed Fix 972600 3 222366 commit-queue 2014-01-27 15:20:42 -0800 Comment on attachment 222366 [PATCH] Proposed Fix Clearing flags on attachment: 222366 Committed r162874: <http://trac.webkit.org/changeset/162874> 972601 4 commit-queue 2014-01-27 15:20:44 -0800 All reviewed patches have been landed. Closing bug. 222366 2014-01-27 14:48:53 -0800 2014-01-27 15:20:42 -0800 [PATCH] Proposed Fix ui.patch text/plain 14023 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDY4NGI2ZGIuLmIxZjg1NGUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE0LTAxLTI3ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRmVhdHVy ZSBDaGVjayBhbGwgUHJvdG9jb2wgR2VuZXJhdGVkIEludGVyZmFjZXMgdG8gZ2V0IEpTQ29udGV4 dCBJbnNwZWN0aW9uIHdvcmtpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEyNzcxMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEZlYXR1cmUgY2hlY2sgcHJvdG9jb2wgZ2VuZXJhdGVkIGludGVyZmFjZXMg KGUuZy4gRm9vQWdlbnQgYW5kIHJlZ2lzdGVyRm9vT2JzZXJ2ZXIpLgorICAgICAgICBBbHNvIGRy aXZlIGJ5IGhhbmRsZSBhIHBvc3NpYmxlIGV4Y2VwdGlvbiBpZiBhIFNvdXJjZUNvZGUncyBVUkwg aXMgbnVsbCwgd2hpY2ggaXMgcG9zc2libGUuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Fw cGxpY2F0aW9uQ2FjaGVNYW5hZ2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkFwcGxpY2F0 aW9uQ2FjaGVNYW5hZ2VyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hl TWFuYWdlci5wcm90b3R5cGUuaW5pdGlhbGl6ZSk6CisgICAgICAgICogVXNlckludGVyZmFjZS9D U1NDb21wbGV0aW9ucy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NDb21wbGV0aW9ucy5y ZXF1ZXN0Q1NTTmFtZUNvbXBsZXRpb25zKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NTU1N0 eWxlTWFuYWdlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZU1hbmFnZXIpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlTWFuYWdlci5wcm90b3R5cGUuY2FuRm9yY2VQ c2V1ZG9DbGFzc2VzKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0RlYnVnZ2VyTWFuYWdlci5q czoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0ZyYW1lUmVzb3VyY2VNYW5hZ2VyLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkZyYW1lUmVzb3VyY2VNYW5hZ2VyKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5GcmFtZVJlc291cmNlTWFuYWdlci5wcm90b3R5cGUuaW5pdGlhbGl6ZSk6CisgICAg ICAgICogVXNlckludGVyZmFjZS9NYWluLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmxvYWRl ZCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9Qcm9maWxlTWFuYWdlci5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5Qcm9maWxlTWFuYWdlcik6CisgICAgICAgICogVXNlckludGVyZmFjZS9T dG9yYWdlTWFuYWdlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdG9yYWdlTWFuYWdlcik6 CisgICAgICAgIFR5cGUgY2hlY2sgZ2VuZXJhdGVkIGludGVyZmFjZXMuCisKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5EZWJ1Z2dlck1hbmFnZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVn Z2VyTWFuYWdlci5wcm90b3R5cGUuZGVidWdnZXJEaWRQYXVzZSk6CisgICAgICAgIE51bGwgY2hl Y2sgYSBTb3VyY2VDb2RlIFVSTCwgd2hpY2ggY2FuIGJlIG51bGwgZm9yIGEgU2NyaXB0IHdpdGgg bm8gVVJMLgorCiAyMDE0LTAxLTI1ICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNv bT4KIAogICAgICAgICBSZW1vdmUgZGVhZCBjb2RlIGZyb20gdGhlIEpTQyBwcm9maWxlci4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0FwcGxpY2F0aW9u Q2FjaGVNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQXBw bGljYXRpb25DYWNoZU1hbmFnZXIuanMKaW5kZXggNmJhYTM0My4uNTIzZDg1MSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQXBwbGljYXRpb25DYWNoZU1h bmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQXBwbGlj YXRpb25DYWNoZU1hbmFnZXIuanMKQEAgLTI3LDcgKzI3LDggQEAgV2ViSW5zcGVjdG9yLkFwcGxp Y2F0aW9uQ2FjaGVNYW5hZ2VyID0gZnVuY3Rpb24oKQogewogICAgIFdlYkluc3BlY3Rvci5PYmpl Y3QuY2FsbCh0aGlzKTsKIAotICAgIEFwcGxpY2F0aW9uQ2FjaGVBZ2VudC5lbmFibGUoKTsKKyAg ICBpZiAod2luZG93LkFwcGxpY2F0aW9uQ2FjaGVBZ2VudCkKKyAgICAgICAgQXBwbGljYXRpb25D YWNoZUFnZW50LmVuYWJsZSgpOwogCiAgICAgV2ViSW5zcGVjdG9yLkZyYW1lLmFkZEV2ZW50TGlz dGVuZXIoV2ViSW5zcGVjdG9yLkZyYW1lLkV2ZW50Lk1haW5SZXNvdXJjZURpZENoYW5nZSwgdGhp cy5fbWFpblJlc291cmNlRGlkQ2hhbmdlLCB0aGlzKTsKICAgICBXZWJJbnNwZWN0b3IuRnJhbWUu YWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRnJhbWUuRXZlbnQuQ2hpbGRGcmFtZVdhc1Jl bW92ZWQsIHRoaXMuX2NoaWxkRnJhbWVXYXNSZW1vdmVkLCB0aGlzKTsKQEAgLTYzLDcgKzY0LDgg QEAgV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyLnByb3RvdHlwZSA9IHsKICAg ICB7CiAgICAgICAgIHRoaXMuX2FwcGxpY2F0aW9uQ2FjaGVPYmplY3RzID0gW107CiAKLSAgICAg ICAgQXBwbGljYXRpb25DYWNoZUFnZW50LmdldEZyYW1lc1dpdGhNYW5pZmVzdHModGhpcy5fZnJh bWVzV2l0aE1hbmlmZXN0c0xvYWRlZC5iaW5kKHRoaXMpKTsKKyAgICAgICAgaWYgKHdpbmRvdy5B cHBsaWNhdGlvbkNhY2hlQWdlbnQpCisgICAgICAgICAgICBBcHBsaWNhdGlvbkNhY2hlQWdlbnQu Z2V0RnJhbWVzV2l0aE1hbmlmZXN0cyh0aGlzLl9mcmFtZXNXaXRoTWFuaWZlc3RzTG9hZGVkLmJp bmQodGhpcykpOwogICAgIH0sCiAKICAgICBuZXR3b3JrU3RhdGVVcGRhdGVkOiBmdW5jdGlvbihp c05vd09ubGluZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL0NTU0NvbXBsZXRpb25zLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvQ1NTQ29tcGxldGlvbnMuanMKaW5kZXggYjc2MDU1Zi4uYWVmNWU1MCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ1NTQ29tcGxldGlvbnMuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ1NTQ29tcGxldGlvbnMuanMK QEAgLTE1Myw3ICsxNTMsOCBAQCBXZWJJbnNwZWN0b3IuQ1NTQ29tcGxldGlvbnMucmVxdWVzdENT U05hbWVDb21wbGV0aW9ucyA9IGZ1bmN0aW9uKCkKICAgICAgICAgdXBkYXRlQ29kZU1pcnJvckNT U01vZGUoInRleHQveC1zY3NzIik7CiAgICAgfQogCi0gICAgQ1NTQWdlbnQuZ2V0U3VwcG9ydGVk Q1NTUHJvcGVydGllcyhwcm9wZXJ0eU5hbWVzQ2FsbGJhY2spOworICAgIGlmICh3aW5kb3cuQ1NT QWdlbnQpCisgICAgICAgIENTU0FnZW50LmdldFN1cHBvcnRlZENTU1Byb3BlcnRpZXMocHJvcGVy dHlOYW1lc0NhbGxiYWNrKTsKIH0KIAogV2ViSW5zcGVjdG9yLkNTU0NvbXBsZXRpb25zLnByb3Rv dHlwZSA9IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0NTU1N0eWxlTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0NTU1N0eWxlTWFuYWdlci5qcwppbmRleCBlYTYyNTA4Li5kOGYwNDlhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9DU1NTdHlsZU1hbmFnZXIuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ1NTU3R5bGVNYW5hZ2VyLmpz CkBAIC0yNyw3ICsyNyw4IEBAIFdlYkluc3BlY3Rvci5DU1NTdHlsZU1hbmFnZXIgPSBmdW5jdGlv bigpCiB7CiAgICAgV2ViSW5zcGVjdG9yLk9iamVjdC5jYWxsKHRoaXMpOwogCi0gICAgQ1NTQWdl bnQuZW5hYmxlKCk7CisgICAgaWYgKHdpbmRvdy5DU1NBZ2VudCkKKyAgICAgICAgQ1NTQWdlbnQu ZW5hYmxlKCk7CiAKICAgICBXZWJJbnNwZWN0b3IuRnJhbWUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJ bnNwZWN0b3IuRnJhbWUuRXZlbnQuTWFpblJlc291cmNlRGlkQ2hhbmdlLCB0aGlzLl9tYWluUmVz b3VyY2VEaWRDaGFuZ2UsIHRoaXMpOwogICAgIFdlYkluc3BlY3Rvci5GcmFtZS5hZGRFdmVudExp c3RlbmVyKFdlYkluc3BlY3Rvci5GcmFtZS5FdmVudC5SZXNvdXJjZVdhc0FkZGVkLCB0aGlzLl9y ZXNvdXJjZUFkZGVkLCB0aGlzKTsKQEAgLTU5LDcgKzYwLDcgQEAgV2ViSW5zcGVjdG9yLkNTU1N0 eWxlTWFuYWdlci5wcm90b3R5cGUgPSB7CiAKICAgICBjYW5Gb3JjZVBzZXVkb0NsYXNzZXM6IGZ1 bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHJldHVybiAhIUNTU0FnZW50LmZvcmNlUHNldWRvU3Rh dGU7CisgICAgICAgIHJldHVybiB3aW5kb3cuQ1NTQWdlbnQgJiYgISFDU1NBZ2VudC5mb3JjZVBz ZXVkb1N0YXRlOwogICAgIH0sCiAKICAgICBwcm9wZXJ0eU5hbWVIYXNPdGhlclZlbmRvclByZWZp eDogZnVuY3Rpb24obmFtZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0RlYnVnZ2VyTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0RlYnVnZ2VyTWFuYWdlci5qcwppbmRleCA0MmUwMWUyLi5jZmQyMTk1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9EZWJ1Z2dlck1hbmFn ZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvRGVidWdnZXJN YW5hZ2VyLmpzCkBAIC0yNyw3ICsyNyw4IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1hbmFnZXIg PSBmdW5jdGlvbigpCiB7CiAgICAgV2ViSW5zcGVjdG9yLk9iamVjdC5jYWxsKHRoaXMpOwogCi0g ICAgRGVidWdnZXJBZ2VudC5lbmFibGUoKTsKKyAgICBpZiAod2luZG93LkRlYnVnZ2VyQWdlbnQp CisgICAgICAgIERlYnVnZ2VyQWdlbnQuZW5hYmxlKCk7CiAKICAgICBXZWJJbnNwZWN0b3IuQnJl YWtwb2ludC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5CcmVha3BvaW50LkV2ZW50LkRp c3BsYXlMb2NhdGlvbkRpZENoYW5nZSwgdGhpcy5fYnJlYWtwb2ludERpc3BsYXlMb2NhdGlvbkRp ZENoYW5nZSwgdGhpcyk7CiAgICAgV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnQuYWRkRXZlbnRMaXN0 ZW5lcihXZWJJbnNwZWN0b3IuQnJlYWtwb2ludC5FdmVudC5EaXNhYmxlZFN0YXRlRGlkQ2hhbmdl LCB0aGlzLl9icmVha3BvaW50RGlzYWJsZWRTdGF0ZURpZENoYW5nZSwgdGhpcyk7CkBAIC01OCw3 ICs1OSw4IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1hbmFnZXIgPSBmdW5jdGlvbigpCiAgICAg dGhpcy5fYnJlYWtwb2ludHNTZXR0aW5nID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0aW5nKCJicmVh a3BvaW50cyIsIFtdKTsKICAgICB0aGlzLl9icmVha3BvaW50c0VuYWJsZWRTZXR0aW5nID0gbmV3 IFdlYkluc3BlY3Rvci5TZXR0aW5nKCJicmVha3BvaW50cy1lbmFibGVkIiwgdHJ1ZSk7CiAKLSAg ICBEZWJ1Z2dlckFnZW50LnNldEJyZWFrcG9pbnRzQWN0aXZlKHRoaXMuX2JyZWFrcG9pbnRzRW5h YmxlZFNldHRpbmcudmFsdWUpOworICAgIGlmICh3aW5kb3cuRGVidWdnZXJBZ2VudCkKKyAgICAg ICAgRGVidWdnZXJBZ2VudC5zZXRCcmVha3BvaW50c0FjdGl2ZSh0aGlzLl9icmVha3BvaW50c0Vu YWJsZWRTZXR0aW5nLnZhbHVlKTsKIAogICAgIHRoaXMuX3VwZGF0ZUJyZWFrT25FeGNlcHRpb25z U3RhdGUoKTsKIApAQCAtMzQ1LDcgKzM0Nyw3IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1hbmFn ZXIucHJvdG90eXBlID0gewogICAgICAgICAgICAgdmFyIGNhbGxGcmFtZVBheWxvYWQgPSBjYWxs RnJhbWVzUGF5bG9hZFtpXTsKICAgICAgICAgICAgIHZhciBzb3VyY2VDb2RlTG9jYXRpb24gPSB0 aGlzLl9zb3VyY2VDb2RlTG9jYXRpb25Gcm9tUGF5bG9hZChjYWxsRnJhbWVQYXlsb2FkLmxvY2F0 aW9uKTsKICAgICAgICAgICAgIC8vIEV4Y2x1ZGUgdGhlIGNhc2Ugd2hlcmUgdGhlIGNhbGwgZnJh bWUgaXMgaW4gdGhlIGluc3BlY3RvciBjb2RlLgotICAgICAgICAgICAgaWYgKCFzb3VyY2VDb2Rl TG9jYXRpb24gfHwgc291cmNlQ29kZUxvY2F0aW9uLl9zb3VyY2VDb2RlLl91cmwuaW5kZXhPZigi X19XZWJJbnNwZWN0b3IiKSA9PT0gMCkKKyAgICAgICAgICAgIGlmICghc291cmNlQ29kZUxvY2F0 aW9uIHx8ICFzb3VyY2VDb2RlTG9jYXRpb24uX3NvdXJjZUNvZGUgfHwgIXNvdXJjZUNvZGVMb2Nh dGlvbi5fc291cmNlQ29kZS5fdXJsIHx8IHNvdXJjZUNvZGVMb2NhdGlvbi5fc291cmNlQ29kZS5f dXJsLmluZGV4T2YoIl9fV2ViSW5zcGVjdG9yIikgPT09IDApCiAgICAgICAgICAgICAgICAgY29u dGludWU7CiAgICAgICAgICAgICB2YXIgdGhpc09iamVjdCA9IFdlYkluc3BlY3Rvci5SZW1vdGVP YmplY3QuZnJvbVBheWxvYWQoY2FsbEZyYW1lUGF5bG9hZC50aGlzKTsKICAgICAgICAgICAgIHZh ciBzY29wZUNoYWluID0gdGhpcy5fc2NvcGVDaGFpbkZyb21QYXlsb2FkKGNhbGxGcmFtZVBheWxv YWQuc2NvcGVDaGFpbik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9GcmFtZVJlc291cmNlTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0ZyYW1lUmVzb3VyY2VNYW5hZ2VyLmpzCmluZGV4IDhlZWZlMTcuLjJjNTU2 ZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ZyYW1l UmVzb3VyY2VNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL0ZyYW1lUmVzb3VyY2VNYW5hZ2VyLmpzCkBAIC0yNyw4ICsyNywxMCBAQCBXZWJJbnNwZWN0 b3IuRnJhbWVSZXNvdXJjZU1hbmFnZXIgPSBmdW5jdGlvbigpCiB7CiAgICAgV2ViSW5zcGVjdG9y Lk9iamVjdC5jYWxsKHRoaXMpOwogCi0gICAgUGFnZUFnZW50LmVuYWJsZSgpOwotICAgIE5ldHdv cmtBZ2VudC5lbmFibGUoKTsKKyAgICBpZiAod2luZG93LlBhZ2VBZ2VudCkKKyAgICAgICAgUGFn ZUFnZW50LmVuYWJsZSgpOworICAgIGlmICh3aW5kb3cuTmV0d29ya0FnZW50KQorICAgICAgICBO ZXR3b3JrQWdlbnQuZW5hYmxlKCk7CiAKICAgICB0aGlzLmluaXRpYWxpemUoKTsKIH07CkBAIC01 OCw3ICs2MCw4IEBAIFdlYkluc3BlY3Rvci5GcmFtZVJlc291cmNlTWFuYWdlci5wcm90b3R5cGUg PSB7CiAgICAgICAgICAgICB0aGlzLl9tYWluRnJhbWVEaWRDaGFuZ2Uob2xkTWFpbkZyYW1lKTsK IAogICAgICAgICB0aGlzLl93YWl0aW5nRm9yTWFpbkZyYW1lUmVzb3VyY2VUcmVlUGF5bG9hZCA9 IHRydWU7Ci0gICAgICAgIFBhZ2VBZ2VudC5nZXRSZXNvdXJjZVRyZWUodGhpcy5fcHJvY2Vzc01h aW5GcmFtZVJlc291cmNlVHJlZVBheWxvYWQuYmluZCh0aGlzKSk7CisgICAgICAgIGlmICh3aW5k b3cuUGFnZUFnZW50KQorICAgICAgICAgICAgUGFnZUFnZW50LmdldFJlc291cmNlVHJlZSh0aGlz Ll9wcm9jZXNzTWFpbkZyYW1lUmVzb3VyY2VUcmVlUGF5bG9hZC5iaW5kKHRoaXMpKTsKICAgICB9 LAogCiAgICAgZ2V0IG1haW5GcmFtZSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9NYWluLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvTWFpbi5qcwppbmRleCA0NWI4YTdlLi5hNjA3N2QyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9NYWluLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01haW4uanMKQEAgLTUyLDI3ICs1Miw0MCBAQCBXZWJJbnNw ZWN0b3IubG9hZGVkID0gZnVuY3Rpb24oKQogICAgIHRoaXMuX2luaXRpYWxpemVXZWJTb2NrZXRJ Zk5lZWRlZCgpOwogCiAgICAgLy8gUmVnaXN0ZXIgb2JzZXJ2ZXJzIGZvciBldmVudHMgZnJvbSB0 aGUgSW5zcGVjdG9yQmFja2VuZC4KLSAgICBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVySW5zcGVj dG9yRGlzcGF0Y2hlcihuZXcgV2ViSW5zcGVjdG9yLkluc3BlY3Rvck9ic2VydmVyKTsKLSAgICBJ bnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyUGFnZURpc3BhdGNoZXIobmV3IFdlYkluc3BlY3Rvci5Q YWdlT2JzZXJ2ZXIpOworICAgIGlmIChJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVySW5zcGVjdG9y RGlzcGF0Y2hlcikKKyAgICAgICAgSW5zcGVjdG9yQmFja2VuZC5yZWdpc3Rlckluc3BlY3RvckRp c3BhdGNoZXIobmV3IFdlYkluc3BlY3Rvci5JbnNwZWN0b3JPYnNlcnZlcik7CisgICAgaWYgKElu c3BlY3RvckJhY2tlbmQucmVnaXN0ZXJQYWdlRGlzcGF0Y2hlcikKKyAgICAgICAgSW5zcGVjdG9y QmFja2VuZC5yZWdpc3RlclBhZ2VEaXNwYXRjaGVyKG5ldyBXZWJJbnNwZWN0b3IuUGFnZU9ic2Vy dmVyKTsKICAgICBpZiAoSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckNhbnZhc0Rpc3BhdGNoZXIp CiAgICAgICAgIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJDYW52YXNEaXNwYXRjaGVyKG5ldyBX ZWJJbnNwZWN0b3IuQ2FudmFzT2JzZXJ2ZXIpOwotICAgIEluc3BlY3RvckJhY2tlbmQucmVnaXN0 ZXJDb25zb2xlRGlzcGF0Y2hlcihuZXcgV2ViSW5zcGVjdG9yLkNvbnNvbGVPYnNlcnZlcik7Ci0g ICAgSW5zcGVjdG9yQmFja2VuZC5yZWdpc3Rlck5ldHdvcmtEaXNwYXRjaGVyKG5ldyBXZWJJbnNw ZWN0b3IuTmV0d29ya09ic2VydmVyKTsKLSAgICBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRE9N RGlzcGF0Y2hlcihuZXcgV2ViSW5zcGVjdG9yLkRPTU9ic2VydmVyKTsKLSAgICBJbnNwZWN0b3JC YWNrZW5kLnJlZ2lzdGVyRGVidWdnZXJEaXNwYXRjaGVyKG5ldyBXZWJJbnNwZWN0b3IuRGVidWdn ZXJPYnNlcnZlcik7Ci0gICAgSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckRhdGFiYXNlRGlzcGF0 Y2hlcihuZXcgV2ViSW5zcGVjdG9yLkRhdGFiYXNlT2JzZXJ2ZXIpOwotICAgIEluc3BlY3RvckJh Y2tlbmQucmVnaXN0ZXJET01TdG9yYWdlRGlzcGF0Y2hlcihuZXcgV2ViSW5zcGVjdG9yLkRPTVN0 b3JhZ2VPYnNlcnZlcik7Ci0gICAgSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckFwcGxpY2F0aW9u Q2FjaGVEaXNwYXRjaGVyKG5ldyBXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZU9ic2VydmVy KTsKLSAgICBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyVGltZWxpbmVEaXNwYXRjaGVyKG5ldyBX ZWJJbnNwZWN0b3IuVGltZWxpbmVPYnNlcnZlcik7Ci0gICAgSW5zcGVjdG9yQmFja2VuZC5yZWdp c3RlclByb2ZpbGVyRGlzcGF0Y2hlcihuZXcgV2ViSW5zcGVjdG9yLlByb2ZpbGVyT2JzZXJ2ZXIp OwotICAgIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJDU1NEaXNwYXRjaGVyKG5ldyBXZWJJbnNw ZWN0b3IuQ1NTT2JzZXJ2ZXIpOworICAgIGlmIChJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyQ29u c29sZURpc3BhdGNoZXIpCisgICAgICAgIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJDb25zb2xl RGlzcGF0Y2hlcihuZXcgV2ViSW5zcGVjdG9yLkNvbnNvbGVPYnNlcnZlcik7CisgICAgaWYgKElu c3BlY3RvckJhY2tlbmQucmVnaXN0ZXJOZXR3b3JrRGlzcGF0Y2hlcikKKyAgICAgICAgSW5zcGVj dG9yQmFja2VuZC5yZWdpc3Rlck5ldHdvcmtEaXNwYXRjaGVyKG5ldyBXZWJJbnNwZWN0b3IuTmV0 d29ya09ic2VydmVyKTsKKyAgICBpZiAoSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckRPTURpc3Bh dGNoZXIpCisgICAgICAgIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJET01EaXNwYXRjaGVyKG5l dyBXZWJJbnNwZWN0b3IuRE9NT2JzZXJ2ZXIpOworICAgIGlmIChJbnNwZWN0b3JCYWNrZW5kLnJl Z2lzdGVyRGVidWdnZXJEaXNwYXRjaGVyKQorICAgICAgICBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lz dGVyRGVidWdnZXJEaXNwYXRjaGVyKG5ldyBXZWJJbnNwZWN0b3IuRGVidWdnZXJPYnNlcnZlcik7 CisgICAgaWYgKEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJEYXRhYmFzZURpc3BhdGNoZXIpCisg ICAgICAgIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJEYXRhYmFzZURpc3BhdGNoZXIobmV3IFdl Ykluc3BlY3Rvci5EYXRhYmFzZU9ic2VydmVyKTsKKyAgICBpZiAoSW5zcGVjdG9yQmFja2VuZC5y ZWdpc3RlckRPTVN0b3JhZ2VEaXNwYXRjaGVyKQorICAgICAgICBJbnNwZWN0b3JCYWNrZW5kLnJl Z2lzdGVyRE9NU3RvcmFnZURpc3BhdGNoZXIobmV3IFdlYkluc3BlY3Rvci5ET01TdG9yYWdlT2Jz ZXJ2ZXIpOworICAgIGlmIChJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyQXBwbGljYXRpb25DYWNo ZURpc3BhdGNoZXIpCisgICAgICAgIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJBcHBsaWNhdGlv bkNhY2hlRGlzcGF0Y2hlcihuZXcgV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVPYnNlcnZl cik7CisgICAgaWYgKEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJUaW1lbGluZURpc3BhdGNoZXIp CisgICAgICAgIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJUaW1lbGluZURpc3BhdGNoZXIobmV3 IFdlYkluc3BlY3Rvci5UaW1lbGluZU9ic2VydmVyKTsKKyAgICBpZiAoSW5zcGVjdG9yQmFja2Vu ZC5yZWdpc3RlclByb2ZpbGVyRGlzcGF0Y2hlcikKKyAgICAgICAgSW5zcGVjdG9yQmFja2VuZC5y ZWdpc3RlclByb2ZpbGVyRGlzcGF0Y2hlcihuZXcgV2ViSW5zcGVjdG9yLlByb2ZpbGVyT2JzZXJ2 ZXIpOworICAgIGlmIChJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyQ1NTRGlzcGF0Y2hlcikKKyAg ICAgICAgSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckNTU0Rpc3BhdGNoZXIobmV3IFdlYkluc3Bl Y3Rvci5DU1NPYnNlcnZlcik7CiAgICAgaWYgKEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJMYXll clRyZWVEaXNwYXRjaGVyKQogICAgICAgICBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyTGF5ZXJU cmVlRGlzcGF0Y2hlcihuZXcgV2ViSW5zcGVjdG9yLkxheWVyVHJlZU9ic2VydmVyKTsKICAgICBp ZiAoSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlclJ1bnRpbWVEaXNwYXRjaGVyKQogICAgICAgICBJ bnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyUnVudGltZURpc3BhdGNoZXIobmV3IFdlYkluc3BlY3Rv ci5SdW50aW1lT2JzZXJ2ZXIpOwogCiAgICAgLy8gRW5hYmxlIGFnZW50cy4KLSAgICBJbnNwZWN0 b3JBZ2VudC5lbmFibGUoKTsKKyAgICBpZiAod2luZG93Lkluc3BlY3RvckFnZW50KQorICAgICAg ICBJbnNwZWN0b3JBZ2VudC5lbmFibGUoKTsKIAogICAgIC8vIFBlcmZvcm0gb25lLXRpbWUgdGFz a3MuCiAgICAgV2ViSW5zcGVjdG9yLkNTU0NvbXBsZXRpb25zLnJlcXVlc3RDU1NOYW1lQ29tcGxl dGlvbnMoKTsKQEAgLTEwMSw3ICsxMTQsOCBAQCBXZWJJbnNwZWN0b3IubG9hZGVkID0gZnVuY3Rp b24oKQogICAgIHRoaXMuZGFzaGJvYXJkTWFuYWdlciA9IG5ldyBXZWJJbnNwZWN0b3IuRGFzaGJv YXJkTWFuYWdlcjsKIAogICAgIC8vIEVuYWJsZSB0aGUgQ29uc29sZSBBZ2VudCBhZnRlciBjcmVh dGluZyB0aGUgc2luZ2xldG9uIG1hbmFnZXJzLgotICAgIENvbnNvbGVBZ2VudC5lbmFibGUoKTsK KyAgICBpZiAod2luZG93LkNvbnNvbGVBZ2VudCkKKyAgICAgICAgQ29uc29sZUFnZW50LmVuYWJs ZSgpOwogCiAgICAgLy8gUmVnaXN0ZXIgZm9yIGV2ZW50cy4KICAgICB0aGlzLmRlYnVnZ2VyTWFu YWdlci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1hbmFnZXIuRXZlbnQu UGF1c2VkLCB0aGlzLl9kZWJ1Z2dlckRpZFBhdXNlLCB0aGlzKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb2ZpbGVNYW5hZ2VyLmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvZmlsZU1hbmFnZXIuanMKaW5kZXggNWE5 ODJhNC4uYzFlZjFmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvUHJvZmlsZU1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvUHJvZmlsZU1hbmFnZXIuanMKQEAgLTMwLDggKzMwLDEwIEBAIFdlYkluc3BlY3Rv ci5Qcm9maWxlTWFuYWdlciA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLl9qYXZhU2NyaXB0UHJvZmls ZVR5cGUgPSBuZXcgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRQcm9maWxlVHlwZTsKICAgICB0aGlz Ll9jYW52YXNQcm9maWxlVHlwZSA9IG5ldyBXZWJJbnNwZWN0b3IuQ2FudmFzUHJvZmlsZVR5cGU7 CiAKLSAgICBQcm9maWxlckFnZW50LmVuYWJsZSgpOwotICAgIFByb2ZpbGVyQWdlbnQuZ2V0UHJv ZmlsZUhlYWRlcnMoKTsKKyAgICBpZiAod2luZG93LlByb2ZpbGVyQWdlbnQpIHsKKyAgICAgICAg UHJvZmlsZXJBZ2VudC5lbmFibGUoKTsKKyAgICAgICAgUHJvZmlsZXJBZ2VudC5nZXRQcm9maWxl SGVhZGVycygpOworICAgIH0KIAogICAgIFdlYkluc3BlY3Rvci5GcmFtZS5hZGRFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5GcmFtZS5FdmVudC5NYWluUmVzb3VyY2VEaWRDaGFuZ2UsIHRoaXMu X21haW5SZXNvdXJjZURpZENoYW5nZSwgdGhpcyk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1N0b3JhZ2VNYW5hZ2VyLmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvU3RvcmFnZU1hbmFnZXIuanMKaW5kZXggZGI4M2NlMi4u ZmEwYzk0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv U3RvcmFnZU1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvU3RvcmFnZU1hbmFnZXIuanMKQEAgLTI4LDE1ICsyOCwxNyBAQCBXZWJJbnNwZWN0b3IuU3Rv cmFnZU1hbmFnZXIgPSBmdW5jdGlvbigpCiB7CiAgICAgV2ViSW5zcGVjdG9yLk9iamVjdC5jYWxs KHRoaXMpOwogCi0gICAgRE9NU3RvcmFnZUFnZW50LmVuYWJsZSgpOwotICAgIERhdGFiYXNlQWdl bnQuZW5hYmxlKCk7CisgICAgaWYgKHdpbmRvdy5ET01TdG9yYWdlQWdlbnQpCisgICAgICAgIERP TVN0b3JhZ2VBZ2VudC5lbmFibGUoKTsKKyAgICBpZiAod2luZG93LkRhdGFiYXNlQWdlbnQpCisg ICAgICAgIERhdGFiYXNlQWdlbnQuZW5hYmxlKCk7CiAKICAgICBXZWJJbnNwZWN0b3IuRnJhbWUu YWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRnJhbWUuRXZlbnQuTWFpblJlc291cmNlRGlk Q2hhbmdlLCB0aGlzLl9tYWluUmVzb3VyY2VEaWRDaGFuZ2UsIHRoaXMpOwogCiAgICAgLy8gQ09N UEFUSUJJTElUWSAoaU9TIDYpOiBET01TdG9yYWdlIHdhcyBkaXNjb3ZlcmVkIHZpYSBhIERPTVN0 b3JhZ2VPYnNlcnZlciBldmVudC4gTm93IERPTSBTdG9yYWdlCiAgICAgLy8gaXMgYWRkZWQgd2hl bmV2ZXIgYSBuZXcgc2VjdXJpdHlPcmlnaW4gaXMgZGlzY292ZXJlZC4gQ2hlY2sgZm9yIERPTVN0 b3JhZ2VBZ2VudC5nZXRET01TdG9yYWdlSXRlbXMsCiAgICAgLy8gd2hpY2ggd2FzIHJlbmFtZWQg YXQgdGhlIHNhbWUgdGltZSB0aGUgY2hhbmdlIHRvIHN0YXJ0IHVzaW5nIHNlY3VyaXR5T3JpZ2lu IHdhcyBtYWRlLgotICAgIGlmIChET01TdG9yYWdlQWdlbnQuZ2V0RE9NU3RvcmFnZUl0ZW1zKQor ICAgIGlmICh3aW5kb3cuRE9NU3RvcmFnZUFnZW50ICYmIERPTVN0b3JhZ2VBZ2VudC5nZXRET01T dG9yYWdlSXRlbXMpCiAgICAgICAgIFdlYkluc3BlY3Rvci5GcmFtZS5hZGRFdmVudExpc3RlbmVy KFdlYkluc3BlY3Rvci5GcmFtZS5FdmVudC5TZWN1cml0eU9yaWdpbkRpZENoYW5nZSwgdGhpcy5f c2VjdXJpdHlPcmlnaW5EaWRDaGFuZ2UsIHRoaXMpOwogCiAgICAgdGhpcy5pbml0aWFsaXplKCk7 Cg==