73569 2011-12-01 09:42:41 -0800 Web Inspector: refactor InspectorBackendDispatcher so that it does not use JSON-serialized command templates. 2011-12-02 00:30:33 -0800 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 512853 0 pfeldman 2011-12-01 09:42:41 -0800 Patch to follow. 512856 1 117437 pfeldman 2011-12-01 09:46:38 -0800 Created attachment 117437 Patch 512885 2 117437 loislo 2011-12-01 10:35:24 -0800 Comment on attachment 117437 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=117437&action=review lgtm > LayoutTests/inspector/report-API-errors-expected.txt:5 > +Protocol Error: Invalid type of argument 'enabled' for method 'Console.setMonitoringXHREnabled' call. It must be 'boolean' but it is 'number'. > +Protocol Error: Invalid number of arguments for method 'Console.setMonitoringXHREnabled' call. It must have the following arguments '[{"name":"enabled","type":"boolean","optional":false}]'. > +Protocol Error: Optional callback argument for method 'Console.setMonitoringXHREnabled' call must be a function but its type is 'string'. Could you please restore the name of agent. 512886 3 loislo 2011-12-01 10:36:38 -0800 please attach the generated file. 512905 4 pfeldman 2011-12-01 10:59:24 -0800 > Could you please restore the name of agent. I don't think this is necessary. New version simplifies code and uses documented protocol method notation ("Console.setMonitoringXHREnabled"). 512907 5 pfeldman 2011-12-01 11:00:13 -0800 (In reply to comment #3) > please attach the generated file. It did not really change much - it's just that instead of name: { optional:, type:} it is {name:, type:, optional}. I.e. matches the way we declare it in the protocol. 512920 6 loislo 2011-12-01 11:18:23 -0800 (In reply to comment #4) > > Could you please restore the name of agent. > > I don't think this is necessary. New version simplifies code and uses documented protocol method notation ("Console.setMonitoringXHREnabled"). Let remove Agent suffix from the backend's error messages too. 512931 7 pfeldman 2011-12-01 11:28:07 -0800 > Let remove Agent suffix from the backend's error messages too. What "backend's error messages" are you talking about? 512943 8 loislo 2011-12-01 11:35:17 -0800 (In reply to comment #7) > > Let remove Agent suffix from the backend's error messages too. > > What "backend's error messages" are you talking about? looks like the 'Agent' suffix was lost in order of introducing jsonprc. sorry. 513586 9 pfeldman 2011-12-02 00:30:33 -0800 Committed r101756: <http://trac.webkit.org/changeset/101756> 117437 2011-12-01 09:46:38 -0800 2011-12-01 22:26:32 -0800 Patch bug-73569-20111201214636.patch text/plain 12952 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxNjcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDlhN2U3ZjdmNjA0MTdj MWQyZGIyZWZiM2RlN2VlMmY5ZmQ2NGZiMy4uOGI3MTI0ZDZkNmVmMWIxMjc0NmUyY2Q5OWFmYjg3 MjFjMjQ5MGRlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDExLTEyLTAxICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiByZWZhY3RvciBJbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlciBzbyB0aGF0IGl0IGRvZXMgbm90 IHVzZSBKU09OLXNlcmlhbGl6ZWQgY29tbWFuZCB0ZW1wbGF0ZXMuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MzU2OQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL0NvZGVHZW5lcmF0b3JJ bnNwZWN0b3IucHk6CisgICAgICAgIChHZW5lcmF0b3IucHJvY2Vzc19jb21tYW5kKToKKyAgICAg ICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yLmpzb246CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9JbnNwZWN0b3JCYWNrZW5kLmpzOgorICAgICAgICAoSW5zcGVjdG9yQmFja2VuZENsYXNz LnByb3RvdHlwZS5fd3JhcC5jYWxsYmFjayk6CisgICAgICAgIChJbnNwZWN0b3JCYWNrZW5kQ2xh c3MucHJvdG90eXBlLl93cmFwKToKKyAgICAgICAgKEluc3BlY3RvckJhY2tlbmRDbGFzcy5wcm90 b3R5cGUucmVnaXN0ZXJDb21tYW5kKToKKyAgICAgICAgKEluc3BlY3RvckJhY2tlbmRDbGFzcy5w cm90b3R5cGUuX2ludm9rZSk6CisgICAgICAgIChJbnNwZWN0b3JCYWNrZW5kQ2xhc3MucHJvdG90 eXBlLl9zZW5kTWVzc2FnZVRvQmFja2VuZCk6CisgICAgICAgIChJbnNwZWN0b3JCYWNrZW5kQ2xh c3MucHJvdG90eXBlLl93cmFwQ2FsbGJhY2tBbmRTZW5kTWVzc2FnZU9iamVjdCk6CisKIDIwMTEt MTItMDEgIEtlbnRhcm8gSGFyYSAgPGhhcmFrZW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVu cmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMDE2NjkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvQ29kZUdlbmVyYXRvckluc3BlY3Rvci5weSBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yLnB5CmluZGV4IDVkMTM4ZjRjNzc3NWFkYzli NTQ0Y2UzOTJkMGVkMzNhZWNkZGIzYWIuLjlhNmUxNWE4YmY0ZGRjM2E5OWMyZTFjZTkyNTZhZTA4 YjllN2QzMGIgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJh dG9ySW5zcGVjdG9yLnB5CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJh dG9ySW5zcGVjdG9yLnB5CkBAIC05MzcsNyArOTM3LDcgQEAgJG1ldGhvZHMKIAogJGRlbGVnYXRl cwogJGV2ZW50QXJncwotJHJlcGx5QXJncyRkb21haW5EaXNwYXRjaGVycworJGRvbWFpbkRpc3Bh dGNoZXJzCiAiIiIpCiAKICAgICBwYXJhbV9jb250YWluZXJfYWNjZXNzX2NvZGUgPSAiIiIKQEAg LTk2MSw3ICs5NjEsNiBAQCBjbGFzcyBHZW5lcmF0b3I6CiAgICAgZnJvbnRlbmRfbWV0aG9kX2xp c3QgPSBbXQogICAgIGJhY2tlbmRfanNfaW5pdGlhbGl6ZXJfbGlzdCA9IFtdCiAgICAgYmFja2Vu ZF9qc19ldmVudF9saXN0ID0gW10KLSAgICBiYWNrZW5kX2pzX3JlcGx5X2xpc3QgPSBbXQogICAg IGJhY2tlbmRfanNfZG9tYWluX2Rpc3BhdGNoZXJfbGlzdCA9IFtdCiAKICAgICBiYWNrZW5kX3Nl dHRlcnNfbGlzdCA9IFtdCkBAIC0xMTA3LDEwICsxMTA2LDEwIEBAIGNsYXNzIEdlbmVyYXRvcjoK ICAgICAgICAgICAgICAgICBhZ2VudF9jYWxsX3BhcmFtX2xpc3QuYXBwZW5kKHBhcmFtKQogCiAg ICAgICAgICAgICAgICAganNfYmluZF90eXBlID0gcGFyYW1fcmF3X3R5cGUuZ2V0X2pzX2JpbmRf dHlwZSgpCi0gICAgICAgICAgICAgICAganNfcGFyYW1fdGV4dCA9ICJcIiVzXCI6IHtcIm9wdGlv bmFsXCI6ICVzLCBcInR5cGVcIjogXCIlc1wifSIgJSAoCisgICAgICAgICAgICAgICAganNfcGFy YW1fdGV4dCA9ICJ7XCJuYW1lXCI6IFwiJXNcIiwgXCJ0eXBlXCI6IFwiJXNcIiwgXCJvcHRpb25h bFwiOiAlc30iICUgKAogICAgICAgICAgICAgICAgICAgICBqc29uX3BhcmFtX25hbWUsCi0gICAg ICAgICAgICAgICAgICAgICgidHJ1ZSIgaWYgKCJvcHRpb25hbCIgaW4ganNvbl9wYXJhbWV0ZXIg YW5kIGpzb25fcGFyYW1ldGVyWyJvcHRpb25hbCJdKSBlbHNlICJmYWxzZSIpLAotICAgICAgICAg ICAgICAgICAgICBqc19iaW5kX3R5cGUpCisgICAgICAgICAgICAgICAgICAgIGpzX2JpbmRfdHlw ZSwKKyAgICAgICAgICAgICAgICAgICAgKCJ0cnVlIiBpZiAoIm9wdGlvbmFsIiBpbiBqc29uX3Bh cmFtZXRlciBhbmQganNvbl9wYXJhbWV0ZXJbIm9wdGlvbmFsIl0pIGVsc2UgImZhbHNlIikpCiAK ICAgICAgICAgICAgICAgICBqc19wYXJhbV9saXN0LmFwcGVuZChqc19wYXJhbV90ZXh0KQogCkBA IC0xMTU0LDcgKzExNTMsNyBAQCBjbGFzcyBHZW5lcmF0b3I6CiAgICAgICAgICAgICByZXNwb25z ZUNvb2s9cmVzcG9uc2VfY29va190ZXh0KSkKICAgICAgICAgR2VuZXJhdG9yLmJhY2tlbmRfbWV0 aG9kX25hbWVfZGVjbGFyYXRpb25fbGlzdC5hcHBlbmQoIiAgICBcIiVzLiVzXCIsIiAlIChkb21h aW5fbmFtZSwganNvbl9jb21tYW5kX25hbWUpKQogCi0gICAgICAgIEdlbmVyYXRvci5iYWNrZW5k X2pzX2luaXRpYWxpemVyX2xpc3QuYXBwZW5kKCJJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyQ29t bWFuZChcIiVzLiVzXCIsIHslc30sICVzKTtcbiIgJSAoZG9tYWluX25hbWUsIGpzb25fY29tbWFu ZF9uYW1lLCBqc19wYXJhbWV0ZXJzX3RleHQsIGpzX3JlcGx5X2xpc3QpKQorICAgICAgICBHZW5l cmF0b3IuYmFja2VuZF9qc19pbml0aWFsaXplcl9saXN0LmFwcGVuZCgiSW5zcGVjdG9yQmFja2Vu ZC5yZWdpc3RlckNvbW1hbmQoXCIlcy4lc1wiLCBbJXNdLCAlcyk7XG4iICUgKGRvbWFpbl9uYW1l LCBqc29uX2NvbW1hbmRfbmFtZSwganNfcGFyYW1ldGVyc190ZXh0LCBqc19yZXBseV9saXN0KSkK IAogR2VuZXJhdG9yLmdvKCkKIApAQCAtMTE5MSw3ICsxMTkwLDYgQEAgYmFja2VuZF9jcHBfZmls ZS53cml0ZShUZW1wbGF0ZXMuYmFja2VuZF9jcHAuc3Vic3RpdHV0ZShOb25lLAogCiBiYWNrZW5k X2pzX2ZpbGUud3JpdGUoVGVtcGxhdGVzLmJhY2tlbmRfanMuc3Vic3RpdHV0ZShOb25lLAogICAg IGRlbGVnYXRlcz1qb2luKEdlbmVyYXRvci5iYWNrZW5kX2pzX2luaXRpYWxpemVyX2xpc3QsICIi KSwKLSAgICByZXBseUFyZ3M9am9pbihHZW5lcmF0b3IuYmFja2VuZF9qc19yZXBseV9saXN0LCAi IiksCiAgICAgZXZlbnRBcmdzPWpvaW4oR2VuZXJhdG9yLmJhY2tlbmRfanNfZXZlbnRfbGlzdCwg IiIpLAogICAgIGRvbWFpbkRpc3BhdGNoZXJzPWpvaW4oR2VuZXJhdG9yLmJhY2tlbmRfanNfZG9t YWluX2Rpc3BhdGNoZXJfbGlzdCwgIiIpKSkKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3Rvci5qc29uIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3Rvci5qc29uCmluZGV4IGQxMGUwY2E0YjczZGM5NDgxNTI5NzFlNjZiYjYyOGY2YWQ1MzczNGYu LmM0YmIzZWVjYjA0YzBhY2VkY2NjN2UxNWQwNzM2ZGZmM2NhZTI0OWUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgorKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KQEAgLTIyNDIsNyArMjI0Miw2IEBACiAgICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAidmFsdWUiLCAidHlwZSI6ICJib29sZWFuIiB9CiAgICAg ICAgICAgICAgICAgXQogICAgICAgICAgICAgfQotCiAgICAgICAgIF0sCiAgICAgICAgICJldmVu dHMiOiBbCiAgICAgICAgICAgICB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0luc3BlY3RvckJhY2tlbmQuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0luc3BlY3RvckJhY2tlbmQuanMKaW5kZXggNDEwNWVjNTQ0Yzk2MGM3NGY5 ZTU0MGY0YTllMWJiMGEwYjk3NzNmMi4uZmEzYWMwZDVhOTY1Njg3OTdlYjAzYjNmMjE1MzYyZTFl Y2ViOTA5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9J bnNwZWN0b3JCYWNrZW5kLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvSW5zcGVjdG9yQmFja2VuZC5qcwpAQCAtNDUsMjQgKzQ1LDI5IEBAIGZ1bmN0aW9uIEluc3Bl Y3RvckJhY2tlbmRDbGFzcygpCiB9CiAKIEluc3BlY3RvckJhY2tlbmRDbGFzcy5wcm90b3R5cGUg PSB7Ci0gICAgX3dyYXA6IGZ1bmN0aW9uKGNhbGxiYWNrKQorICAgIF93cmFwOiBmdW5jdGlvbihj YWxsYmFjaywgbWV0aG9kKQogICAgIHsKICAgICAgICAgdmFyIGNhbGxiYWNrSWQgPSB0aGlzLl9s YXN0Q2FsbGJhY2tJZCsrOwotICAgICAgICB0aGlzLl9jYWxsYmFja3NbY2FsbGJhY2tJZF0gPSBj YWxsYmFjayB8fCBmdW5jdGlvbigpIHt9OworICAgICAgICBpZiAoIWNhbGxiYWNrKQorICAgICAg ICAgICAgY2FsbGJhY2sgPSBmdW5jdGlvbigpIHt9OworCisgICAgICAgIHRoaXMuX2NhbGxiYWNr c1tjYWxsYmFja0lkXSA9IGNhbGxiYWNrOworICAgICAgICBjYWxsYmFjay5tZXRob2ROYW1lID0g bWV0aG9kOworICAgICAgICBpZiAodGhpcy5kdW1wSW5zcGVjdG9yVGltZVN0YXRzKQorICAgICAg ICAgICAgY2FsbGJhY2suc2VuZFJlcXVlc3RUaW1lID0gRGF0ZS5ub3coKTsKKyAgICAgICAgCiAg ICAgICAgIHJldHVybiBjYWxsYmFja0lkOwogICAgIH0sCiAKICAgICByZWdpc3RlckNvbW1hbmQ6 IGZ1bmN0aW9uKG1ldGhvZCwgc2lnbmF0dXJlLCByZXBseUFyZ3MpCiAgICAgewotICAgICAgICB2 YXIgZG9tYWluQW5kRnVuY3Rpb24gPSBtZXRob2Quc3BsaXQoIi4iKTsKLSAgICAgICAgdmFyIGFn ZW50TmFtZSA9IGRvbWFpbkFuZEZ1bmN0aW9uWzBdICsgIkFnZW50IjsKKyAgICAgICAgdmFyIGRv bWFpbkFuZE1ldGhvZCA9IG1ldGhvZC5zcGxpdCgiLiIpOworICAgICAgICB2YXIgYWdlbnROYW1l ID0gZG9tYWluQW5kTWV0aG9kWzBdICsgIkFnZW50IjsKICAgICAgICAgaWYgKCF3aW5kb3dbYWdl bnROYW1lXSkKICAgICAgICAgICAgIHdpbmRvd1thZ2VudE5hbWVdID0ge307CiAKLSAgICAgICAg dmFyIHJlcXVlc3QgPSB7IG1ldGhvZDogbWV0aG9kLCBwYXJhbXM6IHNpZ25hdHVyZSB9OwotICAg ICAgICB2YXIgcmVxdWVzdFN0cmluZyA9IEpTT04uc3RyaW5naWZ5KHJlcXVlc3QpOwotICAgICAg ICB3aW5kb3dbYWdlbnROYW1lXVtkb21haW5BbmRGdW5jdGlvblsxXV0gPSB0aGlzLl9zZW5kTWVz c2FnZVRvQmFja2VuZC5iaW5kKHRoaXMsIHJlcXVlc3RTdHJpbmcpOwotICAgICAgICB3aW5kb3db YWdlbnROYW1lXVtkb21haW5BbmRGdW5jdGlvblsxXV1bImludm9rZSJdID0gdGhpcy5faW52b2tl LmJpbmQodGhpcywgcmVxdWVzdFN0cmluZyk7CisgICAgICAgIHdpbmRvd1thZ2VudE5hbWVdW2Rv bWFpbkFuZE1ldGhvZFsxXV0gPSB0aGlzLl9zZW5kTWVzc2FnZVRvQmFja2VuZC5iaW5kKHRoaXMs IG1ldGhvZCwgc2lnbmF0dXJlKTsKKyAgICAgICAgd2luZG93W2FnZW50TmFtZV1bZG9tYWluQW5k TWV0aG9kWzFdXVsiaW52b2tlIl0gPSB0aGlzLl9pbnZva2UuYmluZCh0aGlzLCBtZXRob2QsIHNp Z25hdHVyZSk7CiAgICAgICAgIHRoaXMuX3JlcGx5QXJnc1ttZXRob2RdID0gcmVwbHlBcmdzOwog ICAgIH0sCiAKQEAgLTcxLDY5ICs3Niw2MCBAQCBJbnNwZWN0b3JCYWNrZW5kQ2xhc3MucHJvdG90 eXBlID0gewogICAgICAgICB0aGlzLl9ldmVudEFyZ3NbZXZlbnROYW1lXSA9IHBhcmFtczsKICAg ICB9LAogCi0gICAgX2ludm9rZTogZnVuY3Rpb24ocmVxdWVzdFN0cmluZywgYXJncywgY2FsbGJh Y2spCisgICAgX2ludm9rZTogZnVuY3Rpb24obWV0aG9kLCBzaWduYXR1cmUsIGFyZ3MsIGNhbGxi YWNrKQogICAgIHsKLSAgICAgICAgdmFyIHJlcXVlc3QgPSBKU09OLnBhcnNlKHJlcXVlc3RTdHJp bmcpOwotICAgICAgICByZXF1ZXN0LnBhcmFtcyA9IGFyZ3M7Ci0gICAgICAgIHRoaXMuX3dyYXBD YWxsYmFja0FuZFNlbmRNZXNzYWdlT2JqZWN0KHJlcXVlc3QsIGNhbGxiYWNrKTsKKyAgICAgICAg dGhpcy5fd3JhcENhbGxiYWNrQW5kU2VuZE1lc3NhZ2VPYmplY3QobWV0aG9kLCBhcmdzLCBjYWxs YmFjayk7CiAgICAgfSwKIAotICAgIF9zZW5kTWVzc2FnZVRvQmFja2VuZDogZnVuY3Rpb24oKQor ICAgIF9zZW5kTWVzc2FnZVRvQmFja2VuZDogZnVuY3Rpb24obWV0aG9kLCBzaWduYXR1cmUsIHZh cmFyZykKICAgICB7Ci0gICAgICAgIHZhciBhcmdzID0gQXJyYXkucHJvdG90eXBlLnNsaWNlLmNh bGwoYXJndW1lbnRzKTsKLSAgICAgICAgdmFyIHJlcXVlc3QgPSBKU09OLnBhcnNlKGFyZ3Muc2hp ZnQoKSk7Ci0gICAgICAgIHZhciBjYWxsYmFjayA9IChhcmdzLmxlbmd0aCAmJiB0eXBlb2YgYXJn c1thcmdzLmxlbmd0aCAtIDFdID09PSAiZnVuY3Rpb24iKSA/IGFyZ3MucG9wKCkgOiAwOwotICAg ICAgICB2YXIgZG9tYWluQW5kTWV0aG9kID0gcmVxdWVzdC5tZXRob2Quc3BsaXQoIi4iKTsKLSAg ICAgICAgdmFyIGFnZW50TWV0aG9kID0gZG9tYWluQW5kTWV0aG9kWzBdICsgIkFnZW50LiIgKyBk b21haW5BbmRNZXRob2RbMV07CisgICAgICAgIHZhciBhcmdzID0gQXJyYXkucHJvdG90eXBlLnNs aWNlLmNhbGwoYXJndW1lbnRzLCAyKTsKKyAgICAgICAgdmFyIGNhbGxiYWNrID0gKGFyZ3MubGVu Z3RoICYmIHR5cGVvZiBhcmdzW2FyZ3MubGVuZ3RoIC0gMV0gPT09ICJmdW5jdGlvbiIpID8gYXJn cy5wb3AoKSA6IG51bGw7CiAKKyAgICAgICAgdmFyIHBhcmFtcyA9IHt9OwogICAgICAgICB2YXIg aGFzUGFyYW1zID0gZmFsc2U7Ci0gICAgICAgIGlmIChyZXF1ZXN0LnBhcmFtcykgewotICAgICAg ICAgICAgZm9yICh2YXIga2V5IGluIHJlcXVlc3QucGFyYW1zKSB7Ci0gICAgICAgICAgICAgICAg dmFyIHR5cGVOYW1lID0gcmVxdWVzdC5wYXJhbXNba2V5XS50eXBlOwotICAgICAgICAgICAgICAg IHZhciBvcHRpb25hbEZsYWcgPSByZXF1ZXN0LnBhcmFtc1trZXldWyJvcHRpb25hbCJdOwotCi0g ICAgICAgICAgICAgICAgaWYgKGFyZ3MubGVuZ3RoID09PSAwICYmICFvcHRpb25hbEZsYWcpIHsK LSAgICAgICAgICAgICAgICAgICAgY29uc29sZS5lcnJvcigiUHJvdG9jb2wgRXJyb3I6IEludmFs aWQgbnVtYmVyIG9mIGFyZ3VtZW50cyBmb3IgbWV0aG9kICciICsgYWdlbnRNZXRob2QgKyAiJyBj YWxsLiBJdCBtdXN0IGhhdmUgdGhlIG5leHQgYXJndW1lbnRzICciICsgSlNPTi5zdHJpbmdpZnko cmVxdWVzdC5wYXJhbXMpICsgIicuIik7Ci0gICAgICAgICAgICAgICAgICAgIHJldHVybjsKLSAg ICAgICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgICAgICB2YXIgdmFsdWUgPSBhcmdzLnNoaWZ0 KCk7Ci0gICAgICAgICAgICAgICAgaWYgKG9wdGlvbmFsRmxhZyAmJiB0eXBlb2YgdmFsdWUgPT09 ICJ1bmRlZmluZWQiKSB7Ci0gICAgICAgICAgICAgICAgICAgIGRlbGV0ZSByZXF1ZXN0LnBhcmFt c1trZXldOwotICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgICAgICB9 CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgc2lnbmF0dXJlLmxlbmd0aDsgKytpKSB7Cisg ICAgICAgICAgICB2YXIgcGFyYW0gPSBzaWduYXR1cmVbaV07CisgICAgICAgICAgICB2YXIgcGFy YW1OYW1lID0gcGFyYW1bIm5hbWUiXTsKKyAgICAgICAgICAgIHZhciB0eXBlTmFtZSA9IHBhcmFt WyJ0eXBlIl07CisgICAgICAgICAgICB2YXIgb3B0aW9uYWxGbGFnID0gcGFyYW1bIm9wdGlvbmFs Il07CisKKyAgICAgICAgICAgIGlmICghYXJncy5sZW5ndGggJiYgIW9wdGlvbmFsRmxhZykgewor ICAgICAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoIlByb3RvY29sIEVycm9yOiBJbnZhbGlkIG51 bWJlciBvZiBhcmd1bWVudHMgZm9yIG1ldGhvZCAnIiArIG1ldGhvZCArICInIGNhbGwuIEl0IG11 c3QgaGF2ZSB0aGUgZm9sbG93aW5nIGFyZ3VtZW50cyAnIiArIEpTT04uc3RyaW5naWZ5KHNpZ25h dHVyZSkgKyAiJy4iKTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CiAK LSAgICAgICAgICAgICAgICBpZiAodHlwZW9mIHZhbHVlICE9PSB0eXBlTmFtZSkgewotICAgICAg ICAgICAgICAgICAgICBjb25zb2xlLmVycm9yKCJQcm90b2NvbCBFcnJvcjogSW52YWxpZCB0eXBl IG9mIGFyZ3VtZW50ICciICsga2V5ICsgIicgZm9yIG1ldGhvZCAnIiArIGFnZW50TWV0aG9kICsg IicgY2FsbC4gSXQgbXVzdCBiZSAnIiArIHR5cGVOYW1lICsgIicgYnV0IGl0IGlzICciICsgdHlw ZW9mIHZhbHVlICsgIicuIik7Ci0gICAgICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAg ICAgICAgICB9CisgICAgICAgICAgICB2YXIgdmFsdWUgPSBhcmdzLnNoaWZ0KCk7CisgICAgICAg ICAgICBpZiAob3B0aW9uYWxGbGFnICYmIHR5cGVvZiB2YWx1ZSA9PT0gInVuZGVmaW5lZCIpIHsK KyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIH0KIAotICAgICAgICAgICAg ICAgIHJlcXVlc3QucGFyYW1zW2tleV0gPSB2YWx1ZTsKLSAgICAgICAgICAgICAgICBoYXNQYXJh bXMgPSB0cnVlOworICAgICAgICAgICAgaWYgKHR5cGVvZiB2YWx1ZSAhPT0gdHlwZU5hbWUpIHsK KyAgICAgICAgICAgICAgICBjb25zb2xlLmVycm9yKCJQcm90b2NvbCBFcnJvcjogSW52YWxpZCB0 eXBlIG9mIGFyZ3VtZW50ICciICsgcGFyYW1OYW1lICsgIicgZm9yIG1ldGhvZCAnIiArIG1ldGhv ZCArICInIGNhbGwuIEl0IG11c3QgYmUgJyIgKyB0eXBlTmFtZSArICInIGJ1dCBpdCBpcyAnIiAr IHR5cGVvZiB2YWx1ZSArICInLiIpOworICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAg ICAgIH0KLSAgICAgICAgICAgIGlmICghaGFzUGFyYW1zKQotICAgICAgICAgICAgICAgIGRlbGV0 ZSByZXF1ZXN0LnBhcmFtczsKKworICAgICAgICAgICAgcGFyYW1zW3BhcmFtTmFtZV0gPSB2YWx1 ZTsKKyAgICAgICAgICAgIGhhc1BhcmFtcyA9IHRydWU7CiAgICAgICAgIH0KIAogICAgICAgICBp ZiAoYXJncy5sZW5ndGggPT09IDEgJiYgIWNhbGxiYWNrKSB7CiAgICAgICAgICAgICBpZiAodHlw ZW9mIGFyZ3NbMF0gIT09ICJ1bmRlZmluZWQiKSB7Ci0gICAgICAgICAgICAgICAgY29uc29sZS5l cnJvcigiUHJvdG9jb2wgRXJyb3I6IE9wdGlvbmFsIGNhbGxiYWNrIGFyZ3VtZW50IGZvciBtZXRo b2QgJyIgKyBhZ2VudE1ldGhvZCArICInIGNhbGwgbXVzdCBiZSBhIGZ1bmN0aW9uIGJ1dCBpdHMg dHlwZSBpcyAnIiArIHR5cGVvZiBhcmdzWzBdICsgIicuIik7CisgICAgICAgICAgICAgICAgY29u c29sZS5lcnJvcigiUHJvdG9jb2wgRXJyb3I6IE9wdGlvbmFsIGNhbGxiYWNrIGFyZ3VtZW50IGZv ciBtZXRob2QgJyIgKyBtZXRob2QgKyAiJyBjYWxsIG11c3QgYmUgYSBmdW5jdGlvbiBidXQgaXRz IHR5cGUgaXMgJyIgKyB0eXBlb2YgYXJnc1swXSArICInLiIpOwogICAgICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCi0gICAgICAgIHRoaXMuX3dyYXBDYWxs YmFja0FuZFNlbmRNZXNzYWdlT2JqZWN0KHJlcXVlc3QsIGNhbGxiYWNrKTsKKyAgICAgICAgdGhp cy5fd3JhcENhbGxiYWNrQW5kU2VuZE1lc3NhZ2VPYmplY3QobWV0aG9kLCBoYXNQYXJhbXMgPyBw YXJhbXMgOiBudWxsLCBjYWxsYmFjayk7CiAgICAgfSwKIAotICAgIF93cmFwQ2FsbGJhY2tBbmRT ZW5kTWVzc2FnZU9iamVjdDogZnVuY3Rpb24obWVzc2FnZU9iamVjdCwgY2FsbGJhY2spCisgICAg X3dyYXBDYWxsYmFja0FuZFNlbmRNZXNzYWdlT2JqZWN0OiBmdW5jdGlvbihtZXRob2QsIHBhcmFt cywgY2FsbGJhY2spCiAgICAgewotICAgICAgICBtZXNzYWdlT2JqZWN0LmlkID0gdGhpcy5fd3Jh cChjYWxsYmFjayk7Ci0KLSAgICAgICAgdmFyIHdyYXBwZWRDYWxsYmFjayA9IHRoaXMuX2NhbGxi YWNrc1ttZXNzYWdlT2JqZWN0LmlkXTsKLSAgICAgICAgd3JhcHBlZENhbGxiYWNrLm1ldGhvZE5h bWUgPSBtZXNzYWdlT2JqZWN0Lm1ldGhvZDsKLQotICAgICAgICBpZiAodGhpcy5kdW1wSW5zcGVj dG9yVGltZVN0YXRzKQotICAgICAgICAgICAgd3JhcHBlZENhbGxiYWNrLnNlbmRSZXF1ZXN0VGlt ZSA9IERhdGUubm93KCk7CisgICAgICAgIHZhciBtZXNzYWdlT2JqZWN0ID0ge307CisgICAgICAg IG1lc3NhZ2VPYmplY3QubWV0aG9kID0gbWV0aG9kOworICAgICAgICBpZiAocGFyYW1zKQorICAg ICAgICAgICAgbWVzc2FnZU9iamVjdC5wYXJhbXMgPSBwYXJhbXM7CisgICAgICAgIG1lc3NhZ2VP YmplY3QuaWQgPSB0aGlzLl93cmFwKGNhbGxiYWNrLCBtZXRob2QpOwogCiAgICAgICAgIGlmICh0 aGlzLmR1bXBJbnNwZWN0b3JQcm90b2NvbE1lc3NhZ2VzKQogICAgICAgICAgICAgY29uc29sZS5s b2coImZyb250ZW5kOiAiICsgSlNPTi5zdHJpbmdpZnkobWVzc2FnZU9iamVjdCkpOwpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4 IGRhODZlMTA3Y2IyN2YwODMxMzM3MDE5NDk2OTU4MmNlOWExMThhMTEuLmRkYzgwZjZkODhlYzFm ZTBjYjRlYWNkNzNkNGY2N2ZkMTczMDYyZDMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAxMS0x Mi0wMSAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGdvb2dsZS5jb20+CisKKyAgICAgICAgV2Vi IEluc3BlY3RvcjogcmVmYWN0b3IgSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXIgc28gdGhhdCBp dCBkb2VzIG5vdCB1c2UgSlNPTi1zZXJpYWxpemVkIGNvbW1hbmQgdGVtcGxhdGVzLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzM1NjkKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9yZXBv cnQtQVBJLWVycm9ycy1leHBlY3RlZC50eHQ6CisKIDIwMTEtMTItMDEgIENzYWJhIE9zenRyb2dv bsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KIAogICAgICAgICBbUXRdIGh0dHAvdGVzdHMvbm90aWZp Y2F0aW9ucyB0ZXN0cyBtYWtlIGZhc3Qvbm90aWZpY2F0aW9ucy9ub3RpZmljYXRpb25zLWNsaWNr LWV2ZW50Lmh0bWwgZmFpbApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3JlcG9y dC1BUEktZXJyb3JzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9yZXBvcnQt QVBJLWVycm9ycy1leHBlY3RlZC50eHQKaW5kZXggZTE5MTVhOTBmODBiMjI0ZDczYzY4MTZhZTM1 OWRjY2UzMzgyOTk0YS4uYjM5MjI3NWQ0NjcwYWUxNjU0ZmM2ZDc2MTEyNDQ0ZmQ5MDAxZjM2NyAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3JlcG9ydC1BUEktZXJyb3JzLWV4cGVj dGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcmVwb3J0LUFQSS1lcnJvcnMtZXhw ZWN0ZWQudHh0CkBAIC0xLDggKzEsOCBAQAogVGVzdHMgdGhhdCBJbnNwZWN0b3JCYWNrZW5kU3R1 YiBpcyBjYXRjaGluZyBpbmNvcnJlY3QgYXJndW1lbnRzLgogCi1Qcm90b2NvbCBFcnJvcjogSW52 YWxpZCB0eXBlIG9mIGFyZ3VtZW50ICdlbmFibGVkJyBmb3IgbWV0aG9kICdDb25zb2xlQWdlbnQu c2V0TW9uaXRvcmluZ1hIUkVuYWJsZWQnIGNhbGwuIEl0IG11c3QgYmUgJ2Jvb2xlYW4nIGJ1dCBp dCBpcyAnbnVtYmVyJy4KLVByb3RvY29sIEVycm9yOiBJbnZhbGlkIG51bWJlciBvZiBhcmd1bWVu dHMgZm9yIG1ldGhvZCAnQ29uc29sZUFnZW50LnNldE1vbml0b3JpbmdYSFJFbmFibGVkJyBjYWxs LiBJdCBtdXN0IGhhdmUgdGhlIG5leHQgYXJndW1lbnRzICd7ImVuYWJsZWQiOnsib3B0aW9uYWwi OmZhbHNlLCJ0eXBlIjoiYm9vbGVhbiJ9fScuCi1Qcm90b2NvbCBFcnJvcjogT3B0aW9uYWwgY2Fs bGJhY2sgYXJndW1lbnQgZm9yIG1ldGhvZCAnQ29uc29sZUFnZW50LnNldE1vbml0b3JpbmdYSFJF bmFibGVkJyBjYWxsIG11c3QgYmUgYSBmdW5jdGlvbiBidXQgaXRzIHR5cGUgaXMgJ3N0cmluZycu CitQcm90b2NvbCBFcnJvcjogSW52YWxpZCB0eXBlIG9mIGFyZ3VtZW50ICdlbmFibGVkJyBmb3Ig bWV0aG9kICdDb25zb2xlLnNldE1vbml0b3JpbmdYSFJFbmFibGVkJyBjYWxsLiBJdCBtdXN0IGJl ICdib29sZWFuJyBidXQgaXQgaXMgJ251bWJlcicuCitQcm90b2NvbCBFcnJvcjogSW52YWxpZCBu dW1iZXIgb2YgYXJndW1lbnRzIGZvciBtZXRob2QgJ0NvbnNvbGUuc2V0TW9uaXRvcmluZ1hIUkVu YWJsZWQnIGNhbGwuIEl0IG11c3QgaGF2ZSB0aGUgZm9sbG93aW5nIGFyZ3VtZW50cyAnW3sibmFt ZSI6ImVuYWJsZWQiLCJ0eXBlIjoiYm9vbGVhbiIsIm9wdGlvbmFsIjpmYWxzZX1dJy4KK1Byb3Rv Y29sIEVycm9yOiBPcHRpb25hbCBjYWxsYmFjayBhcmd1bWVudCBmb3IgbWV0aG9kICdDb25zb2xl LnNldE1vbml0b3JpbmdYSFJFbmFibGVkJyBjYWxsIG11c3QgYmUgYSBmdW5jdGlvbiBidXQgaXRz IHR5cGUgaXMgJ3N0cmluZycuCiBQcm90b2NvbCBFcnJvcjogdGhlIG1lc3NhZ2UgaXMgZm9yIG5v bi1leGlzdGluZyBkb21haW4gJ3dyb25nRG9tYWluJwogUHJvdG9jb2wgRXJyb3I6IEF0dGVtcHRl ZCB0byBkaXNwYXRjaCBhbiB1bmltcGxlbWVudGVkIG1ldGhvZCAnSW5zcGVjdG9yLnNvbWV0aGlu Zy1zdHJhbmdlJwogCg==