59440 2011-04-26 02:47:32 -0700 Web Inspector: extract Page agent dispatcher into the ResourceTreeModel. 2011-04-26 04:36:01 -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 392364 0 pfeldman 2011-04-26 02:47:32 -0700 Patch to follow. 392373 1 91087 pfeldman 2011-04-26 03:06:05 -0700 Created attachment 91087 Patch 392392 2 pfeldman 2011-04-26 04:36:01 -0700 Committed r84904: <http://trac.webkit.org/changeset/84904> 91087 2011-04-26 03:06:05 -0700 2011-04-26 04:33:31 -0700 Patch bug-59440-20110426140602.patch text/plain 23628 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODQ4OTQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2ZTNkOTM2MTBjYTM0N2Mz ZGI1M2VhMDNkNjM2YmM1ZDRlODA0OWU1Li5iNWFjZGM0OGIxODlhMWVlNjI5Zjc4MjVhZmJlODk3 ZjU3OWYwYjgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTUgQEAKKzIwMTEtMDQtMjYgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGV4dHJhY3QgUGFnZSBhZ2Vu dCBkaXNwYXRjaGVyIGludG8gdGhlIFJlc291cmNlVHJlZU1vZGVsLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTk0NDAKKworICAgICAgICAqIGluc3Bl Y3Rvci9JbnNwZWN0b3IuanNvbjoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQWdlbnQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQWdlbnQ6OnJlc3RvcmVJbnNwZWN0b3JT dGF0ZUZyb21Db29raWUpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUGFnZUFnZW50OjpzZXRGcm9udGVuZCk6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JQYWdlQWdlbnQ6OmZyYW1lTmF2aWdhdGVkKToK KyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50Lmg6CisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9BdWRpdHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5B dWRpdHNQYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQXVkaXRzUGFuZWwucHJvdG90eXBl Ll9vbkxvYWRFdmVudEZpcmVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5BdWRpdHNQYW5lbC5w cm90b3R5cGUuX2RvbUNvbnRlbnRMb2FkZWRFdmVudEZpcmVkKToKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL0NTU1N0eWxlTW9kZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NT U3R5bGVNb2RlbFJlc291cmNlQmluZGluZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5 bGVNb2RlbFJlc291cmNlQmluZGluZy5wcm90b3R5cGUuX2luc3BlY3RlZFVSTENoYW5nZWQpOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRE9NQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50c1NpZGViYXJQYW5lKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50c1NpZGViYXJQYW5lLnByb3RvdHlwZS5f aW5zcGVjdGVkVVJMQ2hhbmdlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9ET01T dG9yYWdlLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VEaXNwYXRjaGVyLnBy b3RvdHlwZS5hZGRET01TdG9yYWdlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0V4 dGVuc2lvblNlcnZlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FeHRlbnNpb25TZXJ2ZXIu cHJvdG90eXBlLl9pbnNwZWN0ZWRVUkxDaGFuZ2VkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5F eHRlbnNpb25TZXJ2ZXIucHJvdG90eXBlLmluaXRFeHRlbnNpb25zKToKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5O ZXR3b3JrUGFuZWwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5lbC5wcm90b3R5 cGUuX29uTG9hZEV2ZW50RmlyZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5l bC5wcm90b3R5cGUuX2RvbUNvbnRlbnRMb2FkZWRFdmVudEZpcmVkKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5OZXR3b3JrUGFuZWwucHJvdG90eXBlLl9mcmFtZU5hdmlnYXRlZCk6CisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVRyZWVNb2RlbC5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVz b3VyY2VUcmVlTW9kZWwucHJvdG90eXBlLl9wcm9jZXNzQ2FjaGVkUmVzb3VyY2VzKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5wcm90b3R5cGUuX2Rpc3BhdGNoSW5z cGVjdGVkVVJMQ2hhbmdlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9k ZWwucHJvdG90eXBlLl9mcmFtZU5hdmlnYXRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVz b3VyY2VUcmVlTW9kZWwucHJvdG90eXBlLl9mcmFtZURldGFjaGVkKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5wcm90b3R5cGUuX2NsZWFyQ2hpbGRGcmFtZXNBbmRS ZXNvdXJjZXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlBhZ2VEaXNwYXRjaGVyKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5QYWdlRGlzcGF0Y2hlci5wcm90b3R5cGUuZG9tQ29udGVudEV2ZW50 RmlyZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlBhZ2VEaXNwYXRjaGVyLnByb3RvdHlwZS5s b2FkRXZlbnRGaXJlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUGFnZURpc3BhdGNoZXIucHJv dG90eXBlLmZyYW1lTmF2aWdhdGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5QYWdlRGlzcGF0 Y2hlci5wcm90b3R5cGUuZnJhbWVEZXRhY2hlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9SZXNvdXJjZXNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQ YW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlLl9v bkxvYWRFdmVudEZpcmVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5w cm90b3R5cGUuX2ZyYW1lTmF2aWdhdGVkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L2luc3BlY3Rvci5qczoKKwogMjAxMS0wNC0yNiAgRGF2aWQgTGV2aW4gIDxsZXZpbkBjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbiBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3IuanNvbgppbmRleCBhMDhkMjY1ZTI2ZTQ0ZDUzNDczNjAwNzAxOTI0 MGU4OTM1MzU2NzI3Li5hOGUyM2EyZmI3ZjQ3ZGVlMTU2NjY4MjBjZDk2MGY4ZmY3YTNiNWI5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCkBAIC0xNjEsMTIgKzE2MSw2 IEBACiAgICAgICAgIF0sCiAgICAgICAgICJldmVudHMiOiBbCiAgICAgICAgICAgICB7Ci0gICAg ICAgICAgICAgICAgIm5hbWUiOiAiaW5zcGVjdGVkVVJMQ2hhbmdlZCIsCi0gICAgICAgICAgICAg ICAgInBhcmFtZXRlcnMiOiBbCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidXJsIiwg InR5cGUiOiAic3RyaW5nIiB9Ci0gICAgICAgICAgICAgICAgXQotICAgICAgICAgICAgfSwKLSAg ICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAibmFtZSI6ICJkb21Db250ZW50RXZlbnRGaXJl ZCIsCiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCiAgICAgICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAidGltZXN0YW1wIiwgInR5cGUiOiAibnVtYmVyIiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQWdlbnQuY3BwIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckFnZW50LmNwcAppbmRleCAzN2FhZDJkMTBiNjExOWFhMjYz NWUyMDlkMjY4MzQ1NGJmZmJjZTg1Li5lMDhjMzk0ZGI1NzI1YWYwZGNmODkxYWM4ZGYxNzk3MGZh Mzc0NDdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQWdl bnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5jcHAK QEAgLTE5NCw3ICsxOTQsNiBAQCB2b2lkIEluc3BlY3RvckFnZW50OjpyZXN0b3JlSW5zcGVjdG9y U3RhdGVGcm9tQ29va2llKGNvbnN0IFN0cmluZyYgaW5zcGVjdG9yU3RhdAogICAgIG1fc3RhdGUt PmxvYWRGcm9tQ29va2llKGluc3BlY3RvclN0YXRlQ29va2llKTsKIAogICAgIG1fZnJvbnRlbmQt Pmluc3BlY3RvcigpLT5mcm9udGVuZFJldXNlZCgpOwotICAgIG1fcGFnZUFnZW50LT5yZXN0b3Jl KCk7CiAKICAgICBtX2RvbUFnZW50LT5yZXN0b3JlKCk7CiAgICAgbV9yZXNvdXJjZUFnZW50LT5y ZXN0b3JlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y UGFnZUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdl bnQuY3BwCmluZGV4IGRmMjBiZjE4YWQyMDM4ZmUyNmQ2MGVmOWY0OTZkMGYxOTc2YTlmNTUuLmNh MjgzZTJmYWE5ZDIxNzZmOTVjY2Q0ZjM1Mjc3YTNkNjAzNDU0NDEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3BwCkBAIC0yMDAsOSArMjAwLDYg QEAgdm9pZCBJbnNwZWN0b3JQYWdlQWdlbnQ6OnNldEZyb250ZW5kKEluc3BlY3RvckZyb250ZW5k KiBmcm9udGVuZCkKIHsKICAgICBtX2Zyb250ZW5kID0gZnJvbnRlbmQtPnBhZ2UoKTsKICAgICBt X2luc3RydW1lbnRpbmdBZ2VudHMtPnNldEluc3BlY3RvclBhZ2VBZ2VudCh0aGlzKTsKLQotICAg IC8vIEluaXRpYWxpemUgV2ViIEluc3BlY3RvciB0aXRsZS4KLSAgICBtX2Zyb250ZW5kLT5pbnNw ZWN0ZWRVUkxDaGFuZ2VkKG1fcGFnZS0+bWFpbkZyYW1lKCktPmRvY3VtZW50KCktPnVybCgpLnN0 cmluZygpKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JQYWdlQWdlbnQ6OmNsZWFyRnJvbnRlbmQoKQpA QCAtMzUwLDExICszNDcsNiBAQCB2b2lkIEluc3BlY3RvclBhZ2VBZ2VudDo6Z2V0UmVzb3VyY2VD b250ZW50KEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywgY29uc3QgU3RyaQogICAgICAgICBJbnNw ZWN0b3JQYWdlQWdlbnQ6OnJlc291cmNlQ29udGVudChlcnJvclN0cmluZywgZnJhbWUsIEtVUkwo UGFyc2VkVVJMU3RyaW5nLCB1cmwpLCBjb250ZW50KTsKIH0KIAotdm9pZCBJbnNwZWN0b3JQYWdl QWdlbnQ6OnJlc3RvcmUoKQotewotICAgIG1fZnJvbnRlbmQtPmluc3BlY3RlZFVSTENoYW5nZWQo bWFpbkZyYW1lKCktPmRvY3VtZW50KCktPnVybCgpLnN0cmluZygpKTsKLX0KLQogdm9pZCBJbnNw ZWN0b3JQYWdlQWdlbnQ6OmRvbUNvbnRlbnRFdmVudEZpcmVkKCkKIHsKICAgICAgbV9mcm9udGVu ZC0+ZG9tQ29udGVudEV2ZW50RmlyZWQoY3VycmVudFRpbWUoKSk7CkBAIC0zNjgsNyArMzYwLDYg QEAgdm9pZCBJbnNwZWN0b3JQYWdlQWdlbnQ6OmxvYWRFdmVudEZpcmVkKCkKIHZvaWQgSW5zcGVj dG9yUGFnZUFnZW50OjpmcmFtZU5hdmlnYXRlZChEb2N1bWVudExvYWRlciogbG9hZGVyKQogewog ICAgIG1fZnJvbnRlbmQtPmZyYW1lTmF2aWdhdGVkKGJ1aWxkT2JqZWN0Rm9yRnJhbWUobG9hZGVy LT5mcmFtZSgpKSwgbG9hZGVySWQobG9hZGVyKSk7Ci0gICAgbV9mcm9udGVuZC0+aW5zcGVjdGVk VVJMQ2hhbmdlZChsb2FkZXItPnVybCgpLnN0cmluZygpKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JQ YWdlQWdlbnQ6OmZyYW1lRGV0YWNoZWQoRnJhbWUqIGZyYW1lKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5oCmluZGV4IDY4OWYzZTVkYzM5NzM2ZmFkZWFk YWQ3Mzc1YjU2NTMyMDJjYTU3MWUuLjA1YWU1N2IyMDU4MjE5ZmVjZjc4YTM1ZTkxOTY5NDAxNTU0 MWYwYzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdl QWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50 LmgKQEAgLTEwMSw3ICsxMDEsNiBAQCBwdWJsaWM6CiAgICAgLy8gSW5zcGVjdG9yIENvbnRyb2xs ZXIgQVBJCiAgICAgdm9pZCBzZXRGcm9udGVuZChJbnNwZWN0b3JGcm9udGVuZCopOwogICAgIHZv aWQgY2xlYXJGcm9udGVuZCgpOwotICAgIHZvaWQgcmVzdG9yZSgpOwogCiAgICAgLy8gQ3Jvc3Mt YWdlbnRzIEFQSQogICAgIEZyYW1lKiBtYWluRnJhbWUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXVkaXRzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0F1ZGl0c1BhbmVsLmpzCmluZGV4IGRkYTU2N2I2ZTgzZjY4 NGExYjFkMTE1YjkzNWEzY2Q1ZjIzZWMwYTguLjQxZGYyM2MwM2M0ZmRiZDZjMWE5NDlmZTBiYmE4 OWMxNmRlMDg2MDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvQXVkaXRzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9BdWRpdHNQYW5lbC5qcwpAQCAtNTcsNiArNTcsOSBAQCBXZWJJbnNwZWN0b3IuQXVkaXRzUGFu ZWwgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5fbGF1bmNoZXJWaWV3ID0gbmV3IFdlYkluc3BlY3Rv ci5BdWRpdExhdW5jaGVyVmlldyh0aGlzLmluaXRpYXRlQXVkaXQuYmluZCh0aGlzKSk7CiAgICAg Zm9yIChpZCBpbiB0aGlzLmNhdGVnb3JpZXNCeUlkKQogICAgICAgICB0aGlzLl9sYXVuY2hlclZp ZXcuYWRkQ2F0ZWdvcnkodGhpcy5jYXRlZ29yaWVzQnlJZFtpZF0pOworCisgICAgV2ViSW5zcGVj dG9yLnJlc291cmNlVHJlZU1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlJlc291 cmNlVHJlZU1vZGVsLkV2ZW50VHlwZXMuT25Mb2FkLCB0aGlzLl9vbkxvYWRFdmVudEZpcmVkLCB0 aGlzKTsKKyAgICBXZWJJbnNwZWN0b3IucmVzb3VyY2VUcmVlTW9kZWwuYWRkRXZlbnRMaXN0ZW5l cihXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZlbnRUeXBlcy5ET01Db250ZW50TG9h ZGVkLCB0aGlzLl9kb21Db250ZW50TG9hZGVkRXZlbnRGaXJlZCwgdGhpcyk7CiB9CiAKIFdlYklu c3BlY3Rvci5BdWRpdHNQYW5lbC5wcm90b3R5cGUgPSB7CkBAIC03NSw5ICs3OCw5IEBAIFdlYklu c3BlY3Rvci5BdWRpdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0aGlzLl9t YWluUmVzb3VyY2VMb2FkVGltZTsKICAgICB9LAogCi0gICAgc2V0IG1haW5SZXNvdXJjZUxvYWRU aW1lKHgpCisgICAgX29uTG9hZEV2ZW50RmlyZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKLSAg ICAgICAgdGhpcy5fbWFpblJlc291cmNlTG9hZFRpbWUgPSB4OworICAgICAgICB0aGlzLl9tYWlu UmVzb3VyY2VMb2FkVGltZSA9IGV2ZW50LmRhdGE7CiAgICAgICAgIHRoaXMuX2RpZE1haW5SZXNv dXJjZUxvYWQoKTsKICAgICB9LAogCkBAIC04Niw5ICs4OSw5IEBAIFdlYkluc3BlY3Rvci5BdWRp dHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0aGlzLl9tYWluUmVzb3VyY2VE T01Db250ZW50VGltZTsKICAgICB9LAogCi0gICAgc2V0IG1haW5SZXNvdXJjZURPTUNvbnRlbnRU aW1lKHgpCisgICAgX2RvbUNvbnRlbnRMb2FkZWRFdmVudEZpcmVkOiBmdW5jdGlvbihldmVudCkK ICAgICB7Ci0gICAgICAgIHRoaXMuX21haW5SZXNvdXJjZURPTUNvbnRlbnRUaW1lID0geDsKKyAg ICAgICAgdGhpcy5fbWFpblJlc291cmNlRE9NQ29udGVudFRpbWUgPSBldmVudC5kYXRhOwogICAg IH0sCiAKICAgICBnZXQgY2F0ZWdvcmllc0J5SWQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzCmluZGV4IDM2YzAxOGNjYThhMGFh NjAyOTNiZGZmMDk2MzBhN2Q2YjU0MGUxZjMuLjExMGE3MjBiNDkzNjM3MzIxZGNkN2Q2YmRlNGM0 MDMzNGI5NTFiZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvQ1NTU3R5bGVNb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0NTU1N0eWxlTW9kZWwuanMKQEAgLTYwOCw3ICs2MDgsNyBAQCBXZWJJbnNwZWN0b3IuQ1NT U3R5bGVNb2RlbFJlc291cmNlQmluZGluZyA9IGZ1bmN0aW9uKGNzc01vZGVsKQogICAgIHRoaXMu X3VybFRvU3R5bGVTaGVldElkID0ge307CiAgICAgdGhpcy5fc3R5bGVTaGVldElkVG9VUkwgPSB7 fTsKICAgICB0aGlzLl9jc3NNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5DU1NT dHlsZU1vZGVsLkV2ZW50cy5TdHlsZVNoZWV0Q2hhbmdlZCwgdGhpcy5fc3R5bGVTaGVldENoYW5n ZWQsIHRoaXMpOwotICAgIFdlYkluc3BlY3Rvci5yZXNvdXJjZVRyZWVNb2RlbC5hZGRFdmVudExp c3RlbmVyKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5FdmVudFR5cGVzLkZyYW1lTmF2 aWdhdGVkLCB0aGlzLl9mcmFtZU5hdmlnYXRlZCwgdGhpcyk7CisgICAgV2ViSW5zcGVjdG9yLnJl c291cmNlVHJlZU1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJl ZU1vZGVsLkV2ZW50VHlwZXMuSW5zcGVjdGVkVVJMQ2hhbmdlZCwgdGhpcy5faW5zcGVjdGVkVVJM Q2hhbmdlZCwgdGhpcyk7CiAgICAgV2ViSW5zcGVjdG9yLlJlc291cmNlLnJlZ2lzdGVyRG9tYWlu TW9kZWxCaW5kaW5nKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBlLlN0eWxlc2hlZXQsIHRoaXMp OwogfQogCkBAIC02MjIsMTQgKzYyMiwxMSBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbFJl c291cmNlQmluZGluZy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2xvYWRTdHlsZVNoZWV0 SGVhZGVycyh0aGlzLl9pbm5lclNldENvbnRlbnQuYmluZCh0aGlzLCByZXNvdXJjZS51cmwsIGNv bnRlbnQsIG1ham9yQ2hhbmdlLCB1c2VyQ2FsbGJhY2spKTsKICAgICB9LAogCi0gICAgX2ZyYW1l TmF2aWdhdGVkOiBmdW5jdGlvbihldmVudCkKKyAgICBfaW5zcGVjdGVkVVJMQ2hhbmdlZDogZnVu Y3Rpb24oZXZlbnQpCiAgICAgewotICAgICAgICB2YXIgZnJhbWVJZCA9IGV2ZW50LmRhdGE7Ci0g ICAgICAgIGlmICghZnJhbWVJZCkgewotICAgICAgICAgICAgLy8gTWFpbiBmcmFtZSBuYXZpZ2F0 aW9uIC0gY2xlYXIgaGlzdG9yeS4KLSAgICAgICAgICAgIHRoaXMuX3VybFRvU3R5bGVTaGVldElk ID0ge307Ci0gICAgICAgICAgICB0aGlzLl9zdHlsZVNoZWV0SWRUb1VSTCA9IHt9OwotICAgICAg ICB9CisgICAgICAgIC8vIE1haW4gZnJhbWUgbmF2aWdhdGlvbiAtIGNsZWFyIGhpc3RvcnkuCisg ICAgICAgIHRoaXMuX3VybFRvU3R5bGVTaGVldElkID0ge307CisgICAgICAgIHRoaXMuX3N0eWxl U2hlZXRJZFRvVVJMID0ge307CiAgICAgfSwKIAogICAgIF9pbm5lclNldENvbnRlbnQ6IGZ1bmN0 aW9uKHVybCwgY29udGVudCwgbWFqb3JDaGFuZ2UsIHVzZXJDYWxsYmFjaywgZXJyb3IpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUJyZWFrcG9pbnRz U2lkZWJhclBhbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUJy ZWFrcG9pbnRzU2lkZWJhclBhbmUuanMKaW5kZXggZGYzMWY5Njg1ZTMwNTdkY2QxMWEzZjM2Y2Q1 Yzg5YzgwMjQ1ZDJhYS4uYzZmNDRiNTczNTk3MmZiMmMwOWUxOWM4MTNiZDRjYmUzZjJlMzZlNCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01CcmVha3Bv aW50c1NpZGViYXJQYW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvRE9NQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5qcwpAQCAtNDksMTIgKzQ5LDE0IEBAIFdlYklu c3BlY3Rvci5ET01CcmVha3BvaW50c1NpZGViYXJQYW5lID0gZnVuY3Rpb24oKQogICAgICAgICBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkJyZWFrIG9uIEF0dHJpYnV0ZXMgTW9kaWZpY2F0aW9ucyIp LAogICAgICAgICBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkJyZWFrIG9uIE5vZGUgUmVtb3ZhbCIp CiAgICAgXTsKKyAgICBXZWJJbnNwZWN0b3IucmVzb3VyY2VUcmVlTW9kZWwuYWRkRXZlbnRMaXN0 ZW5lcihXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZlbnRUeXBlcy5JbnNwZWN0ZWRV UkxDaGFuZ2VkLCB0aGlzLl9pbnNwZWN0ZWRVUkxDaGFuZ2VkLCB0aGlzKTsKIH0KIAogV2ViSW5z cGVjdG9yLkRPTUJyZWFrcG9pbnRzU2lkZWJhclBhbmUucHJvdG90eXBlID0gewotICAgIHNldElu c3BlY3RlZFVSTDogZnVuY3Rpb24odXJsKQorICAgIF9pbnNwZWN0ZWRVUkxDaGFuZ2VkOiBmdW5j dGlvbihldmVudCkKICAgICB7CiAgICAgICAgIHRoaXMuX3Jlc2V0KCk7CisgICAgICAgIHZhciB1 cmwgPSBldmVudC5kYXRhOwogICAgICAgICB0aGlzLl9pbnNwZWN0ZWRVUkwgPSB1cmwucmVtb3Zl VVJMRnJhZ21lbnQoKTsKICAgICB9LAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0RPTVN0b3JhZ2UuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0RPTVN0b3JhZ2UuanMKaW5kZXggZWEyNDkyMWY2ZDE2ZWVhNTYwZDEyMjE5Y2Uy N2YxNGE4YjI1ODMwMi4uOTIyZDcyOTVkYTFjNGI0NGNjOTlhYzI3MTQyMGRlMTE1ZjM5Yjc5YiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01TdG9yYWdl LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NU3RvcmFnZS5q cwpAQCAtNzMsOCArNzMsNiBAQCBXZWJJbnNwZWN0b3IuRE9NU3RvcmFnZURpc3BhdGNoZXIgPSBm dW5jdGlvbigpCiBXZWJJbnNwZWN0b3IuRE9NU3RvcmFnZURpc3BhdGNoZXIucHJvdG90eXBlID0g ewogICAgIGFkZERPTVN0b3JhZ2U6IGZ1bmN0aW9uKHBheWxvYWQpCiAgICAgewotICAgICAgICBp ZiAoIVdlYkluc3BlY3Rvci5wYW5lbHMucmVzb3VyY2VzKQotICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICB2YXIgZG9tU3RvcmFnZSA9IG5ldyBXZWJJbnNwZWN0b3IuRE9NU3RvcmFnZSgKICAg ICAgICAgICAgIHBheWxvYWQuaWQsCiAgICAgICAgICAgICBwYXlsb2FkLmhvc3QsCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblNlcnZlci5q cyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uU2VydmVyLmpz CmluZGV4IGMzZTIyYTI0ZWY1ZTJmNzBmYWEyMWFlNDE5NGU0MzgzZWYzMjkwOTcuLmZlNzE5MzA1 OTBmNzY3YTA4NGI5MDJiNGE1NGE4ZWZlYjc2NzJmZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uU2VydmVyLmpzCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uU2VydmVyLmpzCkBAIC03OSw4ICs3 OSw5IEBAIFdlYkluc3BlY3Rvci5FeHRlbnNpb25TZXJ2ZXIucHJvdG90eXBlID0gewogICAgICAg ICB0aGlzLl9wb3N0Tm90aWZpY2F0aW9uKCJwYW5lbC1oaWRkZW4tIiArIHBhbmVsSWQpOwogICAg IH0sCiAKLSAgICBub3RpZnlJbnNwZWN0ZWRVUkxDaGFuZ2VkOiBmdW5jdGlvbih1cmwpCisgICAg X2luc3BlY3RlZFVSTENoYW5nZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKKyAgICAgICAgdmFy IHVybCA9IGV2ZW50LmRhdGE7CiAgICAgICAgIHRoaXMuX3Bvc3ROb3RpZmljYXRpb24oImluc3Bl Y3RlZFVSTENoYW5nZWQiLCB1cmwpOwogICAgIH0sCiAKQEAgLTM3Niw2ICszNzcsNyBAQCBXZWJJ bnNwZWN0b3IuRXh0ZW5zaW9uU2VydmVyLnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIC8v IFRoZSBuZXR3b3JrTWFuYWdlciBpcyBub3JtYWxseSBjcmVhdGVkIGFmdGVyIHRoZSBFeHRlbnNp b25TZXJ2ZXIgaXMgY29uc3RydWN0ZWQsIGJ1dCBiZWZvcmUgaW5pdEV4dGVuc2lvbnMoKSBpcyBj YWxsZWQuCiAgICAgICAgIFdlYkluc3BlY3Rvci5uZXR3b3JrTWFuYWdlci5hZGRFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5OZXR3b3JrTWFuYWdlci5FdmVudFR5cGVzLlJlc291cmNlRmluaXNo ZWQsIHRoaXMuX25vdGlmeVJlc291cmNlRmluaXNoZWQsIHRoaXMpOworICAgICAgICBXZWJJbnNw ZWN0b3IucmVzb3VyY2VUcmVlTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUmVz b3VyY2VUcmVlTW9kZWwuRXZlbnRUeXBlcy5JbnNwZWN0ZWRVUkxDaGFuZ2VkLCB0aGlzLl9pbnNw ZWN0ZWRVUkxDaGFuZ2VkLCB0aGlzKTsKIAogICAgICAgICBJbnNwZWN0b3JFeHRlbnNpb25SZWdp c3RyeS5nZXRFeHRlbnNpb25zQXN5bmMoKTsKICAgICB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcwppbmRleCBkY2ZhMTc3NzY5ZDEz NzQyOTJkYTQxNDEyMTZiMDM4ZGZmMzNhNzlkLi44YTZhMWI1YzYyYmU0NDRiYTk1NjM1OTI0MWVk MTBkNjEwZDJiMGZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL05ldHdvcmtQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL05ldHdvcmtQYW5lbC5qcwpAQCAtODQsNiArODQsMTAgQEAgV2ViSW5zcGVjdG9yLk5ldHdv cmtQYW5lbCA9IGZ1bmN0aW9uKCkKICAgICBXZWJJbnNwZWN0b3IubmV0d29ya01hbmFnZXIuYWRk RXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuTmV0d29ya01hbmFnZXIuRXZlbnRUeXBlcy5SZXNv dXJjZVVwZGF0ZWQsIHRoaXMuX29uUmVzb3VyY2VVcGRhdGVkLCB0aGlzKTsKICAgICBXZWJJbnNw ZWN0b3IubmV0d29ya01hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuTmV0d29y a01hbmFnZXIuRXZlbnRUeXBlcy5SZXNvdXJjZUZpbmlzaGVkLCB0aGlzLl9vblJlc291cmNlVXBk YXRlZCwgdGhpcyk7CiAKKyAgICBXZWJJbnNwZWN0b3IucmVzb3VyY2VUcmVlTW9kZWwuYWRkRXZl bnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZlbnRUeXBlcy5GcmFt ZU5hdmlnYXRlZCwgdGhpcy5fZnJhbWVOYXZpZ2F0ZWQsIHRoaXMpOworICAgIFdlYkluc3BlY3Rv ci5yZXNvdXJjZVRyZWVNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5SZXNvdXJj ZVRyZWVNb2RlbC5FdmVudFR5cGVzLk9uTG9hZCwgdGhpcy5fb25Mb2FkRXZlbnRGaXJlZCwgdGhp cyk7CisgICAgV2ViSW5zcGVjdG9yLnJlc291cmNlVHJlZU1vZGVsLmFkZEV2ZW50TGlzdGVuZXIo V2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLkV2ZW50VHlwZXMuRE9NQ29udGVudExvYWRl ZCwgdGhpcy5fZG9tQ29udGVudExvYWRlZEV2ZW50RmlyZWQsIHRoaXMpOworCiAgICAgdGhpcy5y ZWdpc3RlclNob3J0Y3V0cygpOwogfQogCkBAIC02MDcsMjIgKzYxMSwxNiBAQCBXZWJJbnNwZWN0 b3IuTmV0d29ya1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fbGFyZ2VyUmVzb3Vy Y2VzQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fdG9nZ2xlTGFyZ2VyUmVz b3VyY2VzLmJpbmQodGhpcyksIGZhbHNlKTsKICAgICB9LAogCi0gICAgc2V0IG1haW5SZXNvdXJj ZUxvYWRUaW1lKHgpCisgICAgX29uTG9hZEV2ZW50RmlyZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAg IHsKLSAgICAgICAgaWYgKHRoaXMuX21haW5SZXNvdXJjZUxvYWRUaW1lID09PSB4KQotICAgICAg ICAgICAgcmV0dXJuOwotCi0gICAgICAgIHRoaXMuX21haW5SZXNvdXJjZUxvYWRUaW1lID0geCB8 fCAtMTsKKyAgICAgICAgdGhpcy5fbWFpblJlc291cmNlTG9hZFRpbWUgPSBldmVudC5kYXRhIHx8 IC0xOwogICAgICAgICAvLyBVcGRhdGUgdGhlIGRpdmlkZXJzIHRvIGRyYXcgdGhlIG5ldyBsaW5l CiAgICAgICAgIHRoaXMuX3VwZGF0ZURpdmlkZXJzSWZOZWVkZWQodHJ1ZSk7CiAgICAgfSwKIAot ICAgIHNldCBtYWluUmVzb3VyY2VET01Db250ZW50VGltZSh4KQorICAgIF9kb21Db250ZW50TG9h ZGVkRXZlbnRGaXJlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewotICAgICAgICBpZiAodGhpcy5f bWFpblJlc291cmNlRE9NQ29udGVudFRpbWUgPT09IHgpCi0gICAgICAgICAgICByZXR1cm47Ci0K LSAgICAgICAgdGhpcy5fbWFpblJlc291cmNlRE9NQ29udGVudFRpbWUgPSB4IHx8IC0xOworICAg ICAgICB0aGlzLl9tYWluUmVzb3VyY2VET01Db250ZW50VGltZSA9IGV2ZW50LmRhdGEgfHwgLTE7 CiAgICAgICAgIHRoaXMuX3VwZGF0ZURpdmlkZXJzSWZOZWVkZWQodHJ1ZSk7CiAgICAgfSwKIApA QCAtODA2LDExICs4MDQsMTIgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5lbC5wcm90b3R5cGUg PSB7CiAgICAgICAgIHRoaXMuX3Jlc2V0KCk7CiAgICAgfSwKIAotICAgIGZyYW1lTmF2aWdhdGVk OiBmdW5jdGlvbihmcmFtZSwgbG9hZGVySWQpCisgICAgX2ZyYW1lTmF2aWdhdGVkOiBmdW5jdGlv bihldmVudCkKICAgICB7Ci0gICAgICAgIGlmIChmcmFtZS5wYXJlbnRJZCkKKyAgICAgICAgaWYg KCFldmVudC5kYXRhLmlzTWFpbkZyYW1lKQogICAgICAgICAgICAgcmV0dXJuOwogCisgICAgICAg IHZhciBsb2FkZXJJZCA9IGV2ZW50LmRhdGEubG9hZGVySWQ7CiAgICAgICAgIC8vIE1haW4gZnJh bWUgY29tbWl0dGVkIGxvYWQuCiAgICAgICAgIGlmICh0aGlzLl9wcmVzZXJ2ZUxvZ1RvZ2dsZS50 b2dnbGVkKQogICAgICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVRyZWVNb2RlbC5qcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VUcmVlTW9kZWwuanMKaW5kZXggMDljZDJkY2Vh ZjY0ZGY0ZTM0MzgyOWFhNTdhMWM3Yjk5YjA1OWNjNy4uZTI2ZTM4YmQzMjM2ODI1NjIwM2ZlYWJm NDQzYmFmNjU5OWU1YWM2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9SZXNvdXJjZVRyZWVNb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1Jlc291cmNlVHJlZU1vZGVsLmpzCkBAIC0zNiw2ICszNiw3IEBAIFdlYklu c3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbCA9IGZ1bmN0aW9uKG5ldHdvcmtNYW5hZ2VyKQogICAg IFdlYkluc3BlY3Rvci5uZXR3b3JrTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rv ci5OZXR3b3JrTWFuYWdlci5FdmVudFR5cGVzLlJlc291cmNlRmluaXNoZWQsIHRoaXMuX29uUmVz b3VyY2VVcGRhdGVkLCB0aGlzKTsKIAogICAgIHRoaXMuZnJvbnRlbmRSZXVzZWQoKTsKKyAgICBJ bnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRG9tYWluRGlzcGF0Y2hlcigiUGFnZSIsIG5ldyBXZWJJ bnNwZWN0b3IuUGFnZURpc3BhdGNoZXIodGhpcykpOwogfQogCiBXZWJJbnNwZWN0b3IuUmVzb3Vy Y2VUcmVlTW9kZWwuRXZlbnRUeXBlcyA9IHsKQEAgLTQzLDcgKzQ0LDEwIEBAIFdlYkluc3BlY3Rv ci5SZXNvdXJjZVRyZWVNb2RlbC5FdmVudFR5cGVzID0gewogICAgIEZyYW1lTmF2aWdhdGVkOiAi RnJhbWVOYXZpZ2F0ZWQiLAogICAgIEZyYW1lRGV0YWNoZWQ6ICJGcmFtZURldGFjaGVkIiwKICAg ICBSZXNvdXJjZUFkZGVkOiAiUmVzb3VyY2VBZGRlZCIsCi0gICAgQ2FjaGVkUmVzb3VyY2VzTG9h ZGVkOiAiQ2FjaGVkUmVzb3VyY2VzTG9hZGVkIgorICAgIENhY2hlZFJlc291cmNlc0xvYWRlZDog IkNhY2hlZFJlc291cmNlc0xvYWRlZCIsCisgICAgRE9NQ29udGVudExvYWRlZDogIkRPTUNvbnRl bnRMb2FkZWQiLAorICAgIE9uTG9hZDogIk9uTG9hZCIsCisgICAgSW5zcGVjdGVkVVJMQ2hhbmdl ZDogIkluc3BlY3RlZFVSTENoYW5nZWQiCiB9CiAKIFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVN b2RlbC5wcm90b3R5cGUgPSB7CkBAIC02MCwxNCArNjQsMjAgQEAgV2ViSW5zcGVjdG9yLlJlc291 cmNlVHJlZU1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKGVycm9yKQogICAgICAgICAg ICAgcmV0dXJuOwogCi0gICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYklu c3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5FdmVudFR5cGVzLkZyYW1lTmF2aWdhdGVkLCAwKTsK LQogICAgICAgICBXZWJJbnNwZWN0b3IubWFpblJlc291cmNlID0gdGhpcy5fYWRkRnJhbWVzUmVj dXJzaXZlbHkobWFpbkZyYW1lUGF5bG9hZCk7CiAgICAgICAgIHRoaXMuX2NhY2hlZFJlc291cmNl c1Byb2Nlc3NlZCA9IHRydWU7CiAKKyAgICAgICAgdGhpcy5fZGlzcGF0Y2hJbnNwZWN0ZWRVUkxD aGFuZ2VkKFdlYkluc3BlY3Rvci5tYWluUmVzb3VyY2UudXJsKTsKKwogICAgICAgICB0aGlzLmRp c3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZl bnRUeXBlcy5DYWNoZWRSZXNvdXJjZXNMb2FkZWQpOwogICAgIH0sCiAKKyAgICBfZGlzcGF0Y2hJ bnNwZWN0ZWRVUkxDaGFuZ2VkOiBmdW5jdGlvbih1cmwpCisgICAgeworICAgICAgICBJbnNwZWN0 b3JGcm9udGVuZEhvc3QuaW5zcGVjdGVkVVJMQ2hhbmdlZCh1cmwpOworICAgICAgICB0aGlzLmRp c3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZl bnRUeXBlcy5JbnNwZWN0ZWRVUkxDaGFuZ2VkLCB1cmwpOworICAgIH0sCisKICAgICBfYWRkT3JV cGRhdGVGcmFtZTogZnVuY3Rpb24oZnJhbWUpCiAgICAgewogICAgICAgICB0aGlzLmRpc3BhdGNo RXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZlbnRUeXBl cy5GcmFtZUFkZGVkLCBmcmFtZSk7CkBAIC05OSwxMiArMTA5LDE2IEBAIFdlYkluc3BlY3Rvci5S ZXNvdXJjZVRyZWVNb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiByZXN1bHQ7CiAg ICAgfSwKIAotICAgIGZyYW1lTmF2aWdhdGVkOiBmdW5jdGlvbihmcmFtZSwgbG9hZGVySWQpCisg ICAgX2ZyYW1lTmF2aWdhdGVkOiBmdW5jdGlvbihmcmFtZSwgbG9hZGVySWQpCiAgICAgewogICAg ICAgICBpZiAoIXRoaXMuX2NhY2hlZFJlc291cmNlc1Byb2Nlc3NlZCkKICAgICAgICAgICAgIHJl dHVybjsKIAogICAgICAgICB2YXIgaXNNYWluRnJhbWUgPSAhZnJhbWUucGFyZW50SWQ7CisgICAg ICAgIGlmIChpc01haW5GcmFtZSkKKyAgICAgICAgICAgIHRoaXMuX2Rpc3BhdGNoSW5zcGVjdGVk VVJMQ2hhbmdlZChXZWJJbnNwZWN0b3IubWFpblJlc291cmNlLnVybCk7CisKKyAgICAgICAgdGhp cy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVs LkV2ZW50VHlwZXMuRnJhbWVOYXZpZ2F0ZWQsIHsgZnJhbWU6IGZyYW1lLCBsb2FkZXJJZDogbG9h ZGVySWQsIGlzTWFpbkZyYW1lOiBpc01haW5GcmFtZSB9KTsKIAogICAgICAgICAvLyBmcmFtZS5w YXJlbnRJZCA9PT0gMCBpcyB3aGVuIG1haW4gZnJhbWUgbmF2aWdhdGlvbiBoYXBwZW5zLgogICAg ICAgICB0aGlzLl9jbGVhckNoaWxkRnJhbWVzQW5kUmVzb3VyY2VzKGlzTWFpbkZyYW1lID8gMCA6 IGZyYW1lLmlkLCBsb2FkZXJJZCk7CkBAIC0xMjQsNyArMTM4LDcgQEAgV2ViSW5zcGVjdG9yLlJl c291cmNlVHJlZU1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5S ZXNvdXJjZS5jbGVhclJldmlzaW9uSGlzdG9yeSgpOwogICAgIH0sCiAKLSAgICBmcmFtZURldGFj aGVkOiBmdW5jdGlvbihmcmFtZUlkKQorICAgIF9mcmFtZURldGFjaGVkOiBmdW5jdGlvbihmcmFt ZUlkKQogICAgIHsKICAgICAgICAgaWYgKCF0aGlzLl9jYWNoZWRSZXNvdXJjZXNQcm9jZXNzZWQp CiAgICAgICAgICAgICByZXR1cm47CkBAIC0yMTEsOCArMjI1LDYgQEAgV2ViSW5zcGVjdG9yLlJl c291cmNlVHJlZU1vZGVsLnByb3RvdHlwZSA9IHsKIAogICAgIF9jbGVhckNoaWxkRnJhbWVzQW5k UmVzb3VyY2VzOiBmdW5jdGlvbihmcmFtZUlkLCBsb2FkZXJUb1ByZXNlcnZlSWQpCiAgICAgewot ICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuUmVzb3Vy Y2VUcmVlTW9kZWwuRXZlbnRUeXBlcy5GcmFtZU5hdmlnYXRlZCwgZnJhbWVJZCk7Ci0KICAgICAg ICAgdGhpcy5fY2xlYXJSZXNvdXJjZXMoZnJhbWVJZCwgbG9hZGVyVG9QcmVzZXJ2ZUlkKTsKICAg ICAgICAgdmFyIHN1YmZyYW1lcyA9IHRoaXMuX3N1YmZyYW1lc1tmcmFtZUlkXTsKICAgICAgICAg Zm9yICh2YXIgaSA9IDA7IHN1YmZyYW1lcyAmJiBpIDwgc3ViZnJhbWVzLmxlbmd0aDsgKysgaSkg ewpAQCAtMzA1LDMgKzMxNywzNiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwucHJv dG90eXBlID0gewogfQogCiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwucHJvdG90eXBl Ll9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5PYmplY3QucHJvdG90eXBlOworCitXZWJJbnNwZWN0 b3IuUGFnZURpc3BhdGNoZXIgPSBmdW5jdGlvbihyZXNvdXJjZVRyZWVNb2RlbCkKK3sKKyAgICB0 aGlzLl9yZXNvdXJjZVRyZWVNb2RlbCA9IHJlc291cmNlVHJlZU1vZGVsOworfQorCitXZWJJbnNw ZWN0b3IuUGFnZURpc3BhdGNoZXIucHJvdG90eXBlID0geworICAgIGRvbUNvbnRlbnRFdmVudEZp cmVkOiBmdW5jdGlvbih0aW1lKQorICAgIHsKKyAgICAgICAgdGhpcy5fcmVzb3VyY2VUcmVlTW9k ZWwuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2Rl bC5FdmVudFR5cGVzLkRPTUNvbnRlbnRMb2FkZWQsIHRpbWUpOworICAgICAgCisgICAgICAgIC8v IEZJWE1FOiB0aGUgb25seSBjbGllbnQgaXMgSEFSLCBmaXggaXQgdGhlcmUuCisgICAgICAgIFdl Ykluc3BlY3Rvci5tYWluUmVzb3VyY2VET01Db250ZW50VGltZSA9IHRpbWU7CisgICAgfSwKKwor ICAgIGxvYWRFdmVudEZpcmVkOiBmdW5jdGlvbih0aW1lKQorICAgIHsKKyAgICAgICAgdGhpcy5f cmVzb3VyY2VUcmVlTW9kZWwuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5S ZXNvdXJjZVRyZWVNb2RlbC5FdmVudFR5cGVzLk9uTG9hZCwgdGltZSk7CisKKyAgICAgICAgLy8g RklYTUU6IHRoZSBvbmx5IGNsaWVudCBpcyBIQVIsIGZpeCBpdCB0aGVyZS4KKyAgICAgICAgV2Vi SW5zcGVjdG9yLm1haW5SZXNvdXJjZUxvYWRUaW1lID0gdGltZTsKKyAgICB9LAorCisgICAgZnJh bWVOYXZpZ2F0ZWQ6IGZ1bmN0aW9uKGZyYW1lLCBsb2FkZXJJZCkKKyAgICB7CisgICAgICAgIHRo aXMuX3Jlc291cmNlVHJlZU1vZGVsLl9mcmFtZU5hdmlnYXRlZChmcmFtZSwgbG9hZGVySWQpOwor ICAgIH0sCisKKyAgICBmcmFtZURldGFjaGVkOiBmdW5jdGlvbihmcmFtZUlkKQorICAgIHsKKyAg ICAgICAgdGhpcy5fcmVzb3VyY2VUcmVlTW9kZWwuX2ZyYW1lRGV0YWNoZWQobG9hZGVySWQpOwor ICAgIH0KK30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv UmVzb3VyY2VzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jl c291cmNlc1BhbmVsLmpzCmluZGV4IDBhNTM0M2RkZDYwNDFjMmQxYjFmMGYzYjc1OWIyYzg0MGNh ZjI2NmMuLjAxOGQxNGI0ZTdlZTFmMThiYmNmOTU1YjYyYTgzMzQ2OGM3YTQxYzAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5q cwpAQCAtNzgsNiArNzgsOCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwgPSBmdW5jdGlv bihkYXRhYmFzZSkKICAgICB0aGlzLnJlZ2lzdGVyU2hvcnRjdXRzKCk7CiAKICAgICBXZWJJbnNw ZWN0b3IubmV0d29ya01hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuTmV0d29y a01hbmFnZXIuRXZlbnRUeXBlcy5SZXNvdXJjZVVwZGF0ZWQsIHRoaXMuX3JlZnJlc2hSZXNvdXJj ZSwgdGhpcyk7CisKKyAgICBXZWJJbnNwZWN0b3IucmVzb3VyY2VUcmVlTW9kZWwuYWRkRXZlbnRM aXN0ZW5lcihXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZlbnRUeXBlcy5PbkxvYWQs IHRoaXMuX29uTG9hZEV2ZW50RmlyZWQsIHRoaXMpOwogfQogCiBXZWJJbnNwZWN0b3IuUmVzb3Vy Y2VzUGFuZWwucHJvdG90eXBlID0gewpAQCAtMTA2LDcgKzEwOCw3IEBAIFdlYkluc3BlY3Rvci5S ZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl9zaG93UmVzb3Vy Y2VWaWV3KHRoaXMudmlzaWJsZVZpZXcucmVzb3VyY2UpOwogICAgIH0sCiAKLSAgICBsb2FkRXZl bnRGaXJlZDogZnVuY3Rpb24oKQorICAgIF9vbkxvYWRFdmVudEZpcmVkOiBmdW5jdGlvbigpCiAg ICAgewogICAgICAgICB0aGlzLl9pbml0RGVmYXVsdFNlbGVjdGlvbigpOwogICAgIH0sCkBAIC0y NTMsOCArMjU1LDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZSA9IHsK IAogICAgIF9mcmFtZU5hdmlnYXRlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewotICAgICAgICB2 YXIgZnJhbWVJZCA9IGV2ZW50LmRhdGE7Ci0gICAgICAgIGlmICghZnJhbWVJZCkgeworICAgICAg ICBpZiAoZXZlbnQuZGF0YS5pc01haW5GcmFtZSkgewogICAgICAgICAgICAgLy8gVG90YWwgdXBk YXRlLgogICAgICAgICAgICAgdGhpcy5yZXNvdXJjZXNMaXN0VHJlZUVsZW1lbnQucmVtb3ZlQ2hp bGRyZW4oKTsKICAgICAgICAgICAgIHRoaXMuX3RyZWVFbGVtZW50Rm9yRnJhbWVJZCA9IHt9OwpA QCAtMjYyLDYgKzI2Myw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUg PSB7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAorICAgICAgICB2YXIgZnJhbWVJ ZCA9IGV2ZW50LmRhdGEuZnJhbWUuaWQ7CiAgICAgICAgIHZhciBmcmFtZVRyZWVFbGVtZW50ID0g dGhpcy5fdHJlZUVsZW1lbnRGb3JGcmFtZUlkW2ZyYW1lSWRdOwogICAgICAgICBpZiAoZnJhbWVU cmVlRWxlbWVudCkKICAgICAgICAgICAgIGZyYW1lVHJlZUVsZW1lbnQucmVtb3ZlQ2hpbGRyZW4o KTsgICAgICAgIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9pbnNwZWN0b3IuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3Bl Y3Rvci5qcwppbmRleCAwNzM1Njc5MGQ0ZGUzNzBjOWZkNjI2YjM4ZTUyMGM3Y2ZjZTQ5YzBmLi43 MjRmNzg5MGE3ZjJiMDdhMTA0M2E1ZGQwY2Y1YTM2OTEyYzJmNGJkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcworKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwpAQCAtNDM2LDcgKzQzNiw2 IEBAIFdlYkluc3BlY3Rvci5kb0xvYWRlZERvbmUgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5kb21B Z2VudCA9IG5ldyBXZWJJbnNwZWN0b3IuRE9NQWdlbnQoKTsKIAogICAgIEluc3BlY3RvckJhY2tl bmQucmVnaXN0ZXJEb21haW5EaXNwYXRjaGVyKCJJbnNwZWN0b3IiLCB0aGlzKTsKLSAgICBJbnNw ZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRG9tYWluRGlzcGF0Y2hlcigiUGFnZSIsIHRoaXMpOwogCiAg ICAgdGhpcy5yZXNvdXJjZUNhdGVnb3JpZXMgPSB7CiAgICAgICAgIGRvY3VtZW50czogbmV3IFdl Ykluc3BlY3Rvci5SZXNvdXJjZUNhdGVnb3J5KCJkb2N1bWVudHMiLCBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIkRvY3VtZW50cyIpLCAicmdiKDQ3LDEwMiwyMzYpIiksCkBAIC05ODEsMzQgKzk4MCw2 IEBAIFdlYkluc3BlY3Rvci5zdGFydFVzZXJJbml0aWF0ZWREZWJ1Z2dpbmcgPSBmdW5jdGlvbigp CiAgICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuZW5hYmxlRGVidWdnZXIoKTsKIH0KIAot V2ViSW5zcGVjdG9yLmRvbUNvbnRlbnRFdmVudEZpcmVkID0gZnVuY3Rpb24odGltZSkKLXsKLSAg ICB0aGlzLnBhbmVscy5hdWRpdHMubWFpblJlc291cmNlRE9NQ29udGVudFRpbWUgPSB0aW1lOwot ICAgIHRoaXMucGFuZWxzLm5ldHdvcmsubWFpblJlc291cmNlRE9NQ29udGVudFRpbWUgPSB0aW1l OwotCi0gICAgdGhpcy5tYWluUmVzb3VyY2VET01Db250ZW50VGltZSA9IHRpbWU7Ci19Ci0KLVdl Ykluc3BlY3Rvci5sb2FkRXZlbnRGaXJlZCA9IGZ1bmN0aW9uKHRpbWUpCi17Ci0gICAgdGhpcy5w YW5lbHMuYXVkaXRzLm1haW5SZXNvdXJjZUxvYWRUaW1lID0gdGltZTsKLSAgICB0aGlzLnBhbmVs cy5uZXR3b3JrLm1haW5SZXNvdXJjZUxvYWRUaW1lID0gdGltZTsKLSAgICB0aGlzLnBhbmVscy5y ZXNvdXJjZXMubG9hZEV2ZW50RmlyZWQoKTsKLQotICAgIHRoaXMubWFpblJlc291cmNlTG9hZFRp bWUgPSB0aW1lOwotfQotCi0vLyBGSVhNRTogbW92ZSB0aGVzZSBpbnRvIHRoZSBkZWRpY2F0ZWQg ZGlzcGF0Y2hlci4KLVdlYkluc3BlY3Rvci5mcmFtZU5hdmlnYXRlZCA9IGZ1bmN0aW9uKGZyYW1l LCBsb2FkZXJJZCkKLXsKLSAgICB0aGlzLnJlc291cmNlVHJlZU1vZGVsLmZyYW1lTmF2aWdhdGVk KGZyYW1lLCBsb2FkZXJJZCk7Ci0gICAgdGhpcy5wYW5lbHMubmV0d29yay5mcmFtZU5hdmlnYXRl ZChmcmFtZSwgbG9hZGVySWQpOwotfQotV2ViSW5zcGVjdG9yLmZyYW1lRGV0YWNoZWQgPSBmdW5j dGlvbihmcmFtZUlkKQotewotICAgIHRoaXMucmVzb3VyY2VUcmVlTW9kZWwuZnJhbWVEZXRhY2hl ZChsb2FkZXJJZCk7Ci19Ci0KIFdlYkluc3BlY3Rvci5yZXNldCA9IGZ1bmN0aW9uKCkKIHsKICAg ICB0aGlzLmRlYnVnZ2VyTW9kZWwucmVzZXQoKTsKQEAgLTEwMzEsMTMgKzEwMDIsNiBAQCBXZWJJ bnNwZWN0b3IuYnJpbmdUb0Zyb250ID0gZnVuY3Rpb24oKQogICAgIEluc3BlY3RvckZyb250ZW5k SG9zdC5icmluZ1RvRnJvbnQoKTsKIH0KIAotV2ViSW5zcGVjdG9yLmluc3BlY3RlZFVSTENoYW5n ZWQgPSBmdW5jdGlvbih1cmwpCi17Ci0gICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0Lmluc3BlY3Rl ZFVSTENoYW5nZWQodXJsKTsKLSAgICB0aGlzLmRvbUJyZWFrcG9pbnRzU2lkZWJhclBhbmUuc2V0 SW5zcGVjdGVkVVJMKHVybCk7Ci0gICAgdGhpcy5leHRlbnNpb25TZXJ2ZXIubm90aWZ5SW5zcGVj dGVkVVJMQ2hhbmdlZCh1cmwpOwotfQotCiBXZWJJbnNwZWN0b3IuZGlkQ3JlYXRlV29ya2VyID0g ZnVuY3Rpb24oKQogewogICAgIHZhciB3b3JrZXJzUGFuZSA9IFdlYkluc3BlY3Rvci5wYW5lbHMu c2NyaXB0cy5zaWRlYmFyUGFuZXMud29ya2VyczsK