157670 2016-05-13 02:17:27 -0700 Summary page doesn't report some missing platforms 2016-05-13 12:41:51 -0700 1 1 1 Unclassified WebKit Perf Dashboard Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa cdumez commit-queue dewei_zhu kling koivisto rniwa slewis oldest_to_newest 1192703 0 rniwa 2016-05-13 02:17:27 -0700 There is a bug that if a platform had never submitted any data, we don't report it as a missing platform. 1192704 1 278825 rniwa 2016-05-13 02:18:10 -0700 Created attachment 278825 Fixes the bug 1192843 2 278825 rniwa 2016-05-13 12:20:32 -0700 Comment on attachment 278825 Fixes the bug Thanks for the reviews! 1192856 3 278825 commit-queue 2016-05-13 12:41:45 -0700 Comment on attachment 278825 Fixes the bug Clearing flags on attachment: 278825 Committed r200878: <http://trac.webkit.org/changeset/200878> 1192857 4 commit-queue 2016-05-13 12:41:51 -0700 All reviewed patches have been landed. Closing bug. 278825 2016-05-13 02:18:10 -0700 2016-05-13 12:41:45 -0700 Fixes the bug bug-157670-20160513021901.patch text/plain 10453 rniwa SW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkocmV2aXNpb24gMjAwODI0KQorKysg V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMxIEBACisyMDE2LTA1LTEzICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIFN1bW1hcnkgcGFnZSBkb2Vzbid0IHJlcG9ydCBzb21lIG1pc3NpbmcgcGxhdGZv cm1zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTc2 NzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlz IHBhdGNoIGltcHJvdmVzIHRoZSB3YXJuaW5nIHRleHQgZm9yIG1pc3NpbmcgcGxhdGZvcm1zIGFu ZCBmaXhlcyB0aGUgYnVnIHRoYXQgcGxhdGZvcm1zIHRoYXQgZG9uJ3QgaGF2ZQorICAgICAgICBh bnkgZGF0YSByZXBvcnRlZCBmb3IgYSBnaXZlbiB0ZXN0IHdvdWxkIG5vdCBiZSByZXBvcnRlZCBh cyBtaXNzaW5nLgorCisgICAgICAgICogcHVibGljL3YzL3BhZ2VzL3N1bW1hcnktcGFnZS5qczoK KyAgICAgICAgKFN1bW1hcnlQYWdlLnByb3RvdHlwZS5yZW5kZXIpOiBBZGRlZCBpbnN0cnVtZW50 YXRpb25zLgorICAgICAgICAoU3VtbWFyeVBhZ2UucHJvdG90eXBlLl9jb25zdHJ1Y3RSYXRpb0dy YXBoKTogQWx3YXlzIGNyZWF0ZSBib3RoIHRoZSByYXRpbyBiYXIgZ3JhcGggYW5kIHRoZSBzcGlu bmVyIGljb24uCisgICAgICAgIChTdW1tYXJ5UGFnZS5wcm90b3R5cGUuX3JlbmRlckNlbGwpOiBF eHRyYWN0ZWQgZnJvbSBfY29uc3RydWN0UmF0aW9HcmFwaC4gVG9nZ2xlIHRoZSBkaXNwbGF5ZWQt bmVzcyBvZiB0aGUKKyAgICAgICAgc3Bpbm5lciBhbmQgdGhlIHJhdGlvIGJhciBncmFwaCBpbiB0 aGUgY2VsbCBieSBDU1MgZm9yIGJldHRlciBwZXJmb3JtYW5jZS4KKyAgICAgICAgKFN1bW1hcnlQ YWdlLnByb3RvdHlwZS5fd2FybmluZ1RleHRGb3JHcm91cCk6IEV4dHJhY3RlZCBmcm9tIF9jb25z dHJ1Y3RSYXRpb0dyYXBoLiBSZXBocmFzZWQgd2FybmluZyB0ZXh0CisgICAgICAgIGZvciBjbGFy aXR5IGFuZCBhZG9wdGVkIG5ldyBBUEkgb2YgU3VtbWFyeVBhZ2VDb25maWd1cmF0aW9uR3JvdXAu CisgICAgICAgIChTdW1tYXJ5UGFnZS5wcm90b3R5cGUuX3dhcm5pbmdUZXh0Rm9yR3JvdXAubWFw QW5kU29ydEJ5TmFtZSk6IEFkZGVkLgorICAgICAgICAoU3VtbWFyeVBhZ2UucHJvdG90eXBlLl93 YXJuaW5nVGV4dEZvckdyb3VwLnBsdXJhbGl6ZUlmTmVlZGVkKTogQWRkZWQuCisgICAgICAgIChT dW1tYXJ5UGFnZS5jc3NUZW1wbGF0ZSk6IEFkZGVkIHJ1bGVzIHRvIHRvZ2dsZSB0aGUgdmlzaWJp bGl0eSBvZiBzcGlubmVyIGljb25zIGFuZCBiYXIgZ3JhcGhzLgorICAgICAgICAoU3VtbWFyeVBh Z2VDb25maWd1cmF0aW9uR3JvdXApOiBSZXBsYWNlZCB0aGlzLl93YXJuaW5ncyBieSBtb3JlIGV4 cGxpY2l0bHkgbmFtZWQgdGhpcy5fbWlzc2luZ1BsYXRmb3JtcworICAgICAgICBhbmQgdGhpcy5f cGxhdGZvcm1zV2l0aG91dEJhc2VsaW5lLiBBbHNvIGFkZCBhIHBsYXRmb3JtIHRvIHRoaXMuX21p c3NpbmdQbGF0Zm9ybXMgaWYgaXQgZGlkbid0IGFwcGVhciBpbgorICAgICAgICBhbnkgbWV0cmlj cy4gTm90ZSB0aGF0IGFkZGluZyBhIHBsYXRmb3JtIHdoZW5ldmVyIGl0IGRvZXNuJ3QgaW4gYW55 IG9uZSBtZXRyaWMgd291bGQgYmUgaW5jb3JyZWN0IHNpbmNlCisgICAgICAgIHNvbWUgdGVzdHMg dXNlcyBhIGRpZmZlcmVudCB0ZXN0IG5hbWUgb24gZGlmZmVyZW50IHBsYXRmb3JtczogZS5nLiBQ TFQtTWFjIGFuZCBQTFQtaVBob25lLgorICAgICAgICAoU3VtbWFyeVBhZ2VDb25maWd1cmF0aW9u R3JvdXAucHJvdG90eXBlLm1pc3NpbmdQbGF0Zm9ybXMpOiBBZGRlZC4KKyAgICAgICAgKFN1bW1h cnlQYWdlQ29uZmlndXJhdGlvbkdyb3VwLnByb3RvdHlwZS5wbGF0Zm9ybXNXaXRob3V0QmFzZWxp bmUpOiBBZGRlZC4KKyAgICAgICAgKFN1bW1hcnlQYWdlQ29uZmlndXJhdGlvbkdyb3VwLnByb3Rv dHlwZS5fZmV0Y2hBbmRDb21wdXRlUmF0aW8pOgorCiAyMDE2LTA1LTEzICBSeW9zdWtlIE5pd2Eg IDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIEFsd2F5cyB1c2UgdjMgVUkgZm9yIGRhc2hi b2FyZHMgYW5kIGFuYWx5c2lzIHRhc2sgcGFnZXMKSW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0 Lm9yZy9wdWJsaWMvdjMvcGFnZXMvc3VtbWFyeS1wYWdlLmpzCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYnNp dGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvcGFnZXMvc3VtbWFyeS1wYWdlLmpzCShyZXZp c2lvbiAyMDA4MjQpCisrKyBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL3BhZ2Vz L3N1bW1hcnktcGFnZS5qcwkod29ya2luZyBjb3B5KQpAQCAtNDAsMTMgKzQwLDE4IEBAIGNsYXNz IFN1bW1hcnlQYWdlIGV4dGVuZHMgUGFnZVdpdGhIZWFkaW4KICAgICAKICAgICByZW5kZXIoKQog ICAgIHsKKyAgICAgICAgSW5zdHJ1bWVudGF0aW9uLnN0YXJ0TWVhc3VyaW5nVGltZSgnU3VtbWFy eVBhZ2UnLCAncmVuZGVyJyk7CiAgICAgICAgIHN1cGVyLnJlbmRlcigpOwogCi0gICAgICAgIGlm ICh0aGlzLl9zaG91bGRDb25zdHJ1Y3RUYWJsZSkKKyAgICAgICAgaWYgKHRoaXMuX3Nob3VsZENv bnN0cnVjdFRhYmxlKSB7CisgICAgICAgICAgICBJbnN0cnVtZW50YXRpb24uc3RhcnRNZWFzdXJp bmdUaW1lKCdTdW1tYXJ5UGFnZScsICdfY29uc3RydWN0VGFibGUnKTsKICAgICAgICAgICAgIHRo aXMucmVuZGVyUmVwbGFjZSh0aGlzLmNvbnRlbnQoKS5xdWVyeVNlbGVjdG9yKCcuc3VtbWFyeS10 YWJsZScpLCB0aGlzLl9jb25zdHJ1Y3RUYWJsZSgpKTsKKyAgICAgICAgICAgIEluc3RydW1lbnRh dGlvbi5lbmRNZWFzdXJpbmdUaW1lKCdTdW1tYXJ5UGFnZScsICdfY29uc3RydWN0VGFibGUnKTsK KyAgICAgICAgfQogCiAgICAgICAgIGZvciAodmFyIHJlbmRlciBvZiB0aGlzLl9yZW5kZXJRdWV1 ZSkKICAgICAgICAgICAgIHJlbmRlcigpOworICAgICAgICBJbnN0cnVtZW50YXRpb24uZW5kTWVh c3VyaW5nVGltZSgnU3VtbWFyeVBhZ2UnLCAncmVuZGVyJyk7CiAgICAgfQogCiAgICAgX2NyZWF0 ZUNvbmZpZ3VyYXRpb25Hcm91cChwbGF0Zm9ybUlkTGlzdCwgbWV0cmljSWRMaXN0KQpAQCAtOTAs MzggKzk1LDU0IEBAIGNsYXNzIFN1bW1hcnlQYWdlIGV4dGVuZHMgUGFnZVdpdGhIZWFkaW4KICAg ICAgICAgdmFyIGVsZW1lbnQgPSBDb21wb25lbnRCYXNlLmNyZWF0ZUVsZW1lbnQ7CiAgICAgICAg IHZhciBsaW5rID0gQ29tcG9uZW50QmFzZS5jcmVhdGVMaW5rOwogICAgICAgICB2YXIgY29uZmln dXJhdGlvbkxpc3QgPSBjb25maWd1cmF0aW9uR3JvdXAuY29uZmlndXJhdGlvbkxpc3QoKTsKLQog ICAgICAgICB2YXIgcmF0aW9HcmFwaCA9IG5ldyBSYXRpb0JhckdyYXBoKCk7CiAKLSAgICAgICAg dmFyIHN0YXRlID0gQ2hhcnRzUGFnZS5jcmVhdGVTdGF0ZUZvckNvbmZpZ3VyYXRpb25MaXN0KGNv bmZpZ3VyYXRpb25MaXN0KTsKLQogICAgICAgICBpZiAoY29uZmlndXJhdGlvbkxpc3QubGVuZ3Ro ID09IDApIHsKICAgICAgICAgICAgIHRoaXMuX3JlbmRlclF1ZXVlLnB1c2goZnVuY3Rpb24gKCkg eyByYXRpb0dyYXBoLnJlbmRlcigpOyB9KTsKICAgICAgICAgICAgIHJldHVybiBlbGVtZW50KCd0 ZCcsIHJhdGlvR3JhcGgpOwogICAgICAgICB9CiAKLSAgICAgICAgdmFyIGNlbGwgPSBlbGVtZW50 KCd0ZCcpOwotICAgICAgICB2YXIgdXJsID0gdGhpcy5yb3V0ZXIoKS51cmwoJ2NoYXJ0cycsIHN0 YXRlKTsKLSAgICAgICAgdGhpcy5fcmVuZGVyUXVldWUucHVzaChmdW5jdGlvbiAoKSB7Ci0gICAg ICAgICAgICBpZiAoY29uZmlndXJhdGlvbkdyb3VwLmlzRmV0Y2hpbmcoKSkgewotICAgICAgICAg ICAgICAgIENvbXBvbmVudEJhc2UucmVuZGVyUmVwbGFjZShjZWxsLCBuZXcgU3Bpbm5lckljb24p OwotICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIH0KKyAgICAgICAgdmFyIHN0 YXRlID0gQ2hhcnRzUGFnZS5jcmVhdGVTdGF0ZUZvckNvbmZpZ3VyYXRpb25MaXN0KGNvbmZpZ3Vy YXRpb25MaXN0KTsKKyAgICAgICAgdmFyIGFuY2hvciA9IGxpbmsocmF0aW9HcmFwaCwgdGhpcy5y b3V0ZXIoKS51cmwoJ2NoYXJ0cycsIHN0YXRlKSk7CisgICAgICAgIHZhciBjZWxsID0gZWxlbWVu dCgndGQnLCBbYW5jaG9yLCBuZXcgU3Bpbm5lckljb25dKTsKIAotICAgICAgICAgICAgdmFyIHdh cm5pbmdzID0gY29uZmlndXJhdGlvbkdyb3VwLndhcm5pbmdzKCk7Ci0gICAgICAgICAgICB2YXIg d2FybmluZ1RleHQgPSAnJzsKLSAgICAgICAgICAgIGZvciAodmFyIHR5cGUgaW4gd2FybmluZ3Mp IHsKLSAgICAgICAgICAgICAgICB2YXIgcGxhdGZvcm1TdHJpbmcgPSBBcnJheS5mcm9tKHdhcm5p bmdzW3R5cGVdKS5tYXAoZnVuY3Rpb24gKHBsYXRmb3JtKSB7IHJldHVybiBwbGF0Zm9ybS5uYW1l KCk7IH0pLmpvaW4oJywgJyk7Ci0gICAgICAgICAgICAgICAgd2FybmluZ1RleHQgKz0gYE1pc3Np bmcgJHt0eXBlfSBmb3IgZm9sbG93aW5nIHBsYXRmb3JtKHMpOiAke3BsYXRmb3JtU3RyaW5nfWA7 Ci0gICAgICAgICAgICB9CisgICAgICAgIHRoaXMuX3JlbmRlclF1ZXVlLnB1c2godGhpcy5fcmVu ZGVyQ2VsbC5iaW5kKHRoaXMsIGNlbGwsIGFuY2hvciwgcmF0aW9HcmFwaCwgY29uZmlndXJhdGlv bkdyb3VwKSk7CisgICAgICAgIHJldHVybiBjZWxsOworICAgIH0KIAotICAgICAgICAgICAgQ29t cG9uZW50QmFzZS5yZW5kZXJSZXBsYWNlKGNlbGwsIGxpbmsocmF0aW9HcmFwaCwgd2FybmluZ1Rl eHQgfHwgJ09wZW4gY2hhcnRzJywgdXJsKSk7CisgICAgX3JlbmRlckNlbGwoY2VsbCwgYW5jaG9y LCByYXRpb0dyYXBoLCBjb25maWd1cmF0aW9uR3JvdXApCisgICAgeworICAgICAgICBpZiAoY29u ZmlndXJhdGlvbkdyb3VwLmlzRmV0Y2hpbmcoKSkKKyAgICAgICAgICAgIGNlbGwuY2xhc3NMaXN0 LmFkZCgnZmV0Y2hpbmcnKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgY2VsbC5jbGFzc0xp c3QucmVtb3ZlKCdmZXRjaGluZycpOwogCi0gICAgICAgICAgICByYXRpb0dyYXBoLnVwZGF0ZShj b25maWd1cmF0aW9uR3JvdXAucmF0aW8oKSwgY29uZmlndXJhdGlvbkdyb3VwLmxhYmVsKCksICEh d2FybmluZ1RleHQpOwotICAgICAgICAgICAgcmF0aW9HcmFwaC5yZW5kZXIoKTsKLSAgICAgICAg fSk7CisgICAgICAgIHZhciB3YXJuaW5nVGV4dCA9IHRoaXMuX3dhcm5pbmdUZXh0Rm9yR3JvdXAo Y29uZmlndXJhdGlvbkdyb3VwKTsKKyAgICAgICAgYW5jaG9yLnRpdGxlID0gd2FybmluZ1RleHQg fHwgJ09wZW4gY2hhcnRzJzsKKyAgICAgICAgcmF0aW9HcmFwaC51cGRhdGUoY29uZmlndXJhdGlv bkdyb3VwLnJhdGlvKCksIGNvbmZpZ3VyYXRpb25Hcm91cC5sYWJlbCgpLCAhIXdhcm5pbmdUZXh0 KTsKKyAgICAgICAgcmF0aW9HcmFwaC5yZW5kZXIoKTsKKyAgICB9CiAKLSAgICAgICAgcmV0dXJu IGNlbGw7CisgICAgX3dhcm5pbmdUZXh0Rm9yR3JvdXAoY29uZmlndXJhdGlvbkdyb3VwKQorICAg IHsKKyAgICAgICAgZnVuY3Rpb24gbWFwQW5kU29ydEJ5TmFtZShwbGF0Zm9ybXMpCisgICAgICAg IHsKKyAgICAgICAgICAgIHJldHVybiBwbGF0Zm9ybXMgJiYgcGxhdGZvcm1zLm1hcChmdW5jdGlv biAocGxhdGZvcm0pIHsgcmV0dXJuIHBsYXRmb3JtLm5hbWUoKTsgfSkuc29ydCgpOworICAgICAg ICB9CisKKyAgICAgICAgZnVuY3Rpb24gcGx1cmFsaXplSWZOZWVkZWQoc2luZ3VsYXJXb3JkLCBw bGF0Zm9ybXMpIHsgcmV0dXJuIHNpbmd1bGFyV29yZCArIChwbGF0Zm9ybXMubGVuZ3RoID4gMSA/ ICdzJyA6ICcnKTsgfQorCisgICAgICAgIHZhciB3YXJuaW5ncyA9IFtdOworCisgICAgICAgIHZh ciBtaXNzaW5nUGxhdGZvcm1zID0gbWFwQW5kU29ydEJ5TmFtZShjb25maWd1cmF0aW9uR3JvdXAu bWlzc2luZ1BsYXRmb3JtcygpKTsKKyAgICAgICAgaWYgKG1pc3NpbmdQbGF0Zm9ybXMpCisgICAg ICAgICAgICB3YXJuaW5ncy5wdXNoKGBNaXNzaW5nICR7cGx1cmFsaXplSWZOZWVkZWQoJ3BsYXRm b3JtJywgbWlzc2luZ1BsYXRmb3Jtcyl9OiAke21pc3NpbmdQbGF0Zm9ybXMuam9pbignLCAnKX1g KTsKKworICAgICAgICB2YXIgcGxhdGZvcm1zV2l0aG91dEJhc2VsaW5lcyA9IG1hcEFuZFNvcnRC eU5hbWUoY29uZmlndXJhdGlvbkdyb3VwLnBsYXRmb3Jtc1dpdGhvdXRCYXNlbGluZSgpKTsKKyAg ICAgICAgaWYgKHBsYXRmb3Jtc1dpdGhvdXRCYXNlbGluZXMpCisgICAgICAgICAgICB3YXJuaW5n cy5wdXNoKGBOZWVkICR7cGx1cmFsaXplSWZOZWVkZWQoJ2Jhc2VsaW5lJywgcGxhdGZvcm1zV2l0 aG91dEJhc2VsaW5lcyl9OiAke3BsYXRmb3Jtc1dpdGhvdXRCYXNlbGluZXMuam9pbignLCAnKX1g KTsKKworICAgICAgICByZXR1cm4gd2FybmluZ3MubGVuZ3RoID8gd2FybmluZ3Muam9pbignXG4n KSA6IG51bGw7CiAgICAgfQogCiAgICAgc3RhdGljIGh0bWxUZW1wbGF0ZSgpCkBAIC0xOTYsNiAr MjE3LDE0IEBAIGNsYXNzIFN1bW1hcnlQYWdlIGV4dGVuZHMgUGFnZVdpdGhIZWFkaW4KICAgICAg ICAgICAgICAgICBsZWZ0OiBjYWxjKDUwJSAtIDFyZW0pOwogICAgICAgICAgICAgICAgIHotaW5k ZXg6IDEwMDsKICAgICAgICAgICAgIH0KKworICAgICAgICAgICAgLnN1bW1hcnktdGFibGUgdGQu ZmV0Y2hpbmcgYSB7CisgICAgICAgICAgICAgICAgZGlzcGxheTogbm9uZTsKKyAgICAgICAgICAg IH0KKworICAgICAgICAgICAgLnN1bW1hcnktdGFibGUgdGQ6bm90KC5mZXRjaGluZykgc3Bpbm5l ci1pY29uIHsKKyAgICAgICAgICAgICAgICBkaXNwbGF5OiBub25lOworICAgICAgICAgICAgfQog ICAgICAgICBgOwogICAgIH0KIH0KQEAgLTIwOCwxMiArMjM3LDE0IEBAIGNsYXNzIFN1bW1hcnlQ YWdlQ29uZmlndXJhdGlvbkdyb3VwIHsKICAgICAgICAgdGhpcy5fc2V0VG9SYXRpbyA9IG5ldyBN YXA7CiAgICAgICAgIHRoaXMuX3JhdGlvID0gbnVsbDsKICAgICAgICAgdGhpcy5fbGFiZWwgPSBu dWxsOwotICAgICAgICB0aGlzLl93YXJuaW5ncyA9IHt9OworICAgICAgICB0aGlzLl9taXNzaW5n UGxhdGZvcm1zID0gbmV3IFNldDsKKyAgICAgICAgdGhpcy5fcGxhdGZvcm1zV2l0aG91dEJhc2Vs aW5lID0gbmV3IFNldDsKICAgICAgICAgdGhpcy5faXNGZXRjaGluZyA9IGZhbHNlOwogICAgICAg ICB0aGlzLl9zbWFsbGVySXNCZXR0ZXIgPSBtZXRyaWNzLmxlbmd0aCA/IG1ldHJpY3NbMF0uaXNT bWFsbGVyQmV0dGVyKCkgOiBudWxsOwogCiAgICAgICAgIGZvciAodmFyIHBsYXRmb3JtIG9mIHBs YXRmb3JtcykgewogICAgICAgICAgICAgY29uc29sZS5hc3NlcnQocGxhdGZvcm0gaW5zdGFuY2Vv ZiBQbGF0Zm9ybSk7CisgICAgICAgICAgICB2YXIgZm91bmRJblNvbWVNZXRyaWMgPSBmYWxzZTsK ICAgICAgICAgICAgIGZvciAodmFyIG1ldHJpYyBvZiBtZXRyaWNzKSB7CiAgICAgICAgICAgICAg ICAgY29uc29sZS5hc3NlcnQobWV0cmljIGluc3RhbmNlb2YgTWV0cmljKTsKICAgICAgICAgICAg ICAgICBjb25zb2xlLmFzc2VydCh0aGlzLl9zbWFsbGVySXNCZXR0ZXIgPT0gbWV0cmljLmlzU21h bGxlckJldHRlcigpKTsKQEAgLTIyMSwyMCArMjUyLDI0IEBAIGNsYXNzIFN1bW1hcnlQYWdlQ29u ZmlndXJhdGlvbkdyb3VwIHsKIAogICAgICAgICAgICAgICAgIGlmIChleGNsdWRlZENvbmZpZ3Vy YXRpb25zICYmIHBsYXRmb3JtLmlkKCkgaW4gZXhjbHVkZWRDb25maWd1cmF0aW9ucyAmJiBleGNs dWRlZENvbmZpZ3VyYXRpb25zW3BsYXRmb3JtLmlkKCldLmluY2x1ZGVzKCttZXRyaWMuaWQoKSkp CiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgICAgIGlmIChwbGF0 Zm9ybS5oYXNNZXRyaWMobWV0cmljKSkgewotICAgICAgICAgICAgICAgICAgICB0aGlzLl9tZWFz dXJlbWVudFNldHMucHVzaChNZWFzdXJlbWVudFNldC5maW5kU2V0KHBsYXRmb3JtLmlkKCksIG1l dHJpYy5pZCgpLCBwbGF0Zm9ybS5sYXN0TW9kaWZpZWQobWV0cmljKSkpOwotICAgICAgICAgICAg ICAgICAgICB0aGlzLl9jb25maWd1cmF0aW9uTGlzdC5wdXNoKFtwbGF0Zm9ybS5pZCgpLCBtZXRy aWMuaWQoKV0pOwotICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBpZiAoIXBsYXRm b3JtLmhhc01ldHJpYyhtZXRyaWMpKQorICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAg ICAgICAgICAgICAgICBmb3VuZEluU29tZU1ldHJpYyA9IHRydWU7CisgICAgICAgICAgICAgICAg dGhpcy5fbWVhc3VyZW1lbnRTZXRzLnB1c2goTWVhc3VyZW1lbnRTZXQuZmluZFNldChwbGF0Zm9y bS5pZCgpLCBtZXRyaWMuaWQoKSwgcGxhdGZvcm0ubGFzdE1vZGlmaWVkKG1ldHJpYykpKTsKKyAg ICAgICAgICAgICAgICB0aGlzLl9jb25maWd1cmF0aW9uTGlzdC5wdXNoKFtwbGF0Zm9ybS5pZCgp LCBtZXRyaWMuaWQoKV0pOwogICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYgKCFmb3VuZElu U29tZU1ldHJpYykKKyAgICAgICAgICAgICAgICB0aGlzLl9taXNzaW5nUGxhdGZvcm1zLmFkZChw bGF0Zm9ybSk7CiAgICAgICAgIH0KICAgICB9CiAKICAgICByYXRpbygpIHsgcmV0dXJuIHRoaXMu X3JhdGlvOyB9CiAgICAgbGFiZWwoKSB7IHJldHVybiB0aGlzLl9sYWJlbDsgfQotICAgIHdhcm5p bmdzKCkgeyByZXR1cm4gdGhpcy5fd2FybmluZ3M7IH0KICAgICBjaGFuZ2VUeXBlKCkgeyByZXR1 cm4gdGhpcy5fY2hhbmdlVHlwZTsgfQogICAgIGNvbmZpZ3VyYXRpb25MaXN0KCkgeyByZXR1cm4g dGhpcy5fY29uZmlndXJhdGlvbkxpc3Q7IH0KICAgICBpc0ZldGNoaW5nKCkgeyByZXR1cm4gdGhp cy5faXNGZXRjaGluZzsgfQorICAgIG1pc3NpbmdQbGF0Zm9ybXMoKSB7IHJldHVybiB0aGlzLl9t aXNzaW5nUGxhdGZvcm1zLnNpemUgPyBBcnJheS5mcm9tKHRoaXMuX21pc3NpbmdQbGF0Zm9ybXMp IDogbnVsbDsgfQorICAgIHBsYXRmb3Jtc1dpdGhvdXRCYXNlbGluZSgpIHsgcmV0dXJuIHRoaXMu X3BsYXRmb3Jtc1dpdGhvdXRCYXNlbGluZS5zaXplID8gQXJyYXkuZnJvbSh0aGlzLl9wbGF0Zm9y bXNXaXRob3V0QmFzZWxpbmUpIDogbnVsbDsgfQogCiAgICAgZmV0Y2hBbmRDb21wdXRlU3VtbWFy eSh0aW1lUmFuZ2UpCiAgICAgewpAQCAtMjk0LDE2ICszMjksMTAgQEAgY2xhc3MgU3VtbWFyeVBh Z2VDb25maWd1cmF0aW9uR3JvdXAgewogICAgICAgICAgICAgdmFyIGJhc2VsaW5lTWVkaWFuID0g U3VtbWFyeVBhZ2VDb25maWd1cmF0aW9uR3JvdXAuX21lZGlhbkZvclRpbWVSYW5nZShiYXNlbGlu ZVRpbWVTZXJpZXMsIHRpbWVSYW5nZSk7CiAgICAgICAgICAgICB2YXIgY3VycmVudE1lZGlhbiA9 IFN1bW1hcnlQYWdlQ29uZmlndXJhdGlvbkdyb3VwLl9tZWRpYW5Gb3JUaW1lUmFuZ2UoY3VycmVu dFRpbWVTZXJpZXMsIHRpbWVSYW5nZSk7CiAgICAgICAgICAgICB2YXIgcGxhdGZvcm0gPSBQbGF0 Zm9ybS5maW5kQnlJZChzZXQucGxhdGZvcm1JZCgpKTsKLSAgICAgICAgICAgIGlmICghYmFzZWxp bmVNZWRpYW4pIHsKLSAgICAgICAgICAgICAgICBpZighKCdiYXNlbGluZScgaW4gc2VsZi5fd2Fy bmluZ3MpKQotICAgICAgICAgICAgICAgICAgICBzZWxmLl93YXJuaW5nc1snYmFzZWxpbmUnXSA9 IG5ldyBTZXQ7Ci0gICAgICAgICAgICAgICAgc2VsZi5fd2FybmluZ3NbJ2Jhc2VsaW5lJ10uYWRk KHBsYXRmb3JtKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGlmICghY3VycmVudE1lZGlh bikgewotICAgICAgICAgICAgICAgIGlmKCEoJ2N1cnJlbnQnIGluIHNlbGYuX3dhcm5pbmdzKSkK LSAgICAgICAgICAgICAgICAgICAgc2VsZi5fd2FybmluZ3NbJ2N1cnJlbnQnXSA9IG5ldyBTZXQ7 Ci0gICAgICAgICAgICAgICAgc2VsZi5fd2FybmluZ3NbJ2N1cnJlbnQnXS5hZGQocGxhdGZvcm0p OwotICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYgKCFjdXJyZW50TWVkaWFuKQorICAgICAg ICAgICAgICAgIHNlbGYuX21pc3NpbmdQbGF0Zm9ybXMuYWRkKHBsYXRmb3JtKTsKKyAgICAgICAg ICAgIGVsc2UgaWYgKCFiYXNlbGluZU1lZGlhbikKKyAgICAgICAgICAgICAgICBzZWxmLl9wbGF0 Zm9ybXNXaXRob3V0QmFzZWxpbmUuYWRkKHBsYXRmb3JtKTsKIAogICAgICAgICAgICAgc2V0VG9S YXRpby5zZXQoc2V0LCBjdXJyZW50TWVkaWFuIC8gYmFzZWxpbmVNZWRpYW4pOwogICAgICAgICB9 KS5jYXRjaChmdW5jdGlvbiAoKSB7Cg==