170318 2017-03-30 17:37:38 -0700 sync-buildbot.js can schedule more than one build per builder 2017-03-30 19:33:47 -0700 1 1 1 Unclassified WebKit Perf Dashboard Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa cdumez rniwa saam oldest_to_newest 1293044 0 rniwa 2017-03-30 17:37:38 -0700 sync-buildbot.js can schedule more than one build per buildbot builder, which is highly undesirable for us. 1293071 1 305936 rniwa 2017-03-30 19:22:05 -0700 Created attachment 305936 Fixes the bug 1293072 2 305936 saam 2017-03-30 19:32:14 -0700 Comment on attachment 305936 Fixes the bug r=me 1293073 3 305936 rniwa 2017-03-30 19:33:45 -0700 Comment on attachment 305936 Fixes the bug Clearing flags on attachment: 305936 Committed r214652: <http://trac.webkit.org/changeset/214652> 1293074 4 rniwa 2017-03-30 19:33:47 -0700 All reviewed patches have been landed. Closing bug. 305936 2017-03-30 19:22:05 -0700 2017-03-30 19:33:45 -0700 Fixes the bug bug-170318-20170330192205.patch text/plain 10189 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0NjM0CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCAyMWM2Mzk5Yzc2OWY3ZDM2YzgxYzE5ZWM1OGJkZGUyM2ExNDljMGM4Li4zOWNkNmJkM2Mx NDVkZjVlNTcyNWNhYTExMjNmOWExYjZlYzgyNTA2IDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsNSArMSwzOSBAQAogMjAxNy0wMy0zMCAgUnlvc3VrZSBOaXdhICA8cm5pd2FA d2Via2l0Lm9yZz4KIAorICAgICAgICBzeW5jLWJ1aWxkYm90LmpzIGNhbiBzY2hlZHVsZSBtb3Jl IHRoYW4gb25lIGJ1aWxkIHBlciBidWlsZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNzAzMTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGUgYnVnIHdhcyBjYXVzZWQgYnkgX3NjaGVkdWxlTmV4dFJl cXVlc3RJbkdyb3VwSWZTbGF2ZUlzQXZhaWxhYmxlIG5vdCByZXR1cm5pbmcgYSBwcm9taXNlIHdo ZW4KKyAgICAgICAgc2NoZWR1bGluZyB0aGUgZmlyc3QgYnVpbGQgcmVxdWVzdCBvZiBhIHRlc3Qg Z3JvdXAuIFRoaXMgcmVzdWx0ZWQgaW4gX3B1bGxCdWlsZGJvdE9uQWxsU3luY2VycworICAgICAg ICB0byBwcmVtYXR1cmVseSByZXNvbHZlIGJlZm9yZSBQT1NUJ2luZyBuZXcgYnVpbGQgaGFkIGZp bmlzaGVkLiBUaGF0IGluIHR1cm4gY291bGQgcmVzdWx0IGluIHRoZQorICAgICAgICBuZXh0IGN5 Y2xlIG9mIHN5bmNpbmcgdG8gb2NjdXIgYmVmb3JlIFBPU1QnaW5nIGhhcyBhY3R1YWxseSB0YWtl biBwbGFjZS4KKworICAgICAgICBNb3JlIHByZWNpc2VseSwgd2hlbiB0aGUgbmV4dFJlcXVlc3Qg d2FzIHRoZSBmaXJzdCByZXF1ZXN0IG9yIGl0cyBhc3NvY2lhdGVkIHN5bmNlciBvYmplY3QgY291 bGQKKyAgICAgICAgbm90IGJlIGlkZW50aWZpZWQsIHdlIHdlcmUgc3VwcG9zZWQgdG8gZmluZCB0 aGUgZmlyc3QgYXZhaWxhYmxlIHN5bmNlciwgc2NoZWR1bGUgdGhlIHJlcXVlc3QsCisgICAgICAg IGFuZCB0aGVuIHJldHVybiB0aGUgcHJvbWlzZSByZXR1cm5lZCBieSBzY2hlZHVsZVJlcXVlc3RJ bkdyb3VwSWZBdmFpbGFibGUuIEhvd2V2ZXIsIHRoZSBmb3IgbG9vcAorICAgICAgICB3aGljaCBj YWxsZWQgc2NoZWR1bGVSZXF1ZXN0SW5Hcm91cElmQXZhaWxhYmxlIG9uIGV2ZXJ5IHN5bmNlciB3 YXMgZGVjbGFyaW5nIGl0cyBvd24gdmFyaWFibGUKKyAgICAgICAgbmFtZWQgInByb21pc2UiIHRo ZXJlYnkgc2hhZG93aW5nIHRoZSBvdXRlciB2YXJpYWJsZSwgd2hpY2ggaXMgcmV0dXJuZWQgdG8g dGhlIGNhbGxlci4KKworICAgICAgICBGaXhlZCB0aGUgYnVnIGJ5IG5vdCBkZWNsYXJpbmcgYSBz aGFkb3dpbmcgdmFyaWFibGUsIGFuZCByZWZhY3RvcmVkIHRoZSBjb2RlLiBOYW1lbHksIHRoZSBv bmx5CisgICAgICAgIHJlYXNvbiB3ZSBoYWQgc3VjaCBhIGNvbXBsaWNhdGVkIGxvZ2ljIHdpdGgg dHdvIGxvY2FsIHZhcmlhYmxlcywgcHJvbWlzZSBhbmQgc3luY2VyLCB3YXMgc28gdGhhdAorICAg ICAgICB3ZSBjb3VsZCBsb2cgdGhhdCB3ZSdyZSBzY2hlZHVsaW5nIGEgYnVpbGQuIEV4dHJhY3Rl ZCB0aGlzIGNvZGUgYXMgX3NjaGVkdWxlUmVxdWVzdFdpdGhMb2cuCisKKyAgICAgICAgX3NjaGVk dWxlTmV4dFJlcXVlc3RJbkdyb3VwSWZTbGF2ZUlzQXZhaWxhYmxlIGNhbiBub3cgc2ltcGx5IGV4 aXQgZWFybHkgd2l0aCBhIGNhbGwgdG8KKyAgICAgICAgX3NjaGVkdWxlUmVxdWVzdFdpdGhMb2cg d2hlbiB0aGUgc3luY2VyIGlzIHJlYWRpbHkgaWRlbnRpZmllZC4gV2hlbiBsb29waW5nIG92ZXIg c3luY2VycywgaXQgY2FuCisgICAgICAgIHNpbXBseSByZXR1cm4gdGhlIGZpcnN0IG5vbi1udWxs IHJlc3VsdCBvZiBfc2NoZWR1bGVOZXh0UmVxdWVzdEluR3JvdXBJZlNsYXZlSXNBdmFpbGFibGUu CisKKyAgICAgICAgKiBzZXJ2ZXItdGVzdHMvdG9vbHMtYnVpbGRib3QtdHJpZ2dlcmFibGUtdGVz dHMuanM6IEFkZGVkIGEgdGVzdCBjYXNlIHdoZXJlIHdlIHdhaXQgMTBtcyBhZnRlcgorICAgICAg ICByZWNlaXZpbmcgdGhlIHJlcXVlc3QgdG8gUE9TVCBhIGJ1aWxkLiBUaGVyZSBzaG91bGQgYmUg bm8gbmV3IG5ldHdvcmsgcmVxdWVzdCB1bnRpbCB3ZSByZXNvbHZlCisgICAgICAgIHRoaXMgcmVx dWVzdC4KKworICAgICAgICAqIHRvb2xzL2pzL2J1aWxkYm90LXRyaWdnZXJhYmxlLmpzOgorICAg ICAgICAoQnVpbGRib3RUcmlnZ2VyYWJsZS5wcm90b3R5cGUuX3NjaGVkdWxlTmV4dFJlcXVlc3RJ bkdyb3VwSWZTbGF2ZUlzQXZhaWxhYmxlKTogRml4ZWQgdGhlIGJ1Zy4KKyAgICAgICAgKEJ1aWxk Ym90VHJpZ2dlcmFibGUucHJvdG90eXBlLl9zY2hlZHVsZVJlcXVlc3RXaXRoTG9nKTogRXh0cmFj dGVkLgorCisyMDE3LTAzLTMwICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCiAg ICAgICAgIE1vZGVybml6ZSBCdWlsZGJvdFN5bmNlciBhbmQgQnVpbGRib3RUcmlnZ2VyYWJsZQog ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcwMzEwCiAK ZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9zZXJ2ZXItdGVzdHMvdG9vbHMt YnVpbGRib3QtdHJpZ2dlcmFibGUtdGVzdHMuanMgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcv c2VydmVyLXRlc3RzL3Rvb2xzLWJ1aWxkYm90LXRyaWdnZXJhYmxlLXRlc3RzLmpzCmluZGV4IGNh ZTBiZWZjOTY0ZjFkMmQyNTQ3ZWIwY2IyOWI1ZjE2YTVmMDNmODcuLjgxNGI5YWE3MTZjNzY1ZmM5 NzY0MGU5YmM3NTA3YTk4MTM1ZjE3NDUgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Via2l0 Lm9yZy9zZXJ2ZXItdGVzdHMvdG9vbHMtYnVpbGRib3QtdHJpZ2dlcmFibGUtdGVzdHMuanMKKysr IGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3NlcnZlci10ZXN0cy90b29scy1idWlsZGJvdC10 cmlnZ2VyYWJsZS10ZXN0cy5qcwpAQCAtNjEwLDYgKzYxMCw3NyBAQCBkZXNjcmliZSgnQnVpbGRi b3RUcmlnZ2VyYWJsZScsIGZ1bmN0aW9uICgpIHsKICAgICAgICAgICAgIH0pOwogICAgICAgICB9 KTsKIAorICAgICAgICBpdCgnc2hvdWxkIHdhaXQgZm9yIFBPU1QgdG8gY29tcGxldGUgYmVmb3Jl IHRyeWluZyB0byBwb2xsIGJ1aWxkYm90IGFnYWluJywgKCkgPT4geworICAgICAgICAgICAgY29u c3QgZGIgPSBUZXN0U2VydmVyLmRhdGFiYXNlKCk7CisgICAgICAgICAgICBjb25zdCByZXF1ZXN0 cyA9IE1vY2tSZW1vdGVBUEkucmVxdWVzdHM7CisgICAgICAgICAgICBsZXQgc3luY1Byb21pc2U7 CisgICAgICAgICAgICByZXR1cm4gUHJvbWlzZS5hbGwoWworICAgICAgICAgICAgICAgIE1vY2tE YXRhLmFkZE1vY2tEYXRhKGRiLCBbJ3BlbmRpbmcnLCAncGVuZGluZycsICdwZW5kaW5nJywgJ3Bl bmRpbmcnXSksCisgICAgICAgICAgICAgICAgTW9ja0RhdGEuYWRkQW5vdGhlck1vY2tUZXN0R3Jv dXAoZGIsIFsncGVuZGluZycsICdwZW5kaW5nJywgJ3BlbmRpbmcnLCAncGVuZGluZyddKQorICAg ICAgICAgICAgXSkudGhlbigoKSA9PiBNYW5pZmVzdC5mZXRjaCgpKS50aGVuKCgpID0+IHsKKyAg ICAgICAgICAgICAgICBjb25zdCBjb25maWcgPSBNb2NrRGF0YS5tb2NrVGVzdFN5bmNDb25maWdX aXRoU2luZ2xlQnVpbGRlcigpOworICAgICAgICAgICAgICAgIGNvbnN0IGxvZ2dlciA9IG5ldyBN b2NrTG9nZ2VyOworICAgICAgICAgICAgICAgIGNvbnN0IHNsYXZlSW5mbyA9IHtuYW1lOiAnc3lu Yy1zbGF2ZScsIHBhc3N3b3JkOiAncGFzc3dvcmQnfTsKKyAgICAgICAgICAgICAgICBjb25zdCB0 cmlnZ2VyYWJsZSA9IG5ldyBCdWlsZGJvdFRyaWdnZXJhYmxlKGNvbmZpZywgVGVzdFNlcnZlci5y ZW1vdGVBUEkoKSwgTW9ja1JlbW90ZUFQSSwgc2xhdmVJbmZvLCBsb2dnZXIpOworICAgICAgICAg ICAgICAgIHN5bmNQcm9taXNlID0gdHJpZ2dlcmFibGUuc3luY09uY2UoKTsKKyAgICAgICAgICAg ICAgICByZXR1cm4gTW9ja1JlbW90ZUFQSS53YWl0Rm9yUmVxdWVzdCgpOworICAgICAgICAgICAg fSkudGhlbigoKSA9PiB7CisgICAgICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKHJlcXVlc3RzLmxl bmd0aCwgMSk7CisgICAgICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKHJlcXVlc3RzWzBdLm1ldGhv ZCwgJ0dFVCcpOworICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChyZXF1ZXN0c1swXS51cmws ICcvanNvbi9idWlsZGVycy9zb21lLWJ1aWxkZXItMS9wZW5kaW5nQnVpbGRzJyk7CisgICAgICAg ICAgICAgICAgTW9ja1JlbW90ZUFQSS5yZXF1ZXN0c1swXS5yZXNvbHZlKFtdKTsKKyAgICAgICAg ICAgICAgICByZXR1cm4gTW9ja1JlbW90ZUFQSS53YWl0Rm9yUmVxdWVzdCgpOworICAgICAgICAg ICAgfSkudGhlbigoKSA9PiB7CisgICAgICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKHJlcXVlc3Rz Lmxlbmd0aCwgMik7CisgICAgICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKHJlcXVlc3RzWzFdLm1l dGhvZCwgJ0dFVCcpOworICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChyZXF1ZXN0c1sxXS51 cmwsICcvanNvbi9idWlsZGVycy9zb21lLWJ1aWxkZXItMS9idWlsZHMvP3NlbGVjdD0tMSZzZWxl Y3Q9LTInKTsKKyAgICAgICAgICAgICAgICByZXF1ZXN0c1sxXS5yZXNvbHZlKHt9KTsKKyAgICAg ICAgICAgICAgICByZXR1cm4gTW9ja1JlbW90ZUFQSS53YWl0Rm9yUmVxdWVzdCgpOworICAgICAg ICAgICAgfSkudGhlbigoKSA9PiB7CisgICAgICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKHJlcXVl c3RzLmxlbmd0aCwgMyk7CisgICAgICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKHJlcXVlc3RzWzJd Lm1ldGhvZCwgJ1BPU1QnKTsKKyAgICAgICAgICAgICAgICBhc3NlcnQuZXF1YWwocmVxdWVzdHNb Ml0udXJsLCAnL2J1aWxkZXJzL3NvbWUtYnVpbGRlci0xL2ZvcmNlJyk7CisgICAgICAgICAgICAg ICAgYXNzZXJ0LmRlZXBFcXVhbChyZXF1ZXN0c1syXS5kYXRhLCB7J3drJzogJzE5MTYyMicsICdv cyc6ICcxMC4xMSAxNUEyODQnLCAnYnVpbGQtcmVxdWVzdC1pZCc6ICc3MDAnfSk7CisgICAgICAg ICAgICAgICAgcmV0dXJuIG5ldyBQcm9taXNlKChyZXNvbHZlKSA9PiBzZXRUaW1lb3V0KHJlc29s dmUsIDEwKSk7CisgICAgICAgICAgICB9KS50aGVuKCgpID0+IHsKKyAgICAgICAgICAgICAgICBh c3NlcnQuZXF1YWwocmVxdWVzdHMubGVuZ3RoLCAzKTsKKyAgICAgICAgICAgICAgICByZXF1ZXN0 c1syXS5yZXNvbHZlKCdPSycpOworICAgICAgICAgICAgICAgIHJldHVybiBNb2NrUmVtb3RlQVBJ LndhaXRGb3JSZXF1ZXN0KCk7CisgICAgICAgICAgICB9KS50aGVuKCgpID0+IHsKKyAgICAgICAg ICAgICAgICBhc3NlcnQuZXF1YWwocmVxdWVzdHMubGVuZ3RoLCA0KTsKKyAgICAgICAgICAgICAg ICBhc3NlcnQuZXF1YWwocmVxdWVzdHNbM10ubWV0aG9kLCAnR0VUJyk7CisgICAgICAgICAgICAg ICAgYXNzZXJ0LmVxdWFsKHJlcXVlc3RzWzNdLnVybCwgJy9qc29uL2J1aWxkZXJzL3NvbWUtYnVp bGRlci0xL3BlbmRpbmdCdWlsZHMnKTsKKyAgICAgICAgICAgICAgICBNb2NrUmVtb3RlQVBJLnJl cXVlc3RzWzNdLnJlc29sdmUoW01vY2tEYXRhLnBlbmRpbmdCdWlsZCh7YnVpbGRSZXF1ZXN0SWQ6 IDcwMH0pXSk7CisgICAgICAgICAgICAgICAgcmV0dXJuIE1vY2tSZW1vdGVBUEkud2FpdEZvclJl cXVlc3QoKTsKKyAgICAgICAgICAgIH0pLnRoZW4oKCkgPT4geworICAgICAgICAgICAgICAgIGFz c2VydC5lcXVhbChyZXF1ZXN0cy5sZW5ndGgsIDUpOworICAgICAgICAgICAgICAgIGFzc2VydC5l cXVhbChyZXF1ZXN0c1s0XS5tZXRob2QsICdHRVQnKTsKKyAgICAgICAgICAgICAgICBhc3NlcnQu ZXF1YWwocmVxdWVzdHNbNF0udXJsLCAnL2pzb24vYnVpbGRlcnMvc29tZS1idWlsZGVyLTEvYnVp bGRzLz9zZWxlY3Q9LTEmc2VsZWN0PS0yJyk7CisgICAgICAgICAgICAgICAgcmVxdWVzdHNbNF0u cmVzb2x2ZSh7fSk7CisgICAgICAgICAgICAgICAgcmV0dXJuIHN5bmNQcm9taXNlOworICAgICAg ICAgICAgfSkudGhlbigoKSA9PiB7CisgICAgICAgICAgICAgICAgcmV0dXJuIEJ1aWxkUmVxdWVz dC5mZXRjaEZvclRyaWdnZXJhYmxlKE1vY2tEYXRhLm1vY2tUZXN0U3luY0NvbmZpZ1dpdGhUd29C dWlsZGVycygpLnRyaWdnZXJhYmxlTmFtZSk7CisgICAgICAgICAgICB9KS50aGVuKCgpID0+IHsK KyAgICAgICAgICAgICAgICBhc3NlcnQuZXF1YWwoQnVpbGRSZXF1ZXN0LmFsbCgpLmxlbmd0aCwg OCk7CisgICAgICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKEJ1aWxkUmVxdWVzdC5maW5kQnlJZCg3 MDApLnN0YXR1cygpLCAnc2NoZWR1bGVkJyk7CisgICAgICAgICAgICAgICAgYXNzZXJ0LmVxdWFs KEJ1aWxkUmVxdWVzdC5maW5kQnlJZCg3MDApLnN0YXR1c1VybCgpLCAnaHR0cDovL2J1aWxkLndl YmtpdC5vcmcvYnVpbGRlcnMvc29tZS1idWlsZGVyLTEvJyk7CisgICAgICAgICAgICAgICAgYXNz ZXJ0LmVxdWFsKEJ1aWxkUmVxdWVzdC5maW5kQnlJZCg3MDEpLnN0YXR1cygpLCAncGVuZGluZycp OworICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChCdWlsZFJlcXVlc3QuZmluZEJ5SWQoNzAx KS5zdGF0dXNVcmwoKSwgbnVsbCk7CisgICAgICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKEJ1aWxk UmVxdWVzdC5maW5kQnlJZCg3MDIpLnN0YXR1cygpLCAncGVuZGluZycpOworICAgICAgICAgICAg ICAgIGFzc2VydC5lcXVhbChCdWlsZFJlcXVlc3QuZmluZEJ5SWQoNzAyKS5zdGF0dXNVcmwoKSwg bnVsbCk7CisgICAgICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKEJ1aWxkUmVxdWVzdC5maW5kQnlJ ZCg3MDMpLnN0YXR1cygpLCAncGVuZGluZycpOworICAgICAgICAgICAgICAgIGFzc2VydC5lcXVh bChCdWlsZFJlcXVlc3QuZmluZEJ5SWQoNzAzKS5zdGF0dXNVcmwoKSwgbnVsbCk7CisgICAgICAg ICAgICAgICAgYXNzZXJ0LmVxdWFsKEJ1aWxkUmVxdWVzdC5maW5kQnlJZCg3MTApLnN0YXR1cygp LCAncGVuZGluZycpOworICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChCdWlsZFJlcXVlc3Qu ZmluZEJ5SWQoNzEwKS5zdGF0dXNVcmwoKSwgbnVsbCk7CisgICAgICAgICAgICAgICAgYXNzZXJ0 LmVxdWFsKEJ1aWxkUmVxdWVzdC5maW5kQnlJZCg3MTEpLnN0YXR1cygpLCAncGVuZGluZycpOwor ICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChCdWlsZFJlcXVlc3QuZmluZEJ5SWQoNzExKS5z dGF0dXNVcmwoKSwgbnVsbCk7CisgICAgICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKEJ1aWxkUmVx dWVzdC5maW5kQnlJZCg3MTIpLnN0YXR1cygpLCAncGVuZGluZycpOworICAgICAgICAgICAgICAg IGFzc2VydC5lcXVhbChCdWlsZFJlcXVlc3QuZmluZEJ5SWQoNzEyKS5zdGF0dXNVcmwoKSwgbnVs bCk7CisgICAgICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKEJ1aWxkUmVxdWVzdC5maW5kQnlJZCg3 MTMpLnN0YXR1cygpLCAncGVuZGluZycpOworICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChC dWlsZFJlcXVlc3QuZmluZEJ5SWQoNzEzKS5zdGF0dXNVcmwoKSwgbnVsbCk7CisgICAgICAgICAg ICB9KTsKKyAgICAgICAgfSk7CisKICAgICAgICAgaXQoJ3Nob3VsZCByZWNvdmVyIGZyb20gbXVs dGlwbGUgdGVzdCBncm91cHMgcnVubmluZyBzaW11bHRlbm91c2x5JywgKCkgPT4gewogICAgICAg ICAgICAgY29uc3QgZGIgPSBUZXN0U2VydmVyLmRhdGFiYXNlKCk7CiAgICAgICAgICAgICBsZXQg c3luY1Byb21pc2U7CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdG9vbHMv anMvYnVpbGRib3QtdHJpZ2dlcmFibGUuanMgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdG9v bHMvanMvYnVpbGRib3QtdHJpZ2dlcmFibGUuanMKaW5kZXggYzEyNzRkNjgxZTQwNTA3YTA5ZWZi NzAwYjQ5OGIyNzIwZTY3MjdlNy4uNWQ5ZjdlNjY4MDI3NzFmZTY3OTVkODhmZTM2N2JlOGVmYzU0 NzNiZSAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3Rvb2xzL2pzL2J1aWxk Ym90LXRyaWdnZXJhYmxlLmpzCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy90b29scy9q cy9idWlsZGJvdC10cmlnZ2VyYWJsZS5qcwpAQCAtMTQzLDMyICsxNDMsMjggQEAgY2xhc3MgQnVp bGRib3RUcmlnZ2VyYWJsZSB7CiAgICAgICAgIGlmICghbmV4dFJlcXVlc3QpCiAgICAgICAgICAg ICByZXR1cm4gbnVsbDsKIAotICAgICAgICBsZXQgcHJvbWlzZTsKLSAgICAgICAgbGV0IHN5bmNl cjsKICAgICAgICAgaWYgKCEhbmV4dFJlcXVlc3Qub3JkZXIoKSkgewotICAgICAgICAgICAgc3lu Y2VyID0gZ3JvdXBJbmZvLnN5bmNlcjsKLSAgICAgICAgICAgIGlmICghc3luY2VyKQotICAgICAg ICAgICAgICAgIHRoaXMuX2xvZ2dlci5lcnJvcihgQ291bGQgbm90IGlkZW50aWZ5IHRoZSBzeW5j ZXIgZm9yICR7bmV4dFJlcXVlc3QuaWQoKX0uYCk7Ci0gICAgICAgICAgICBlbHNlCi0gICAgICAg ICAgICAgICAgcHJvbWlzZSA9IHN5bmNlci5zY2hlZHVsZVJlcXVlc3RJbkdyb3VwSWZBdmFpbGFi bGUobmV4dFJlcXVlc3QsIGdyb3VwSW5mby5zbGF2ZU5hbWUpOworICAgICAgICAgICAgY29uc3Qg c3luY2VyID0gZ3JvdXBJbmZvLnN5bmNlcjsKKyAgICAgICAgICAgIGlmIChzeW5jZXIpCisgICAg ICAgICAgICAgICAgcmV0dXJuIHRoaXMuX3NjaGVkdWxlUmVxdWVzdFdpdGhMb2coc3luY2VyLCBu ZXh0UmVxdWVzdCwgZ3JvdXBJbmZvLnNsYXZlTmFtZSk7CisgICAgICAgICAgICB0aGlzLl9sb2dn ZXIuZXJyb3IoYENvdWxkIG5vdCBpZGVudGlmeSB0aGUgc3luY2VyIGZvciAke25leHRSZXF1ZXN0 LmlkKCl9LmApOwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKCFzeW5jZXIpIHsKLSAgICAgICAg ICAgIGZvciAoc3luY2VyIG9mIHRoaXMuX3N5bmNlcnMpIHsKLSAgICAgICAgICAgICAgICAvLyBG SVhNRTogVGhpcyBzaG91bGRuJ3QgYmUgYSBuZXcgdmFyaWFibGUuCi0gICAgICAgICAgICAgICAg bGV0IHByb21pc2UgPSBzeW5jZXIuc2NoZWR1bGVSZXF1ZXN0SW5Hcm91cElmQXZhaWxhYmxlKG5l eHRSZXF1ZXN0KTsKLSAgICAgICAgICAgICAgICBpZiAocHJvbWlzZSkKLSAgICAgICAgICAgICAg ICAgICAgYnJlYWs7Ci0gICAgICAgICAgICB9CisgICAgICAgIGZvciAoY29uc3Qgc3luY2VyIG9m IHRoaXMuX3N5bmNlcnMpIHsKKyAgICAgICAgICAgIGNvbnN0IHByb21pc2UgPSB0aGlzLl9zY2hl ZHVsZVJlcXVlc3RXaXRoTG9nKHN5bmNlciwgbmV4dFJlcXVlc3QsIG51bGwpOworICAgICAgICAg ICAgaWYgKHByb21pc2UpCisgICAgICAgICAgICAgICAgcmV0dXJuIHByb21pc2U7CiAgICAgICAg IH0KKyAgICAgICAgcmV0dXJuIG51bGw7CisgICAgfQogCi0gICAgICAgIGlmIChwcm9taXNlKSB7 Ci0gICAgICAgICAgICBsZXQgc2xhdmVOYW1lID0gZ3JvdXBJbmZvLnNsYXZlTmFtZSA/IGAgb24g JHtncm91cEluZm8uc2xhdmVOYW1lfWAgOiAnJzsKLSAgICAgICAgICAgIHRoaXMuX2xvZ2dlci5s b2coYFNjaGVkdWxpbmcgYnVpbGQgcmVxdWVzdCAke25leHRSZXF1ZXN0LmlkKCl9JHtzbGF2ZU5h bWV9IGluICR7c3luY2VyLmJ1aWxkZXJOYW1lKCl9YCk7CisgICAgX3NjaGVkdWxlUmVxdWVzdFdp dGhMb2coc3luY2VyLCByZXF1ZXN0LCBzbGF2ZU5hbWUpCisgICAgeworICAgICAgICBjb25zdCBw cm9taXNlID0gc3luY2VyLnNjaGVkdWxlUmVxdWVzdEluR3JvdXBJZkF2YWlsYWJsZShyZXF1ZXN0 LCBzbGF2ZU5hbWUpOworICAgICAgICBpZiAoIXByb21pc2UpCiAgICAgICAgICAgICByZXR1cm4g cHJvbWlzZTsKLSAgICAgICAgfQotCi0gICAgICAgIHJldHVybiBudWxsOworICAgICAgICB0aGlz Ll9sb2dnZXIubG9nKGBTY2hlZHVsaW5nIGJ1aWxkIHJlcXVlc3QgJHtyZXF1ZXN0LmlkKCl9JHtz bGF2ZU5hbWUgPyAnIG9uICcgKyBzbGF2ZU5hbWUgOiAnJ30gaW4gJHtzeW5jZXIuYnVpbGRlck5h bWUoKX1gKTsKKyAgICAgICAgcmV0dXJuIHByb21pc2U7CiAgICAgfQogCiAgICAgc3RhdGljIF90 ZXN0R3JvdXBNYXBGb3JCdWlsZFJlcXVlc3RzKGJ1aWxkUmVxdWVzdHMpCg==