86286 2012-05-12 01:51:41 -0700 Web Inspector: remove UISourceCode.id since it is no longer used. 2012-05-12 03:02:08 -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 622288 0 pfeldman 2012-05-12 01:51:41 -0700 We are now using breakpointStorageId property for breakpoint persistence. 622297 1 141564 pfeldman 2012-05-12 02:29:40 -0700 Created attachment 141564 Patch 622301 2 pfeldman 2012-05-12 03:02:08 -0700 Committed r116846: <http://trac.webkit.org/changeset/116846> 141564 2012-05-12 02:29:40 -0700 2012-05-12 03:00:47 -0700 Patch bug-86286-20120512132938.patch text/plain 29747 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2ODQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzI1Nzk2YzliNjRjMWI1 NDFjZTBlY2Q2NjViMGZhZjg2NDhjZjJhNS4uZjBhZTZmYTg4OGVmNjdmYjk1Y2FmNWZiOTNiYTNk YjkxZTI0MzBkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM1IEBACiAyMDEyLTA1LTEyICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHJlbW92ZSBVSVNvdXJjZUNvZGUuaWQgc2luY2UgaXQgaXMgbm8gbG9uZ2VyIHVzZWQuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NjI4NgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGFyZSBub3cg dXNpbmcgYnJlYWtwb2ludFN0b3JhZ2VJZCBwcm9wZXJ0eSBmb3IgYnJlYWtwb2ludCBwZXJzaXN0 ZW5jZS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludE1hbmFnZXIu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyLnByb3RvdHlwZS5fZGVidWdnZXJSZXNldCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIucHJvdG90eXBlLl91aUxv Y2F0aW9uQWRkZWQuZ2V0IGlmKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CcmVha3BvaW50TWFu YWdlci5wcm90b3R5cGUuX3VpTG9jYXRpb25BZGRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu QnJlYWtwb2ludE1hbmFnZXIucHJvdG90eXBlLl91aUxvY2F0aW9uUmVtb3ZlZC5nZXQgaWYpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyLnByb3RvdHlwZS5fdWlMb2Nh dGlvblJlbW92ZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ29tcGlsZXJTY3Jp cHRNYXBwaW5nLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNv dXJjZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlKToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jhd1NvdXJjZUNvZGUuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuUmF3U291cmNlQ29kZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmF3U291cmNl Q29kZS5wcm90b3R5cGUucmF3TG9jYXRpb25Ub1VJTG9jYXRpb24pOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlJhd1NvdXJjZUNvZGUucHJvdG90eXBlLl9jcmVhdGVVSVNvdXJjZUNvZGUpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlJhd1NvdXJjZUNvZGUucHJvdG90eXBlLl9maW5pc2hlZExvYWRp bmcpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU25pcHBldHNNb2RlbC5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5TbmlwcGV0c1NjcmlwdE1hcHBpbmcucHJvdG90eXBlLl9zbmlw cGV0QWRkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNuaXBwZXRzU2NyaXB0TWFwcGluZy5w cm90b3R5cGUuX2NyZWF0ZVVJU291cmNlQ29kZUZvclNjcmlwdCk6CisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9VSVNvdXJjZUNvZGUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVUlT b3VyY2VDb2RlKToKKworMjAxMi0wNS0xMiAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9t aXVtLm9yZz4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBtZXJnZSBNYWluU2NyaXB0TWFwcGlu ZyBpbnRvIERlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWw7IG1vdmUgb3RoZXIgY2xhc3NlcyBpbnRv IHRoZWlyIG93biBmaWxlcy4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTg2Mjg1CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvQnJlYWtwb2ludE1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0JyZWFrcG9pbnRNYW5hZ2VyLmpzCmluZGV4IDkyOTBlNjBlOGQ1ZGRkZDllNmI1 MTg3OTBhNjRjOWQxNTcwZjBiYjkuLjc2NDYyMTk5MTFkNDE5ZTcwZTAwYjFjYjk0NTJkNTM2ZGQ2 NTQ2YjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJl YWtwb2ludE1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9CcmVha3BvaW50TWFuYWdlci5qcwpAQCAtNDEsNyArNDEsNyBAQCBXZWJJbnNwZWN0b3IuQnJl YWtwb2ludE1hbmFnZXIgPSBmdW5jdGlvbihicmVha3BvaW50U3RvcmFnZSwgZGVidWdnZXJNb2Rl bCkKIAogICAgIHRoaXMuX2JyZWFrcG9pbnRzID0gW107CiAgICAgdGhpcy5fYnJlYWtwb2ludEZv ckRlYnVnZ2VySWQgPSB7fTsKLSAgICB0aGlzLl9icmVha3BvaW50c0ZvclVJTG9jYXRpb24gPSB7 fTsKKyAgICB0aGlzLl9icmVha3BvaW50c0ZvclVJU291cmNlQ29kZSA9IG5ldyBNYXAoKTsKICAg ICB0aGlzLl9zb3VyY2VGaWxlc1dpdGhSZXN0b3JlZEJyZWFrcG9pbnRzID0ge307CiAKICAgICB0 aGlzLl9kZWJ1Z2dlck1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2Vy TW9kZWwuRXZlbnRzLkJyZWFrcG9pbnRSZXNvbHZlZCwgdGhpcy5fYnJlYWtwb2ludFJlc29sdmVk LCB0aGlzKTsKQEAgLTExNCw4ICsxMTQsOSBAQCBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1hbmFn ZXIucHJvdG90eXBlID0gewogICAgICAqLwogICAgIGZpbmRCcmVha3BvaW50OiBmdW5jdGlvbih1 aVNvdXJjZUNvZGUsIGxpbmVOdW1iZXIpCiAgICAgewotICAgICAgICB2YXIgYnJlYWtwb2ludHMg PSB0aGlzLl9icmVha3BvaW50c0ZvclVJTG9jYXRpb25bdWlTb3VyY2VDb2RlLmlkICsgIjoiICsg bGluZU51bWJlcl07Ci0gICAgICAgIHJldHVybiBicmVha3BvaW50cyA/IGJyZWFrcG9pbnRzWzBd IDogbnVsbDsKKyAgICAgICAgdmFyIGJyZWFrcG9pbnRzID0gdGhpcy5fYnJlYWtwb2ludHNGb3JV SVNvdXJjZUNvZGUuZ2V0KHVpU291cmNlQ29kZSk7CisgICAgICAgIHZhciBsaW5lQnJlYWtwb2lu dHMgPSBicmVha3BvaW50cyA/IGJyZWFrcG9pbnRzW2xpbmVOdW1iZXJdIDogbnVsbDsKKyAgICAg ICAgcmV0dXJuIGxpbmVCcmVha3BvaW50cyA/IGxpbmVCcmVha3BvaW50c1swXSA6IG51bGw7CiAg ICAgfSwKIAogICAgIC8qKgpAQCAtMTY2LDcgKzE2Nyw3IEBAIFdlYkluc3BlY3Rvci5CcmVha3Bv aW50TWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBicmVha3BvaW50c1tpXS5faXNQ cm92aXNpb25hbCA9IHRydWU7CiAgICAgICAgIH0KICAgICAgICAgdGhpcy5fYnJlYWtwb2ludHMg PSBbXTsKLSAgICAgICAgdGhpcy5fYnJlYWtwb2ludHNGb3JVSUxvY2F0aW9uID0ge307CisgICAg ICAgIHRoaXMuX2JyZWFrcG9pbnRzRm9yVUlTb3VyY2VDb2RlLmNsZWFyKCk7CiAgICAgICAgIHRo aXMuX3NvdXJjZUZpbGVzV2l0aFJlc3RvcmVkQnJlYWtwb2ludHMgPSB7fTsKICAgICB9LAogCkBA IC0xOTgsMTMgKzE5OSwxOSBAQCBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIucHJvdG90 eXBlID0gewogICAgICAqLwogICAgIF91aUxvY2F0aW9uQWRkZWQ6IGZ1bmN0aW9uKGJyZWFrcG9p bnQsIHVpTG9jYXRpb24pCiAgICAgewotICAgICAgICB2YXIga2V5ID0gdWlMb2NhdGlvbi51aVNv dXJjZUNvZGUuaWQgKyAiOiIgKyB1aUxvY2F0aW9uLmxpbmVOdW1iZXI7Ci0gICAgICAgIHZhciBi cmVha3BvaW50cyA9IHRoaXMuX2JyZWFrcG9pbnRzRm9yVUlMb2NhdGlvbltrZXldOworICAgICAg ICB2YXIgYnJlYWtwb2ludHMgPSB0aGlzLl9icmVha3BvaW50c0ZvclVJU291cmNlQ29kZS5nZXQo dWlMb2NhdGlvbi51aVNvdXJjZUNvZGUpOwogICAgICAgICBpZiAoIWJyZWFrcG9pbnRzKSB7Ci0g ICAgICAgICAgICBicmVha3BvaW50cyA9IFtdOwotICAgICAgICAgICAgdGhpcy5fYnJlYWtwb2lu dHNGb3JVSUxvY2F0aW9uW2tleV0gPSBicmVha3BvaW50czsKKyAgICAgICAgICAgIGJyZWFrcG9p bnRzID0ge307CisgICAgICAgICAgICB0aGlzLl9icmVha3BvaW50c0ZvclVJU291cmNlQ29kZS5w dXQodWlMb2NhdGlvbi51aVNvdXJjZUNvZGUsIGJyZWFrcG9pbnRzKTsKICAgICAgICAgfQotICAg ICAgICBicmVha3BvaW50cy5wdXNoKGJyZWFrcG9pbnQpOworCisgICAgICAgIHZhciBsaW5lQnJl YWtwb2ludHMgPSBicmVha3BvaW50c1t1aUxvY2F0aW9uLmxpbmVOdW1iZXJdOworICAgICAgICBp ZiAoIWxpbmVCcmVha3BvaW50cykgeworICAgICAgICAgICAgbGluZUJyZWFrcG9pbnRzID0gW107 CisgICAgICAgICAgICBicmVha3BvaW50c1t1aUxvY2F0aW9uLmxpbmVOdW1iZXJdID0gbGluZUJy ZWFrcG9pbnRzOworICAgICAgICB9CisKKyAgICAgICAgbGluZUJyZWFrcG9pbnRzLnB1c2goYnJl YWtwb2ludCk7CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3Bl Y3Rvci5CcmVha3BvaW50TWFuYWdlci5FdmVudHMuQnJlYWtwb2ludEFkZGVkLCB7YnJlYWtwb2lu dDogYnJlYWtwb2ludCwgdWlMb2NhdGlvbjogdWlMb2NhdGlvbn0pOwogICAgIH0sCiAKQEAgLTIx NCwxMyArMjIxLDE3IEBAIFdlYkluc3BlY3Rvci5CcmVha3BvaW50TWFuYWdlci5wcm90b3R5cGUg PSB7CiAgICAgICovCiAgICAgX3VpTG9jYXRpb25SZW1vdmVkOiBmdW5jdGlvbihicmVha3BvaW50 LCB1aUxvY2F0aW9uKQogICAgIHsKLSAgICAgICAgdmFyIGtleSA9IHVpTG9jYXRpb24udWlTb3Vy Y2VDb2RlLmlkICsgIjoiICsgdWlMb2NhdGlvbi5saW5lTnVtYmVyOwotICAgICAgICB2YXIgYnJl YWtwb2ludHMgPSB0aGlzLl9icmVha3BvaW50c0ZvclVJTG9jYXRpb25ba2V5XTsKKyAgICAgIHZh ciBicmVha3BvaW50cyA9IHRoaXMuX2JyZWFrcG9pbnRzRm9yVUlTb3VyY2VDb2RlLmdldCh1aUxv Y2F0aW9uLnVpU291cmNlQ29kZSk7CiAgICAgICAgIGlmICghYnJlYWtwb2ludHMpCiAgICAgICAg ICAgICByZXR1cm47Ci0gICAgICAgIGJyZWFrcG9pbnRzLnJlbW92ZShicmVha3BvaW50KTsKLSAg ICAgICAgaWYgKCFicmVha3BvaW50cy5sZW5ndGgpCi0gICAgICAgICAgICBkZWxldGUgdGhpcy5f YnJlYWtwb2ludHNGb3JVSUxvY2F0aW9uW2tleV07CisKKyAgICAgICAgdmFyIGxpbmVCcmVha3Bv aW50cyA9IGJyZWFrcG9pbnRzW3VpTG9jYXRpb24ubGluZU51bWJlcl07CisgICAgICAgIGlmICgh bGluZUJyZWFrcG9pbnRzKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGxpbmVCcmVh a3BvaW50cy5yZW1vdmUoYnJlYWtwb2ludCk7CisgICAgICAgIGlmICghbGluZUJyZWFrcG9pbnRz Lmxlbmd0aCkKKyAgICAgICAgICAgIGRlbGV0ZSBicmVha3BvaW50c1t1aUxvY2F0aW9uLmxpbmVO dW1iZXJdOwogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0 b3IuQnJlYWtwb2ludE1hbmFnZXIuRXZlbnRzLkJyZWFrcG9pbnRSZW1vdmVkLCB7YnJlYWtwb2lu dDogYnJlYWtwb2ludCwgdWlMb2NhdGlvbjogdWlMb2NhdGlvbn0pOwogICAgIH0KIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29tcGlsZXJTY3JpcHRN YXBwaW5nLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db21waWxlclNj cmlwdE1hcHBpbmcuanMKaW5kZXggZmFhOGE0N2MwODMwNTU3Y2QyODk0ODY5YTY5ZWUxYWM2NjE2 YjIzMi4uMmQwMTRjNTVkMzEyNmM1NTNhNWE2OGM1M2YyZDc2NDM1NGE0NzIwMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db21waWxlclNjcmlwdE1hcHBp bmcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db21waWxlclNj cmlwdE1hcHBpbmcuanMKQEAgLTExNiw3ICsxMTYsNyBAQCBXZWJJbnNwZWN0b3IuQ29tcGlsZXJT Y3JpcHRNYXBwaW5nLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICBjb250ZW50UHJvdmlk ZXIgPSBuZXcgV2ViSW5zcGVjdG9yLlN0YXRpY0NvbnRlbnRQcm92aWRlcigidGV4dC9qYXZhc2Ny aXB0Iiwgc291cmNlQ29udGVudCk7CiAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAg Y29udGVudFByb3ZpZGVyID0gbmV3IFdlYkluc3BlY3Rvci5Db21waWxlclNvdXJjZU1hcHBpbmdD b250ZW50UHJvdmlkZXIoc291cmNlVVJMKTsKLSAgICAgICAgICAgIHZhciB1aVNvdXJjZUNvZGUg PSBuZXcgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2Uoc291cmNlVVJMLCBzb3VyY2VVUkws IGNvbnRlbnRQcm92aWRlciwgdGhpcyk7CisgICAgICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0g bmV3IFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlKHNvdXJjZVVSTCwgY29udGVudFByb3Zp ZGVyLCB0aGlzKTsKICAgICAgICAgICAgIHVpU291cmNlQ29kZS5pc0NvbnRlbnRTY3JpcHQgPSBz Y3JpcHQuaXNDb250ZW50U2NyaXB0OwogICAgICAgICAgICAgdWlTb3VyY2VDb2RlLmlzRWRpdGFi bGUgPSBmYWxzZTsKICAgICAgICAgICAgIHRoaXMuX3VpU291cmNlQ29kZUJ5VVJMW3NvdXJjZVVS TF0gPSB1aVNvdXJjZUNvZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0phdmFTY3JpcHRTb3VyY2UuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0phdmFTY3JpcHRTb3VyY2UuanMKaW5kZXggNjM1NmUyNGIyMjMzNDMyOGFlY2E5 MWM3Mjc3ZDQ1ZGNlZWUxNDY4OC4uZmRkN2QzZGViZDA3YTcwNDg2NzZjMTk0YTc5MzRjNGNhMWJm MjVjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9KYXZh U2NyaXB0U291cmNlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv SmF2YVNjcmlwdFNvdXJjZS5qcwpAQCAtMzEsMTQgKzMxLDEzIEBACiAvKioKICAqIEBjb25zdHJ1 Y3RvcgogICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9Ci0gKiBAcGFyYW0g e3N0cmluZ30gaWQKICAqIEBwYXJhbSB7c3RyaW5nfSB1cmwKICAqIEBwYXJhbSB7V2ViSW5zcGVj dG9yLkNvbnRlbnRQcm92aWRlcn0gY29udGVudFByb3ZpZGVyCiAgKiBAcGFyYW0ge1dlYkluc3Bl Y3Rvci5Tb3VyY2VNYXBwaW5nfSBzb3VyY2VNYXBwaW5nCiAgKi8KLVdlYkluc3BlY3Rvci5KYXZh U2NyaXB0U291cmNlID0gZnVuY3Rpb24oaWQsIHVybCwgY29udGVudFByb3ZpZGVyLCBzb3VyY2VN YXBwaW5nKQorV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2UgPSBmdW5jdGlvbih1cmwsIGNv bnRlbnRQcm92aWRlciwgc291cmNlTWFwcGluZykKIHsKLSAgICBXZWJJbnNwZWN0b3IuVUlTb3Vy Y2VDb2RlLmNhbGwodGhpcywgaWQsIHVybCwgY29udGVudFByb3ZpZGVyLCBzb3VyY2VNYXBwaW5n KTsKKyAgICBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLmNhbGwodGhpcywgdXJsLCBjb250ZW50 UHJvdmlkZXIsIHNvdXJjZU1hcHBpbmcpOwogCiAgICAgdGhpcy5fZm9ybWF0dGVyTWFwcGluZyA9 IG5ldyBXZWJJbnNwZWN0b3IuSWRlbnRpdHlGb3JtYXR0ZXJTb3VyY2VNYXBwaW5nKCk7CiAgICAg Ly8gRklYTUU6IHBvc3Rwb25lIGJyZWFrcG9pbnRzIHJlc3RvcmUgdG8gYWZ0ZXIgdGhlIG1hcHBp bmcgaGFzIGJlZW4gZXN0YWJsaXNoZWQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1Jhd1NvdXJjZUNvZGUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1Jhd1NvdXJjZUNvZGUuanMKaW5kZXggN2U2ZjI4M2NhZWM0MWU4Nzk1N2M4 MmNhYmU5ZmMwYmJkMDljNTYwYS4uMjVkOWQ2MjczYTJlNzBmYTI5NDU5Yjk5NTE2NGQ4YTNiZDEx ZjhkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SYXdT b3VyY2VDb2RlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmF3 U291cmNlQ29kZS5qcwpAQCAtNTQsNyArNTQsNyBAQCBXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29k ZSA9IGZ1bmN0aW9uKGlkLCBzY3JpcHQsIHJlc291cmNlLCByZXF1ZXN0LCBzb3VyY2VNYXBwaQog ICAgIGlmICh0aGlzLl9wZW5kaW5nUmVxdWVzdCkKICAgICAgICAgdGhpcy5fcGVuZGluZ1JlcXVl c3QuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuTmV0d29ya1JlcXVlc3QuRXZlbnRzLkZp bmlzaGVkTG9hZGluZywgdGhpcy5fZmluaXNoZWRMb2FkaW5nLCB0aGlzKTsKICAgICBlbHNlCi0g ICAgICAgIHRoaXMuX3VpU291cmNlQ29kZSA9IHRoaXMuX2NyZWF0ZVVJU291cmNlQ29kZSh0aGlz LnVybCk7CisgICAgICAgIHRoaXMuX3VpU291cmNlQ29kZSA9IHRoaXMuX2NyZWF0ZVVJU291cmNl Q29kZSgpOwogfQogCiBXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZS5FdmVudHMgPSB7CkBAIC03 OCw3ICs3OCw3IEBAIFdlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlLnByb3RvdHlwZSA9IHsKICAg ICB7CiAgICAgICAgIHZhciB1aVNvdXJjZUNvZGUgPSB0aGlzLl91aVNvdXJjZUNvZGUgfHwgdGhp cy5fdGVtcG9yYXJ5VUlTb3VyY2VDb2RlOwogICAgICAgICBpZiAoIXVpU291cmNlQ29kZSkgewot ICAgICAgICAgICAgdGhpcy5fdGVtcG9yYXJ5VUlTb3VyY2VDb2RlID0gdGhpcy5fY3JlYXRlVUlT b3VyY2VDb2RlKCJ0bXAtIiArIHRoaXMudXJsKTsKKyAgICAgICAgICAgIHRoaXMuX3RlbXBvcmFy eVVJU291cmNlQ29kZSA9IHRoaXMuX2NyZWF0ZVVJU291cmNlQ29kZSgpOwogICAgICAgICAgICAg dWlTb3VyY2VDb2RlID0gdGhpcy5fdGVtcG9yYXJ5VUlTb3VyY2VDb2RlOwogICAgICAgICAgICAg dGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlJhd1NvdXJjZUNvZGUu RXZlbnRzLlVJU291cmNlQ29kZUNoYW5nZWQsIHsgdWlTb3VyY2VDb2RlOiB1aVNvdXJjZUNvZGUg fSk7CiAgICAgICAgIH0KQEAgLTg2LDEwICs4Niw5IEBAIFdlYkluc3BlY3Rvci5SYXdTb3VyY2VD b2RlLnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtzdHJp bmd9IGlkCiAgICAgICogQHJldHVybiB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0KICAgICAg Ki8KLSAgICBfY3JlYXRlVUlTb3VyY2VDb2RlOiBmdW5jdGlvbihpZCkKKyAgICBfY3JlYXRlVUlT b3VyY2VDb2RlOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB2YXIgaXNTdGFuZGFsb25lU2Ny aXB0ID0gdGhpcy5fc2NyaXB0cy5sZW5ndGggPT09IDEgJiYgIXRoaXMuX3NjcmlwdHNbMF0uaXNJ bmxpbmVTY3JpcHQoKTsKIApAQCAtMTAxLDcgKzEwMCw3IEBAIFdlYkluc3BlY3Rvci5SYXdTb3Vy Y2VDb2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgY29udGVudFBy b3ZpZGVyID0gbmV3IFdlYkluc3BlY3Rvci5Db25jYXRlbmF0ZWRTY3JpcHRzQ29udGVudFByb3Zp ZGVyKHRoaXMuX3NjcmlwdHMpOwogCi0gICAgICAgIHZhciB1aVNvdXJjZUNvZGUgPSBuZXcgV2Vi SW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2UoaWQsIHRoaXMudXJsLCBjb250ZW50UHJvdmlkZXIs IHRoaXMuX3NvdXJjZU1hcHBpbmcpOworICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gbmV3IFdl Ykluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlKHRoaXMudXJsLCBjb250ZW50UHJvdmlkZXIsIHRo aXMuX3NvdXJjZU1hcHBpbmcpOwogICAgICAgICB1aVNvdXJjZUNvZGUuaXNDb250ZW50U2NyaXB0 ID0gdGhpcy5pc0NvbnRlbnRTY3JpcHQ7CiAgICAgICAgIHVpU291cmNlQ29kZS5pc0VkaXRhYmxl ID0gaXNTdGFuZGFsb25lU2NyaXB0OwogICAgICAgICByZXR1cm4gdWlTb3VyY2VDb2RlOwpAQCAt MTMzLDcgKzEzMiw3IEBAIFdlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlLnByb3RvdHlwZSA9IHsK ICAgICAgICAgdGhpcy5fcmVzb3VyY2UgPSBXZWJJbnNwZWN0b3IucmVzb3VyY2VGb3JVUkwodGhp cy5fcGVuZGluZ1JlcXVlc3QudXJsKTsKICAgICAgICAgZGVsZXRlIHRoaXMuX3BlbmRpbmdSZXF1 ZXN0OwogICAgICAgICB2YXIgb2xkVUlTb3VyY2VDb2RlID0gdGhpcy5fdWlTb3VyY2VDb2RlIHx8 IHRoaXMuX3RlbXBvcmFyeVVJU291cmNlQ29kZTsKLSAgICAgICAgdGhpcy5fdWlTb3VyY2VDb2Rl ID0gdGhpcy5fY3JlYXRlVUlTb3VyY2VDb2RlKHRoaXMudXJsKTsKKyAgICAgICAgdGhpcy5fdWlT b3VyY2VDb2RlID0gdGhpcy5fY3JlYXRlVUlTb3VyY2VDb2RlKCk7CiAgICAgICAgIHRoaXMuZGlz cGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlLkV2ZW50cy5V SVNvdXJjZUNvZGVDaGFuZ2VkLCB7IHVpU291cmNlQ29kZTogdGhpcy5fdWlTb3VyY2VDb2RlLCBv bGRVSVNvdXJjZUNvZGU6IG9sZFVJU291cmNlQ29kZSB9KTsKICAgICB9CiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NuaXBwZXRzTW9kZWwuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NuaXBwZXRzTW9kZWwuanMKaW5kZXgg MTYxMDU1MGFlNGY5OGQ1ODNmODY5MzQ0ZmJlNmFkMDY1NjBjYjk3MS4uMmNjNTg3YTAzNjhjYWY2 NGViN2YxYzRjZGQ3M2VkYTIyYjQyNDVhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9TbmlwcGV0c01vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU25pcHBldHNNb2RlbC5qcwpAQCAtMzkxLDkgKzM5MSw4IEBAIFdl Ykluc3BlY3Rvci5TbmlwcGV0c1NjcmlwdE1hcHBpbmcucHJvdG90eXBlID0gewogICAgICAqLwog ICAgIF9zbmlwcGV0QWRkZWQ6IGZ1bmN0aW9uKHNuaXBwZXQpCiAgICAgewotICAgICAgICB2YXIg dWlTb3VyY2VDb2RlSWQgPSAiIjsgLy8gRklYTUU6IHRvIGJlIGltcGxlbWVudGVkLgogICAgICAg ICB2YXIgdWlTb3VyY2VDb2RlVVJMID0gIiI7IC8vIEZJWE1FOiB0byBiZSBpbXBsZW1lbnRlZC4K LSAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9IG5ldyBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNv dXJjZSh1aVNvdXJjZUNvZGVJZCwgdWlTb3VyY2VDb2RlVVJMLCBuZXcgV2ViSW5zcGVjdG9yLlNu aXBwZXRDb250ZW50UHJvdmlkZXIoc25pcHBldCksIHRoaXMpOworICAgICAgICB2YXIgdWlTb3Vy Y2VDb2RlID0gbmV3IFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlKHVpU291cmNlQ29kZVVS TCwgbmV3IFdlYkluc3BlY3Rvci5TbmlwcGV0Q29udGVudFByb3ZpZGVyKHNuaXBwZXQpLCB0aGlz KTsKICAgICAgICAgdWlTb3VyY2VDb2RlLmlzU25pcHBldCA9IHRydWU7CiAgICAgICAgIHVpU291 cmNlQ29kZS5pc0VkaXRhYmxlID0gdHJ1ZTsKICAgICAgICAgdGhpcy5fdWlTb3VyY2VDb2RlRm9y U25pcHBldC5wdXQoc25pcHBldCwgdWlTb3VyY2VDb2RlKTsKQEAgLTQxNiw3ICs0MTUsNyBAQCBX ZWJJbnNwZWN0b3IuU25pcHBldHNTY3JpcHRNYXBwaW5nLnByb3RvdHlwZSA9IHsKICAgICAgKi8K ICAgICBfY3JlYXRlVUlTb3VyY2VDb2RlRm9yU2NyaXB0OiBmdW5jdGlvbihzY3JpcHQpCiAgICAg ewotICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gbmV3IFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0 U291cmNlKHNjcmlwdC5zb3VyY2VVUkwsIHNjcmlwdC5zb3VyY2VVUkwsIHNjcmlwdCwgdGhpcyk7 CisgICAgICAgIHZhciB1aVNvdXJjZUNvZGUgPSBuZXcgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRT b3VyY2Uoc2NyaXB0LnNvdXJjZVVSTCwgc2NyaXB0LCB0aGlzKTsKICAgICAgICAgdWlTb3VyY2VD b2RlLmlzU25pcHBldEV2YWx1YXRpb24gPSB0cnVlOwogICAgICAgICB2YXIgb2xkVUlTb3VyY2VD b2RlID0gdGhpcy5fdWlTb3VyY2VDb2RlRm9yU2NyaXB0SWRbc2NyaXB0LnNjcmlwdElkXTsKICAg ICAgICAgdGhpcy5fdWlTb3VyY2VDb2RlRm9yU2NyaXB0SWRbc2NyaXB0LnNjcmlwdElkXSA9IHVp U291cmNlQ29kZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvVUlTb3VyY2VDb2RlLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9V SVNvdXJjZUNvZGUuanMKaW5kZXggZmQ0NjhmZmU2MTU0NWJiNWQ0ZTI4MmQxZjQ2ZWQwNDkyNGQ3 ODE5Ni4uMmQxYWUxODkyNGE5Yjc3NzdkNmMwNjYxOGM1ZTc4NzY0MzJhMGYzOSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVNvdXJjZUNvZGUuanMKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVNvdXJjZUNvZGUuanMKQEAg LTMyLDE0ICszMiwxMiBAQAogLyoqCiAgKiBAY29uc3RydWN0b3IKICAqIEBleHRlbmRzIHtXZWJJ bnNwZWN0b3IuT2JqZWN0fQotICogQHBhcmFtIHtzdHJpbmd9IGlkCiAgKiBAcGFyYW0ge3N0cmlu Z30gdXJsCiAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5Db250ZW50UHJvdmlkZXJ9IGNvbnRlbnRQ cm92aWRlcgogICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuU291cmNlTWFwcGluZ30gc291cmNlTWFw cGluZwogICovCi1XZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlID0gZnVuY3Rpb24oaWQsIHVybCwg Y29udGVudFByb3ZpZGVyLCBzb3VyY2VNYXBwaW5nKQorV2ViSW5zcGVjdG9yLlVJU291cmNlQ29k ZSA9IGZ1bmN0aW9uKHVybCwgY29udGVudFByb3ZpZGVyLCBzb3VyY2VNYXBwaW5nKQogewotICAg IHRoaXMuX2lkID0gaWQ7CiAgICAgdGhpcy5fdXJsID0gdXJsOwogICAgIHRoaXMuX3BhcnNlZFVS TCA9IG5ldyBXZWJJbnNwZWN0b3IuUGFyc2VkVVJMKHVybCk7CiAgICAgdGhpcy5fY29udGVudFBy b3ZpZGVyID0gY29udGVudFByb3ZpZGVyOwpAQCAtNjgsMTQgKzY2LDYgQEAgV2ViSW5zcGVjdG9y LlVJU291cmNlQ29kZS5wcm90b3R5cGUgPSB7CiAgICAgLyoqCiAgICAgICogQHJldHVybiB7c3Ry aW5nfQogICAgICAqLwotICAgIGdldCBpZCgpCi0gICAgewotICAgICAgICByZXR1cm4gdGhpcy5f aWQ7Ci0gICAgfSwKLQotICAgIC8qKgotICAgICAqIEByZXR1cm4ge3N0cmluZ30KLSAgICAgKi8K ICAgICBnZXQgdXJsKCkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl91cmw7CmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXgg NGI5OTU4OTA2NDU5NWMwOGUyZDliYWQ5MGMyNGQ3NjYyZDBlMjY0YS4uNjczNTdlZGYyODgwNmFi M2U3NTFmNTcwNWEwNDUwOTcyNzM5NjY3OSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIwIEBACiAyMDEyLTA1 LTEyICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IHJlbW92ZSBVSVNvdXJjZUNvZGUuaWQgc2luY2UgaXQgaXMgbm8gbG9uZ2Vy IHVzZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04 NjI4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog aW5zcGVjdG9yL2RlYnVnZ2VyL2JyZWFrcG9pbnQtbWFuYWdlci5odG1sOgorICAgICAgICAqIGlu c3BlY3Rvci9kZWJ1Z2dlci9yYXctc291cmNlLWNvZGUuaHRtbDoKKyAgICAgICAgKiBpbnNwZWN0 b3IvZGVidWdnZXIvc2NyaXB0cy1maWxlLXNlbGVjdG9yLmh0bWw6CisgICAgICAgICogaW5zcGVj dG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFuZWwuaHRtbDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZGVi dWdnZXIvc2NyaXB0cy1zb3J0aW5nLmh0bWw6CisgICAgICAgICogaW5zcGVjdG9yL2RlYnVnZ2Vy L3VpLXNvdXJjZS1jb2RlLWRpc3BsYXktbmFtZS5odG1sOgorICAgICAgICAqIGluc3BlY3Rvci9k ZWJ1Z2dlci91aS1zb3VyY2UtY29kZS5odG1sOgorCisyMDEyLTA1LTEyICBQYXZlbCBGZWxkbWFu ICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IG1lcmdl IE1haW5TY3JpcHRNYXBwaW5nIGludG8gRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbDsgbW92ZSBv dGhlciBjbGFzc2VzIGludG8gdGhlaXIgb3duIGZpbGVzLgogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODYyODUKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2JyZWFrcG9pbnQtbWFuYWdlci1leHBlY3RlZC50eHQgYi9M YXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvYnJlYWtwb2ludC1tYW5hZ2VyLWV4cGVjdGVk LnR4dAppbmRleCA3OTk1NWU2YmRkN2ZiNmQ1YjkyODUzNWJmN2VmNWVhMDAxMTQ3NjljLi41ODBi M2IwNDYzN2E5MGJkNjZiMDgzMzQ2MGIzZGE4MWZjODM2MTNkIDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvYnJlYWtwb2ludC1tYW5hZ2VyLWV4cGVjdGVkLnR4dAor KysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvYnJlYWtwb2ludC1tYW5hZ2VyLWV4 cGVjdGVkLnR4dApAQCAtNCw3ICs0LDcgQEAgVGVzdHMgQnJlYWtwb2ludE1hbmFnZXIgY2xhc3Mu CiBSdW5uaW5nOiB0ZXN0U2V0QnJlYWtwb2ludAogICBDcmVhdGVkIGJyZWFrcG9pbnRzIG1hbmFn ZXIKICAgRHVtcGluZyBTdG9yYWdlCi0gIEFkZGluZyBVSVNvdXJjZUNvZGU6IGEuanMgKHVybD1h LmpzKQorICBBZGRpbmcgVUlTb3VyY2VDb2RlOiBhLmpzKQogICBTZXR0aW5nIGJyZWFrcG9pbnQg YXQgYS5qczozMCBlbmFibGVkOnRydWUgY29uZGl0aW9uOgogICAgIGRlYnVnZ2VyTW9kZWwuc2V0 QnJlYWtwb2ludChhLmpzOjMwOikKICAgICBicmVha3BvaW50QWRkZWQoYS5qcywgMzAsICwgdHJ1 ZSkKQEAgLTE5LDcgKzE5LDcgQEAgUnVubmluZzogdGVzdFNldEJyZWFrcG9pbnQKIFJ1bm5pbmc6 IHRlc3RTZXREaXNhYmxlZEJyZWFrcG9pbnQKICAgQ3JlYXRlZCBicmVha3BvaW50cyBtYW5hZ2Vy CiAgIER1bXBpbmcgU3RvcmFnZQotICBBZGRpbmcgVUlTb3VyY2VDb2RlOiBhLmpzICh1cmw9YS5q cykKKyAgQWRkaW5nIFVJU291cmNlQ29kZTogYS5qcykKICAgU2V0dGluZyBicmVha3BvaW50IGF0 IGEuanM6MzAgZW5hYmxlZDpmYWxzZSBjb25kaXRpb246CiAgICAgYnJlYWtwb2ludEFkZGVkKGEu anMsIDMwLCAsIGZhbHNlKQogICBEdW1waW5nIFN0b3JhZ2UKQEAgLTM5LDcgKzM5LDcgQEAgUnVu bmluZzogdGVzdFNldERpc2FibGVkQnJlYWtwb2ludAogUnVubmluZzogdGVzdFNldENvbmRpdGlv bmFsQnJlYWtwb2ludAogICBDcmVhdGVkIGJyZWFrcG9pbnRzIG1hbmFnZXIKICAgRHVtcGluZyBT dG9yYWdlCi0gIEFkZGluZyBVSVNvdXJjZUNvZGU6IGEuanMgKHVybD1hLmpzKQorICBBZGRpbmcg VUlTb3VyY2VDb2RlOiBhLmpzKQogICBTZXR0aW5nIGJyZWFrcG9pbnQgYXQgYS5qczozMCBlbmFi bGVkOnRydWUgY29uZGl0aW9uOmNvbmRpdGlvbgogICAgIGRlYnVnZ2VyTW9kZWwuc2V0QnJlYWtw b2ludChhLmpzOjMwOmNvbmRpdGlvbikKICAgICBicmVha3BvaW50QWRkZWQoYS5qcywgMzAsIGNv bmRpdGlvbiwgdHJ1ZSkKQEAgLTY2LDcgKzY2LDcgQEAgUnVubmluZzogdGVzdFJlc3RvcmVCcmVh a3BvaW50cwogICAgIGEuanM6MTAgZW5hYmxlZDp0cnVlIGNvbmRpdGlvbjpmb28gPT0gYmFyCiAg ICAgYS5qczoyMCBlbmFibGVkOmZhbHNlIGNvbmRpdGlvbjoKICAgICBiLmpzOjMgZW5hYmxlZDp0 cnVlIGNvbmRpdGlvbjoKLSAgQWRkaW5nIFVJU291cmNlQ29kZTogYS5qcyAodXJsPWEuanMpCisg IEFkZGluZyBVSVNvdXJjZUNvZGU6IGEuanMpCiAgICAgZGVidWdnZXJNb2RlbC5zZXRCcmVha3Bv aW50KGEuanM6MTA6Zm9vID09IGJhcikKICAgICBicmVha3BvaW50QWRkZWQoYS5qcywgMTAsIGZv byA9PSBiYXIsIHRydWUpCiAgICAgTG9jYXRpb24gY3JlYXRlZDogYS5qczoxMApAQCAtODcsMTIg Kzg3LDEyIEBAIFJ1bm5pbmc6IHRlc3RSZXN0b3JlQnJlYWtwb2ludHNUd2ljZQogICAgIGEuanM6 MTAgZW5hYmxlZDp0cnVlIGNvbmRpdGlvbjpmb28gPT0gYmFyCiAgICAgYS5qczoyMCBlbmFibGVk OmZhbHNlIGNvbmRpdGlvbjoKICAgICBiLmpzOjMgZW5hYmxlZDp0cnVlIGNvbmRpdGlvbjoKLSAg QWRkaW5nIFVJU291cmNlQ29kZTogYS5qcyAodXJsPWEuanMpCisgIEFkZGluZyBVSVNvdXJjZUNv ZGU6IGEuanMpCiAgICAgZGVidWdnZXJNb2RlbC5zZXRCcmVha3BvaW50KGEuanM6MTA6Zm9vID09 IGJhcikKICAgICBicmVha3BvaW50QWRkZWQoYS5qcywgMTAsIGZvbyA9PSBiYXIsIHRydWUpCiAg ICAgTG9jYXRpb24gY3JlYXRlZDogYS5qczoxMAogICAgIGJyZWFrcG9pbnRBZGRlZChhLmpzLCAy MCwgLCBmYWxzZSkKLSAgQWRkaW5nIFVJU291cmNlQ29kZTogYS5qcyAodXJsPWEuanMpCisgIEFk ZGluZyBVSVNvdXJjZUNvZGU6IGEuanMpCiAgIER1bXBpbmcgU3RvcmFnZQogICAgIGEuanM6MTAg ZW5hYmxlZDp0cnVlIGNvbmRpdGlvbjpmb28gPT0gYmFyCiAgICAgYS5qczoyMCBlbmFibGVkOmZh bHNlIGNvbmRpdGlvbjoKQEAgLTEwOSw3ICsxMDksNyBAQCBSdW5uaW5nOiB0ZXN0UmVtb3ZlQnJl YWtwb2ludHMKICAgICBhLmpzOjEwIGVuYWJsZWQ6dHJ1ZSBjb25kaXRpb246Zm9vID09IGJhcgog ICAgIGEuanM6MjAgZW5hYmxlZDpmYWxzZSBjb25kaXRpb246CiAgICAgYi5qczozIGVuYWJsZWQ6 dHJ1ZSBjb25kaXRpb246Ci0gIEFkZGluZyBVSVNvdXJjZUNvZGU6IGEuanMgKHVybD1hLmpzKQor ICBBZGRpbmcgVUlTb3VyY2VDb2RlOiBhLmpzKQogICAgIGRlYnVnZ2VyTW9kZWwuc2V0QnJlYWtw b2ludChhLmpzOjEwOmZvbyA9PSBiYXIpCiAgICAgYnJlYWtwb2ludEFkZGVkKGEuanMsIDEwLCBm b28gPT0gYmFyLCB0cnVlKQogICAgIExvY2F0aW9uIGNyZWF0ZWQ6IGEuanM6MTAKQEAgLTEzNSw3 ICsxMzUsNyBAQCBSdW5uaW5nOiB0ZXN0UmVtb3ZlQnJlYWtwb2ludHMKIFJ1bm5pbmc6IHRlc3RT ZXRCcmVha3BvaW50VGhhdFNoaWZ0cwogICBDcmVhdGVkIGJyZWFrcG9pbnRzIG1hbmFnZXIKICAg RHVtcGluZyBTdG9yYWdlCi0gIEFkZGluZyBVSVNvdXJjZUNvZGU6IGEuanMgKHVybD1hLmpzKQor ICBBZGRpbmcgVUlTb3VyY2VDb2RlOiBhLmpzKQogICBTZXR0aW5nIGJyZWFrcG9pbnQgYXQgYS5q czoxMDE1IGVuYWJsZWQ6dHJ1ZSBjb25kaXRpb246CiAgICAgZGVidWdnZXJNb2RlbC5zZXRCcmVh a3BvaW50KGEuanM6MTAxNTopCiAgICAgYnJlYWtwb2ludEFkZGVkKGEuanMsIDEwMjUsICwgdHJ1 ZSkKQEAgLTE1MCw3ICsxNTAsNyBAQCBSdW5uaW5nOiB0ZXN0U2V0QnJlYWtwb2ludFRoYXRTaGlm dHMKIFJ1bm5pbmc6IHRlc3RTZXRCcmVha3BvaW50VGhhdFNoaWZ0c1R3aWNlCiAgIENyZWF0ZWQg YnJlYWtwb2ludHMgbWFuYWdlcgogICBEdW1waW5nIFN0b3JhZ2UKLSAgQWRkaW5nIFVJU291cmNl Q29kZTogYS5qcyAodXJsPWEuanMpCisgIEFkZGluZyBVSVNvdXJjZUNvZGU6IGEuanMpCiAgIFNl dHRpbmcgYnJlYWtwb2ludCBhdCBhLmpzOjEwMTUgZW5hYmxlZDp0cnVlIGNvbmRpdGlvbjoKICAg ICBkZWJ1Z2dlck1vZGVsLnNldEJyZWFrcG9pbnQoYS5qczoxMDE1OikKICAgICBicmVha3BvaW50 QWRkZWQoYS5qcywgMTAyNSwgLCB0cnVlKQpAQCAtMTY2LDcgKzE2Niw3IEBAIFJ1bm5pbmc6IHRl c3RTZXRCcmVha3BvaW50VGhhdFNoaWZ0c1R3aWNlCiBSdW5uaW5nOiB0ZXN0U2V0QnJlYWtwb2lu dE91dHNpZGVTY3JpcHQKICAgQ3JlYXRlZCBicmVha3BvaW50cyBtYW5hZ2VyCiAgIER1bXBpbmcg U3RvcmFnZQotICBBZGRpbmcgVUlTb3VyY2VDb2RlOiBhLmpzICh1cmw9YS5qcykKKyAgQWRkaW5n IFVJU291cmNlQ29kZTogYS5qcykKICAgICBkZWJ1Z2dlck1vZGVsLnNldEJyZWFrcG9pbnQoYS5q czoyNTAwOikKICAgICBicmVha3BvaW50QWRkZWQoYS5qcywgMjUwMCwgLCB0cnVlKQogICBEdW1w aW5nIFN0b3JhZ2UKQEAgLTE4MSw3ICsxODEsNyBAQCBSdW5uaW5nOiB0ZXN0TmF2aWdhdGlvbgog ICAgIGEuanM6MTAgZW5hYmxlZDp0cnVlIGNvbmRpdGlvbjpmb28gPT0gYmFyCiAgICAgYS5qczoy MCBlbmFibGVkOmZhbHNlIGNvbmRpdGlvbjoKICAgICBiLmpzOjMgZW5hYmxlZDp0cnVlIGNvbmRp dGlvbjoKLSAgQWRkaW5nIFVJU291cmNlQ29kZTogYS5qcyAodXJsPWEuanMpCisgIEFkZGluZyBV SVNvdXJjZUNvZGU6IGEuanMpCiAgICAgZGVidWdnZXJNb2RlbC5zZXRCcmVha3BvaW50KGEuanM6 MTA6Zm9vID09IGJhcikKICAgICBicmVha3BvaW50QWRkZWQoYS5qcywgMTAsIGZvbyA9PSBiYXIs IHRydWUpCiAgICAgTG9jYXRpb24gY3JlYXRlZDogYS5qczoxMApAQCAtMTkyLDcgKzE5Miw3IEBA IFJ1bm5pbmc6IHRlc3ROYXZpZ2F0aW9uCiAgICAgYnJlYWtwb2ludFJlbW92ZWQoYS5qcywgMTAp CiAgICAgTG9jYXRpb24gZGlzcG9zZWQ6IGEuanM6MTAKICAgICBicmVha3BvaW50UmVtb3ZlZChh LmpzLCAyMCkKLSAgQWRkaW5nIFVJU291cmNlQ29kZTogYi5qcyAodXJsPWIuanMpCisgIEFkZGlu ZyBVSVNvdXJjZUNvZGU6IGIuanMpCiAgICAgZGVidWdnZXJNb2RlbC5zZXRCcmVha3BvaW50KGIu anM6MzopCiAgICAgYnJlYWtwb2ludEFkZGVkKGIuanMsIDMsICwgdHJ1ZSkKICAgICBMb2NhdGlv biBjcmVhdGVkOiBiLmpzOjMKQEAgLTIwMiw3ICsyMDIsNyBAQCBSdW5uaW5nOiB0ZXN0TmF2aWdh dGlvbgogICAgIGJyZWFrcG9pbnRSZW1vdmVkKGIuanMsIDMpCiAgICAgTG9jYXRpb24gZGlzcG9z ZWQ6IGIuanM6MwogICBSZXNvbHZpbmcgcHJvdmlzaW9uYWwgYnJlYWtwb2ludC4KLSAgQWRkaW5n IFVJU291cmNlQ29kZTogYS5qcyAodXJsPWEuanMpCisgIEFkZGluZyBVSVNvdXJjZUNvZGU6IGEu anMpCiAgICAgZGVidWdnZXJNb2RlbC5yZW1vdmVCcmVha3BvaW50KGEuanM6MTApCiAgICAgZGVi dWdnZXJNb2RlbC5zZXRCcmVha3BvaW50KGEuanM6MTA6Zm9vID09IGJhcikKICAgICBicmVha3Bv aW50QWRkZWQoYS5qcywgMTAsIGZvbyA9PSBiYXIsIHRydWUpCkBAIC0yMjQsNyArMjI0LDcgQEAg UnVubmluZzogdGVzdFNvdXJjZU1hcHBpbmcKICAgRHVtcGluZyBTdG9yYWdlCiAgICAgYS5qczox MCBlbmFibGVkOnRydWUgY29uZGl0aW9uOmZvbyA9PSBiYXIKICAgICBhLmpzOjIwIGVuYWJsZWQ6 dHJ1ZSBjb25kaXRpb246Ci0gIEFkZGluZyBVSVNvdXJjZUNvZGU6IGEuanMgKHVybD1hLmpzKQor ICBBZGRpbmcgVUlTb3VyY2VDb2RlOiBhLmpzKQogICAgIGRlYnVnZ2VyTW9kZWwuc2V0QnJlYWtw b2ludChhLmpzOjEwOmZvbyA9PSBiYXIpCiAgICAgYnJlYWtwb2ludEFkZGVkKGEuanMsIDEwLCBm b28gPT0gYmFyLCB0cnVlKQogICAgIExvY2F0aW9uIGNyZWF0ZWQ6IGEuanM6MTAKQEAgLTI1OCw3 ICsyNTgsNyBAQCBSdW5uaW5nOiB0ZXN0UHJvdmlzaW9uYWxCcmVha3BvaW50c1Jlc29sdmUKICAg Q3JlYXRlZCBicmVha3BvaW50cyBtYW5hZ2VyCiAgIER1bXBpbmcgU3RvcmFnZQogICAgIGEuanM6 MTAgZW5hYmxlZDp0cnVlIGNvbmRpdGlvbjpmb28gPT0gYmFyCi0gIEFkZGluZyBVSVNvdXJjZUNv ZGU6IGEuanMgKHVybD1hLmpzKQorICBBZGRpbmcgVUlTb3VyY2VDb2RlOiBhLmpzKQogICAgIGRl YnVnZ2VyTW9kZWwuc2V0QnJlYWtwb2ludChhLmpzOjEwOmZvbyA9PSBiYXIpCiAgICAgYnJlYWtw b2ludEFkZGVkKGEuanMsIDEwLCBmb28gPT0gYmFyLCB0cnVlKQogICAgIExvY2F0aW9uIGNyZWF0 ZWQ6IGEuanM6MTAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9i cmVha3BvaW50LW1hbmFnZXIuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9i cmVha3BvaW50LW1hbmFnZXIuaHRtbAppbmRleCA3MjVmOTY0NzJjNmI5MzFhY2I4OGYyZjI5OWRm OTczODM4MDNhMWYxLi42NWY2MTFiMzQ3NzgxN2FlYjQwODk0ZDk3OGFkZWQzOGYwODhhZDg4IDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvYnJlYWtwb2ludC1tYW5h Z2VyLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2JyZWFrcG9pbnQt bWFuYWdlci5odG1sCkBAIC02LDI5ICs2LDI5IEBACiAKIGZ1bmN0aW9uIHRlc3QoKQogeworICAg IHZhciB1aVNvdXJjZUNvZGVzID0ge307CisKICAgICB2YXIgZGVmYXVsdE1hcHBpbmcgPSB7CiAg ICAgICAgIHJhd0xvY2F0aW9uVG9VSUxvY2F0aW9uOiBmdW5jdGlvbihyYXdMb2NhdGlvbikKICAg ICAgICAgewotICAgICAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9IG5ldyBXZWJJbnNwZWN0b3Iu VUlTb3VyY2VDb2RlKHJhd0xvY2F0aW9uLnNjcmlwdElkLCByYXdMb2NhdGlvbi5zY3JpcHRJZCwg bnVsbCwgdGhpcyk7Ci0gICAgICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5VSUxvY2F0 aW9uKHVpU291cmNlQ29kZSwgcmF3TG9jYXRpb24ubGluZU51bWJlciwgMCk7CisgICAgICAgICAg ICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5VSUxvY2F0aW9uKHVpU291cmNlQ29kZXNbcmF3TG9j YXRpb24uc2NyaXB0SWRdLCByYXdMb2NhdGlvbi5saW5lTnVtYmVyLCAwKTsKICAgICAgICAgfSwK IAogICAgICAgICB1aUxvY2F0aW9uVG9SYXdMb2NhdGlvbjogZnVuY3Rpb24odWlTb3VyY2VDb2Rl LCBsaW5lTnVtYmVyKQogICAgICAgICB7Ci0gICAgICAgICAgICByZXR1cm4geyBzY3JpcHRJZDog dWlTb3VyY2VDb2RlLmlkLCBsaW5lTnVtYmVyOiBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXI6IDAg fTsKKyAgICAgICAgICAgIHJldHVybiB7IHNjcmlwdElkOiB1aVNvdXJjZUNvZGUudXJsLCBsaW5l TnVtYmVyOiBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXI6IDAgfTsKICAgICAgICAgfQogICAgIH07 CiAKICAgICB2YXIgc2hpZnRpbmdNYXBwaW5nID0gewogICAgICAgICByYXdMb2NhdGlvblRvVUlM b2NhdGlvbjogZnVuY3Rpb24ocmF3TG9jYXRpb24pCiAgICAgICAgIHsKLSAgICAgICAgICAgIHZh ciB1aVNvdXJjZUNvZGUgPSBuZXcgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZShyYXdMb2NhdGlv bi5zY3JpcHRJZCwgcmF3TG9jYXRpb24uc2NyaXB0SWQsIG51bGwsIHRoaXMpOwotICAgICAgICAg ICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuVUlMb2NhdGlvbih1aVNvdXJjZUNvZGUsIHJhd0xv Y2F0aW9uLmxpbmVOdW1iZXIgKyAxMCwgMCk7CisgICAgICAgICAgICByZXR1cm4gbmV3IFdlYklu c3BlY3Rvci5VSUxvY2F0aW9uKHVpU291cmNlQ29kZXNbcmF3TG9jYXRpb24uc2NyaXB0SWRdLCBy YXdMb2NhdGlvbi5saW5lTnVtYmVyICsgMTAsIDApOwogICAgICAgICB9LAogCiAgICAgICAgIHVp TG9jYXRpb25Ub1Jhd0xvY2F0aW9uOiBmdW5jdGlvbih1aVNvdXJjZUNvZGUsIGxpbmVOdW1iZXIp CiAgICAgICAgIHsKLSAgICAgICAgICAgIHJldHVybiB7IHNjcmlwdElkOiB1aVNvdXJjZUNvZGUu aWQsIGxpbmVOdW1iZXI6IGxpbmVOdW1iZXIgLSAxMCwgY29sdW1uTnVtYmVyOiAwIH07CisgICAg ICAgICAgICByZXR1cm4geyBzY3JpcHRJZDogdWlTb3VyY2VDb2RlLnVybCwgbGluZU51bWJlcjog bGluZU51bWJlciAtIDEwLCBjb2x1bW5OdW1iZXI6IDAgfTsKICAgICAgICAgfQogICAgIH07CiAK QEAgLTExNCwxMyArMTE0LDEzIEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgIHsKICAgICAgICAgdmFy IGJyZWFrcG9pbnQgPSBldmVudC5kYXRhLmJyZWFrcG9pbnQ7CiAgICAgICAgIHZhciB1aUxvY2F0 aW9uID0gZXZlbnQuZGF0YS51aUxvY2F0aW9uOwotICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJl c3VsdCgiICAgIGJyZWFrcG9pbnRBZGRlZCgiICsgW3VpTG9jYXRpb24udWlTb3VyY2VDb2RlLmlk LCB1aUxvY2F0aW9uLmxpbmVOdW1iZXIsIGJyZWFrcG9pbnQuY29uZGl0aW9uKCksIGJyZWFrcG9p bnQuZW5hYmxlZCgpXS5qb2luKCIsICIpICsgIikiKTsKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5h ZGRSZXN1bHQoIiAgICBicmVha3BvaW50QWRkZWQoIiArIFt1aUxvY2F0aW9uLnVpU291cmNlQ29k ZS51cmwsIHVpTG9jYXRpb24ubGluZU51bWJlciwgYnJlYWtwb2ludC5jb25kaXRpb24oKSwgYnJl YWtwb2ludC5lbmFibGVkKCldLmpvaW4oIiwgIikgKyAiKSIpOwogICAgIH0KIAogICAgIGZ1bmN0 aW9uIGJyZWFrcG9pbnRSZW1vdmVkKGV2ZW50KQogICAgIHsKICAgICAgICAgdmFyIHVpTG9jYXRp b24gPSBldmVudC5kYXRhLnVpTG9jYXRpb247Ci0gICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVz dWx0KCIgICAgYnJlYWtwb2ludFJlbW92ZWQoIiArIFt1aUxvY2F0aW9uLnVpU291cmNlQ29kZS5p ZCwgdWlMb2NhdGlvbi5saW5lTnVtYmVyXS5qb2luKCIsICIpICsgIikiKTsKKyAgICAgICAgSW5z cGVjdG9yVGVzdC5hZGRSZXN1bHQoIiAgICBicmVha3BvaW50UmVtb3ZlZCgiICsgW3VpTG9jYXRp b24udWlTb3VyY2VDb2RlLnVybCwgdWlMb2NhdGlvbi5saW5lTnVtYmVyXS5qb2luKCIsICIpICsg IikiKTsKICAgICB9CiAKICAgICBJbnNwZWN0b3JUZXN0LmFkZFNuaWZmZXIoV2ViSW5zcGVjdG9y LlNjcmlwdC5wcm90b3R5cGUsICJjcmVhdGVMaXZlTG9jYXRpb24iLCBmdW5jdGlvbihyYXdMb2Nh dGlvbikKQEAgLTEzMiwxMSArMTMyLDEyIEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICBJbnNw ZWN0b3JUZXN0LmFkZFJlc3VsdCgiICAgIExvY2F0aW9uIGRpc3Bvc2VkOiAiICsgdGhpcy5fcmF3 TG9jYXRpb24uc2NyaXB0SWQgKyAiOiIgKyB0aGlzLl9yYXdMb2NhdGlvbi5saW5lTnVtYmVyKTsK ICAgICB9LCB0cnVlKTsKIAotICAgIGZ1bmN0aW9uIGFkZFVJU291cmNlQ29kZShicmVha3BvaW50 TWFuYWdlciwgaWQsIHVybCkKKyAgICBmdW5jdGlvbiBhZGRVSVNvdXJjZUNvZGUoYnJlYWtwb2lu dE1hbmFnZXIsIHVybCkKICAgICB7Ci0gICAgICAgIGJyZWFrcG9pbnRNYW5hZ2VyLl9kZWJ1Z2dl ck1vZGVsLl9hZGRTY3JpcHQoaWQsIHVybCk7Ci0gICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVz dWx0KCIgIEFkZGluZyBVSVNvdXJjZUNvZGU6ICIgKyBpZCArICIgKHVybD0iICsgKHVybCB8fCBp ZCkgKyAiKSIpOwotICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gbmV3IFdlYkluc3BlY3Rvci5K YXZhU2NyaXB0U291cmNlKGlkLCB1cmwgfHwgaWQsIG51bGwsIGRlZmF1bHRNYXBwaW5nKTsKKyAg ICAgICAgYnJlYWtwb2ludE1hbmFnZXIuX2RlYnVnZ2VyTW9kZWwuX2FkZFNjcmlwdCh1cmwsIHVy bCk7CisgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCIgIEFkZGluZyBVSVNvdXJjZUNv ZGU6ICIgKyB1cmwgKyAiKSIpOworICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gbmV3IFdlYklu c3BlY3Rvci5KYXZhU2NyaXB0U291cmNlKHVybCwgbnVsbCwgZGVmYXVsdE1hcHBpbmcpOworICAg ICAgICB1aVNvdXJjZUNvZGVzW3VybF0gPSB1aVNvdXJjZUNvZGU7CiAgICAgICAgIGJyZWFrcG9p bnRNYW5hZ2VyLnJlc3RvcmVCcmVha3BvaW50cyh1aVNvdXJjZUNvZGUpOwogICAgICAgICByZXR1 cm4gdWlTb3VyY2VDb2RlOwogICAgIH0KQEAgLTE3MSwxMyArMTcyLDEzIEBAIGZ1bmN0aW9uIHRl c3QoKQogCiAgICAgZnVuY3Rpb24gc2V0QnJlYWtwb2ludChicmVha3BvaW50TWFuYWdlciwgdWlT b3VyY2VDb2RlLCBsaW5lTnVtYmVyLCBjb25kaXRpb24sIGVuYWJsZWQpCiAgICAgewotICAgICAg ICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiICBTZXR0aW5nIGJyZWFrcG9pbnQgYXQgIiArIHVp U291cmNlQ29kZS5pZCArICI6IiArIGxpbmVOdW1iZXIgKyAiIGVuYWJsZWQ6IiArIGVuYWJsZWQg KyAiIGNvbmRpdGlvbjoiICsgY29uZGl0aW9uKTsKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRS ZXN1bHQoIiAgU2V0dGluZyBicmVha3BvaW50IGF0ICIgKyB1aVNvdXJjZUNvZGUudXJsICsgIjoi ICsgbGluZU51bWJlciArICIgZW5hYmxlZDoiICsgZW5hYmxlZCArICIgY29uZGl0aW9uOiIgKyBj b25kaXRpb24pOwogICAgICAgICByZXR1cm4gYnJlYWtwb2ludE1hbmFnZXIuc2V0QnJlYWtwb2lu dCh1aVNvdXJjZUNvZGUsIGxpbmVOdW1iZXIsIGNvbmRpdGlvbiwgZW5hYmxlZCk7CiAgICAgfQog CiAgICAgZnVuY3Rpb24gcmVtb3ZlQnJlYWtwb2ludChicmVha3BvaW50TWFuYWdlciwgdWlTb3Vy Y2VDb2RlLCBsaW5lTnVtYmVyKQogICAgIHsKLSAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1 bHQoIiAgUmVtb3ZpbmcgYnJlYWtwb2ludCBhdCAiICsgdWlTb3VyY2VDb2RlLmlkICsgIjoiICsg bGluZU51bWJlcik7CisgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCIgIFJlbW92aW5n IGJyZWFrcG9pbnQgYXQgIiArIHVpU291cmNlQ29kZS51cmwgKyAiOiIgKyBsaW5lTnVtYmVyKTsK ICAgICAgICAgYnJlYWtwb2ludE1hbmFnZXIuZmluZEJyZWFrcG9pbnQodWlTb3VyY2VDb2RlLCBs aW5lTnVtYmVyKS5yZW1vdmUoKTsKICAgICB9CiAKQEAgLTE5NCw2ICsxOTUsNyBAQCBmdW5jdGlv biB0ZXN0KCkKICAgICAgICAgZHVtcEJyZWFrcG9pbnRTdG9yYWdlKGJyZWFrcG9pbnRNYW5hZ2Vy KTsKICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIiAgUmVzZXR0aW5nIGJyZWFrcG9p bnQgbWFuYWdlciIpOwogICAgICAgICBicmVha3BvaW50TWFuYWdlci5yZXNldCgpOworICAgICAg ICB1aVNvdXJjZUNvZGVzID0ge307CiAgICAgICAgIG5leHQoKTsKICAgICB9CiAKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9yYXctc291cmNlLWNvZGUuaHRtbCBi L0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9yYXctc291cmNlLWNvZGUuaHRtbAppbmRl eCA2NjRkMjNlZGNhZDQ2M2ZkMDM3M2Q3MGUxNDZjNjg4M2MxNmE5YTJiLi5kMzBjNmIyNzZhODc3 ZWI5ZDQyMzMyNzBjZjhlNWE3NTdhNmUzMmRhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvZGVidWdnZXIvcmF3LXNvdXJjZS1jb2RlLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL2RlYnVnZ2VyL3Jhdy1zb3VyY2UtY29kZS5odG1sCkBAIC05Nyw3ICs5Nyw3IEBAIGZ1 bmN0aW9uIHRlc3QoKQogICAgICAgICAgICAgdmFyIHJhd1NvdXJjZUNvZGUgPSBjcmVhdGVSYXdT b3VyY2VDb2RlKHNjcmlwdCwgbnVsbCk7CiAKICAgICAgICAgICAgIHZhciB1aVNvdXJjZUNvZGUg PSByYXdTb3VyY2VDb2RlLnVpU291cmNlQ29kZSgpOwotICAgICAgICAgICAgSW5zcGVjdG9yVGVz dC5hZGRSZXN1bHQoIlVJU291cmNlQ29kZTogIiArIHJhd1NvdXJjZUNvZGUudWlTb3VyY2VDb2Rl KCkuaWQpOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIlVJU291cmNlQ29k ZTogIiArIHJhd1NvdXJjZUNvZGUudWlTb3VyY2VDb2RlKCkudXJsKTsKICAgICAgICAgICAgIElu c3BlY3RvclRlc3QuYWRkUmVzdWx0KCJVSVNvdXJjZUNvZGUgaXMgY29udGVudCBzY3JpcHQ6ICIg KyB1aVNvdXJjZUNvZGUuaXNDb250ZW50U2NyaXB0KTsKICAgICAgICAgICAgIEluc3BlY3RvclRl c3QuY2hlY2tVSUxvY2F0aW9uKHVpU291cmNlQ29kZSwgMCwgNSwgcmF3U291cmNlQ29kZS5yYXdM b2NhdGlvblRvVUlMb2NhdGlvbihjcmVhdGVSYXdMb2NhdGlvbigwLCA1KSkpOwogICAgICAgICAg ICAgSW5zcGVjdG9yVGVzdC5jaGVja1Jhd0xvY2F0aW9uKHNjcmlwdCwgMTAsIDAsIHJhd1NvdXJj ZUNvZGUudWlMb2NhdGlvblRvUmF3TG9jYXRpb24odWlTb3VyY2VDb2RlLCAxMCwgMCkpOwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtZmlsZS1zZWxl Y3Rvci5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtZmlsZS1z ZWxlY3Rvci5odG1sCmluZGV4IDY5Mzk0NmJmNGU4Y2ZlMDZhYzRlNmNkODVlNjNhYThkYjA5NDQz YjEuLjdlNjRmZTE4MDk2NDYyYzI3OTdlMmViOTkzNGI0ZGFjNjc0ZTAzOWYgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLWZpbGUtc2VsZWN0b3IuaHRt bAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1maWxlLXNlbGVj dG9yLmh0bWwKQEAgLTEzLDcgKzEzLDcgQEAgZnVuY3Rpb24gdGVzdCgpCiAKICAgICBmdW5jdGlv biBhZGRVSVNvdXJjZUNvZGUodXJsLCBpc0NvbnRlbnRTY3JpcHQpCiAgICAgewotICAgICAgICB2 YXIgdWlTb3VyY2VDb2RlID0gbmV3IFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUoMCwgdXJsLCBu dWxsLCBudWxsKTsKKyAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9IG5ldyBXZWJJbnNwZWN0b3Iu VUlTb3VyY2VDb2RlKHVybCwgbnVsbCwgbnVsbCk7CiAgICAgICAgIHVpU291cmNlQ29kZS5pc0Nv bnRlbnRTY3JpcHQgPSBpc0NvbnRlbnRTY3JpcHQ7CiAgICAgICAgIG5hdmlnYXRvckZpbGVTZWxl Y3Rvci5hZGRVSVNvdXJjZUNvZGUodWlTb3VyY2VDb2RlKTsKICAgICB9CmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1wYW5lbC5odG1sIGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFuZWwuaHRtbAppbmRleCAzYTk2Mzgw MTJmYTQ2ZTNkNzIzODJiMmUyZmYxYTA2Y2YzNDRmNDFhLi4yYWIwYzU1NzkyZDQ2MDZiNGM5MmZj OWU0M2NmMTNmMmFlNDE5OWExIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVi dWdnZXIvc2NyaXB0cy1wYW5lbC5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1 Z2dlci9zY3JpcHRzLXBhbmVsLmh0bWwKQEAgLTQ5LDcgKzQ5LDcgQEAgZnVuY3Rpb24gdGVzdCgp CiAgICAgfQogICAgIGZ1bmN0aW9uIGNyZWF0ZVVJU291Y2VDb2RlKHVybCkKICAgICB7Ci0gICAg ICAgIHZhciB1aVNvdXJjZUNvZGUgPSBuZXcgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2Uo MCwgdXJsLCBudWxsLCBudWxsKTsKKyAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9IG5ldyBXZWJJ bnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZSh1cmwsIG51bGwsIG51bGwpOwogICAgICAgICB1aVNv dXJjZUNvZGUucmVxdWVzdENvbnRlbnQgPSBmdW5jdGlvbihjYWxsYmFjaykKICAgICAgICAgewog ICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIlNvdXJjZSByZXF1ZXN0ZWQgZm9y ICIgKyB1cmwpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3Nj cmlwdHMtc29ydGluZy5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3Njcmlw dHMtc29ydGluZy5odG1sCmluZGV4IGQzYzg2YzkwZTYyNWJmODBjMWI0Yzc1M2ExYzRkNWYwMzg4 ZThjNmMuLmM4MDcwZTVjOGYzYWQwMjU2MGNjYzQ5OWUzMjhmZjk3ZmMwMDlhYTggMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXNvcnRpbmcuaHRtbAor KysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1zb3J0aW5nLmh0bWwK QEAgLTExLDEwICsxMSw5IEBAIGZ1bmN0aW9uIHRlc3QoKQogCiAgICAgdmFyIG5hdmlnYXRvckZp bGVTZWxlY3RvciA9IG5ldyBXZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvcigpOwogCi0gICAg dmFyIG5leHRJZCA9IDE7CiAgICAgZnVuY3Rpb24gYWRkVUlTb3VyY2VDb2RlKHVybCwgaXNDb250 ZW50U2NyaXB0KQogICAgIHsKLSAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9IG5ldyBXZWJJbnNw ZWN0b3IuVUlTb3VyY2VDb2RlKG5leHRJZCsrLCB1cmwsIG51bGwsIG51bGwpOworICAgICAgICB2 YXIgdWlTb3VyY2VDb2RlID0gbmV3IFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUodXJsLCBudWxs LCBudWxsKTsKICAgICAgICAgdWlTb3VyY2VDb2RlLmlzQ29udGVudFNjcmlwdCA9IGlzQ29udGVu dFNjcmlwdDsKICAgICAgICAgbmF2aWdhdG9yRmlsZVNlbGVjdG9yLmFkZFVJU291cmNlQ29kZSh1 aVNvdXJjZUNvZGUpOwogICAgIH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9k ZWJ1Z2dlci91aS1zb3VyY2UtY29kZS1kaXNwbGF5LW5hbWUuaHRtbCBiL0xheW91dFRlc3RzL2lu c3BlY3Rvci9kZWJ1Z2dlci91aS1zb3VyY2UtY29kZS1kaXNwbGF5LW5hbWUuaHRtbAppbmRleCBk MjFkZDM0NTc0YmE0M2VlNWRhNDk3YmYxMTAyMzhmYmIwYzViOTNkLi4zOWM0OWNiYzM5NmI5YmJh OGM4ZGE2MjVkNzA4OGFiYjNkYjRkMDE3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0 b3IvZGVidWdnZXIvdWktc291cmNlLWNvZGUtZGlzcGxheS1uYW1lLmh0bWwKKysrIGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3VpLXNvdXJjZS1jb2RlLWRpc3BsYXktbmFtZS5odG1s CkBAIC02LDcgKzYsNyBAQCBmdW5jdGlvbiB0ZXN0KCkKIHsKICAgICBmdW5jdGlvbiBkdW1wVUlT b3VyY2VDb2RlRGlzcGxheU5hbWUodXJsKQogICAgIHsKLSAgICAgICAgdmFyIHVpU291cmNlQ29k ZSA9IG5ldyBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlKCJpZCIsIHVybCwgbnVsbCwgbnVsbCk7 CisgICAgICAgIHZhciB1aVNvdXJjZUNvZGUgPSBuZXcgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29k ZSh1cmwsIG51bGwsIG51bGwpOwogICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiVUlT b3VyY2VDb2RlIGRpc3BsYXkgbmFtZSBmb3IgdXJsIFwiIiArIHVybCArICJcIiBpcyBcIiIgKyBX ZWJJbnNwZWN0b3IuVGFiYmVkRWRpdG9yQ29udGFpbmVyLnByb3RvdHlwZS5fdGl0bGVGb3JGaWxl KHVpU291cmNlQ29kZSkgKyAiXCIuIik7CiAgICAgfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvZGVidWdnZXIvdWktc291cmNlLWNvZGUuaHRtbCBiL0xheW91dFRlc3RzL2lu c3BlY3Rvci9kZWJ1Z2dlci91aS1zb3VyY2UtY29kZS5odG1sCmluZGV4IDJiNDVkMDFmYzY1NTZj ZjdkNjUwNTU4NDQ1YzEwOGY3MTU2OTE0ZjcuLjBlOTI5M2QxODA2MjIyMmYzMGNmN2Y2NmVlOTlj MTE3YjVmODhiODcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci91 aS1zb3VyY2UtY29kZS5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci91 aS1zb3VyY2UtY29kZS5odG1sCkBAIC0xNyw3ICsxNyw3IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAg IEluc3BlY3RvclRlc3QucnVuVGVzdFN1aXRlKFsKICAgICAgICAgZnVuY3Rpb24gdGVzdFVJU291 cmNlQ29kZShuZXh0KQogICAgICAgICB7Ci0gICAgICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0g bmV3IFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUoImlkIiwgInVybCIsIGNvbnRlbnRQcm92aWRl cik7CisgICAgICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gbmV3IFdlYkluc3BlY3Rvci5VSVNv dXJjZUNvZGUoInVybCIsIGNvbnRlbnRQcm92aWRlcik7CiAgICAgICAgICAgICBmdW5jdGlvbiBk aWRSZXF1ZXN0Q29udGVudChjYWxsTnVtYmVyLCBjb250ZW50LCBjb250ZW50RW5jb2RlZCwgbWlt ZVR5cGUpCiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRS ZXN1bHQoIkNhbGxiYWNrICIgKyBjYWxsTnVtYmVyICsgIiBpcyBpbnZva2VkLiIpOwo=