182207 2018-01-26 21:01:10 -0800 CommitLogViewer should not fetch commits in serial 2018-01-29 12:28:28 -0800 1 1 1 Unclassified WebKit Perf Dashboard WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rniwa rniwa cdumez dewei_zhu koivisto rniwa webkit-bug-importer oldest_to_newest 1393802 0 rniwa 2018-01-26 21:01:10 -0800 Right now, CommitLogViewer fetches commits for a range and the preceding commit serialized. We should fetch them at the same time. 1393803 1 332452 rniwa 2018-01-26 21:08:44 -0800 Created attachment 332452 Fixes the bug 1394203 2 332452 cdumez 2018-01-29 11:58:36 -0800 Comment on attachment 332452 Fixes the bug rs=me 1394211 3 rniwa 2018-01-29 12:27:58 -0800 Committed r227746: <https://trac.webkit.org/changeset/227746> 1394212 4 webkit-bug-importer 2018-01-29 12:28:28 -0800 <rdar://problem/36997027> 332452 2018-01-26 21:08:44 -0800 2018-01-29 11:58:36 -0800 Fixes the bug bug-182207-20180126210844.patch text/plain 9819 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMjI3NzEwCmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCAwZGZmYzI3YzdkZmI0MWJjZjNjNTM0YWUyNzdjNWVhMzFkNDQxNTM3Li40NmQxODcwMTE5 YTA4YTU4ZDgwNDNjMjAxMTM0MGMyZTcyODNmNDkyIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxOC0wMS0yNiAgUnlvc3VrZSBOaXdhICA8cm5pd2FA d2Via2l0Lm9yZz4KKworICAgICAgICBDb21taXRMb2dWaWV3ZXIgc2hvdWxkIG5vdCBmZXRjaCBj b21taXRzIGluIHNlcmlhbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTgyMjA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgRmV0Y2ggYm90aCB0aGUgY29tbWl0cyBpbiB0aGUgcmFuZ2UgYXMgd2VsbCBhcyB0 aGUgcHJlY2VkaW5nIGNvbW1pdCBhdCBvbmNlIGluc3RlYWQgb2YKKyAgICAgICAgZmV0Y2hpbmcg dGhlIHByZWNlZGluZyBjb21taXQgb25seSBhZnRlciB0aGUgY29tbWl0cyBpbiB0aGUgcmFuZ2Ug aGFkIGJlZW4gZmV0Y2hlZC4KKworICAgICAgICAqIGJyb3dzZXItdGVzdHMvY29tbWl0LWxvZy12 aWV3ZXItdGVzdHMuanM6IEZpeGVkIHRoZSB0Y29lc3QgY2FzZSBhZnRlciByMjI0MjI3LgorICAg ICAgICAqIHB1YmxpYy92My9jb21wb25lbnRzL2NvbW1pdC1sb2ctdmlld2VyLmpzOgorICAgICAg ICAoQ29tbWl0TG9nVmlld2VyLnByb3RvdHlwZS5fZmV0Y2hDb21taXRMb2dzKTogRmV0Y2ggY29t bWl0cyBpbiBwYXJhbGxlbC4KKwogMjAxOC0wMS0yNCAgRGV3ZWkgWmh1ICA8ZGV3ZWlfemh1QGFw cGxlLmNvbT4KIAogICAgICAgICBDaGVjayBleGlzdGVuY2Ugb2YgJ25vZGVfbW9kdWxlc19kaXIn IGJlZm9yZSBjcmVhdGluZyBpdC4KZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9y Zy9icm93c2VyLXRlc3RzL2NvbW1pdC1sb2ctdmlld2VyLXRlc3RzLmpzIGIvV2Vic2l0ZXMvcGVy Zi53ZWJraXQub3JnL2Jyb3dzZXItdGVzdHMvY29tbWl0LWxvZy12aWV3ZXItdGVzdHMuanMKaW5k ZXggMGM2YjM0MTVlNTJlZDgwOGZhZTYxMzI1ZWIwZjg2Y2Y4OTliYTQ3My4uZWE5NTY4OGM4YTJj MjNiNDlkMGY3YmNmZDAxZDk4YTU1MjM0YTllNSAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvcGVyZi53 ZWJraXQub3JnL2Jyb3dzZXItdGVzdHMvY29tbWl0LWxvZy12aWV3ZXItdGVzdHMuanMKKysrIGIv V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL2Jyb3dzZXItdGVzdHMvY29tbWl0LWxvZy12aWV3ZXIt dGVzdHMuanMKQEAgLTE4LDYgKzE4LDE4IEBAIGRlc2NyaWJlKCdDb21taXRMb2dWaWV3ZXInLCAo KSA9PiB7CiAgICAgICAgIH0pOwogICAgIH0KIAorICAgIGNvbnN0IHdlYmtpdENvbW1pdDIxMDk0 OCA9IHsKKyAgICAgICAgImlkIjogIjE4NTMyNiIsCisgICAgICAgICJyZXZpc2lvbiI6ICIyMTA5 NDgiLAorICAgICAgICAicmVwb3NpdG9yeSI6IDEsCisgICAgICAgICJwcmV2aW91c0NvbW1pdCI6 IG51bGwsCisgICAgICAgICJvd25zQ29tbWl0cyI6IGZhbHNlLAorICAgICAgICAidGltZSI6ICtu ZXcgRGF0ZSgiMjAxNy0wMS0yMCAwMjo1MjozNC41NzdaIiksCisgICAgICAgICJhdXRob3JOYW1l IjogIlphbGFuIEJ1anRhcyIsCisgICAgICAgICJhdXRob3JFbWFpbCI6ICJ6YWxhbkBhcHBsZS5j b20iLAorICAgICAgICAibWVzc2FnZSI6ICJhIG1lc3NhZ2UiLAorICAgIH07CisKICAgICBjb25z dCB3ZWJraXRDb21taXQyMTA5NDkgPSB7CiAgICAgICAgICJpZCI6ICIxODUzMzQiLAogICAgICAg ICAicmV2aXNpb24iOiAiMjEwOTQ5IiwKQEAgLTg2LDcgKzk4LDcgQEAgZGVzY3JpYmUoJ0NvbW1p dExvZ1ZpZXdlcicsICgpID0+IHsKIAogICAgIGl0KCdzaG91bGQgc2hvdyB0aGUgcmVwb3NpdG9y eSBuYW1lLCB0aGUgbGlzdCBvZiBjb21taXRzLCBhbmQgaGlkZSB0aGUgc3Bpbm5lciBvbmNlIHRo ZSBsaXN0IG9mIGNvbW1pdHMgYXJlIGZldGNoZWQnLCAoKSA9PiB7CiAgICAgICAgIGNvbnN0IGNv bnRleHQgPSBuZXcgQnJvd3NpbmdDb250ZXh0KCk7Ci0gICAgICAgIHJldHVybiBpbXBvcnRDb21t aXRMb2dWaWV3ZXIoY29udGV4dCkudGhlbigoQ29tbWl0TG9nVmlld2VyKSA9PiB7CisgICAgICAg IHJldHVybiBpbXBvcnRDb21taXRMb2dWaWV3ZXIoY29udGV4dCkudGhlbihhc3luYyAoQ29tbWl0 TG9nVmlld2VyKSA9PiB7CiAgICAgICAgICAgICBjb25zdCBSZXBvc2l0b3J5ID0gY29udGV4dC5z eW1ib2xzLlJlcG9zaXRvcnk7CiAgICAgICAgICAgICBjb25zdCBTcGlubmVySWNvbiA9IGNvbnRl eHQuc3ltYm9scy5TcGlubmVySWNvbjsKICAgICAgICAgICAgIGNvbnN0IENvbXBvbmVudEJhc2Ug PSBjb250ZXh0LnN5bWJvbHMuQ29tcG9uZW50QmFzZTsKQEAgLTk0LDMzICsxMDYsNDAgQEAgZGVz Y3JpYmUoJ0NvbW1pdExvZ1ZpZXdlcicsICgpID0+IHsKICAgICAgICAgICAgIGNvbnN0IHZpZXdl ciA9IG5ldyBDb21taXRMb2dWaWV3ZXI7CiAgICAgICAgICAgICBjb25zdCB3ZWJraXQgPSBuZXcg UmVwb3NpdG9yeSgxLCB7bmFtZTogJ1dlYktpdCd9KTsKICAgICAgICAgICAgIGNvbnRleHQuZG9j dW1lbnQuYm9keS5hcHBlbmRDaGlsZCh2aWV3ZXIuZWxlbWVudCgpKTsKKwogICAgICAgICAgICAg dmlld2VyLmVucXVldWVUb1JlbmRlcigpOwotICAgICAgICAgICAgcmV0dXJuIHdhaXRGb3JDb21w b25lbnRzVG9SZW5kZXIoY29udGV4dCkudGhlbigoKSA9PiB7Ci0gICAgICAgICAgICAgICAgdmll d2VyLnZpZXcod2Via2l0LCAnMjEwOTQ4JywgJzIxMDk1MCcpOwotICAgICAgICAgICAgICAgIHJl dHVybiB3YWl0Rm9yQ29tcG9uZW50c1RvUmVuZGVyKGNvbnRleHQpOwotICAgICAgICAgICAgfSku dGhlbigoKSA9PiB7Ci0gICAgICAgICAgICAgICAgZXhwZWN0KHZpZXdlci5jb250ZW50KCdzcGlu bmVyLWNvbnRhaW5lcicpLm9mZnNldEhlaWdodCkudG8ubm90LmJlKDApOwotICAgICAgICAgICAg ICAgIGV4cGVjdCh2aWV3ZXIuY29udGVudCgnY29tbWl0cy1saXN0JykubWF0Y2hlcygnOmVtcHR5 JykpLnRvLmJlKHRydWUpOwotICAgICAgICAgICAgICAgIGV4cGVjdCh2aWV3ZXIuY29udGVudCgn cmVwb3NpdG9yeS1uYW1lJykubWF0Y2hlcygnOmVtcHR5JykpLnRvLmJlKGZhbHNlKTsKLSAgICAg ICAgICAgICAgICBleHBlY3Qodmlld2VyLmNvbnRlbnQoJ3JlcG9zaXRvcnktbmFtZScpLnRleHRD b250ZW50KS50by5jb250YWluKCdXZWJLaXQnKTsKLSAgICAgICAgICAgICAgICBleHBlY3QocmVx dWVzdHMubGVuZ3RoKS50by5iZSgxKTsKLSAgICAgICAgICAgICAgICBleHBlY3QocmVxdWVzdHNb MF0udXJsKS50by5iZSgnL2FwaS9jb21taXRzLzEvP3ByZWNlZGluZ1JldmlzaW9uPTIxMDk0OCZs YXN0UmV2aXNpb249MjEwOTUwJyk7Ci0gICAgICAgICAgICAgICAgcmVxdWVzdHNbMF0ucmVzb2x2 ZSh7Ci0gICAgICAgICAgICAgICAgICAgICJzdGF0dXMiOiAiT0siLAotICAgICAgICAgICAgICAg ICAgICAiY29tbWl0cyI6IFt3ZWJraXRDb21taXQyMTA5NDksIHdlYmtpdENvbW1pdDIxMDk1MF0s Ci0gICAgICAgICAgICAgICAgfSk7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIHdhaXRGb3JDb21w b25lbnRzVG9SZW5kZXIoY29udGV4dCk7Ci0gICAgICAgICAgICB9KS50aGVuKCgpID0+IHsKLSAg ICAgICAgICAgICAgICBleHBlY3Qodmlld2VyLmNvbnRlbnQoJ3NwaW5uZXItY29udGFpbmVyJyku b2Zmc2V0SGVpZ2h0KS50by5iZSgwKTsKLSAgICAgICAgICAgICAgICBleHBlY3Qodmlld2VyLmNv bnRlbnQoJ2NvbW1pdHMtbGlzdCcpLm1hdGNoZXMoJzplbXB0eScpKS50by5iZShmYWxzZSk7Ci0g ICAgICAgICAgICAgICAgZXhwZWN0KHZpZXdlci5jb250ZW50KCdjb21taXRzLWxpc3QnKS50ZXh0 Q29udGVudCkudG8uY29udGFpbigncjIxMDk0OScpOwotICAgICAgICAgICAgICAgIGV4cGVjdCh2 aWV3ZXIuY29udGVudCgnY29tbWl0cy1saXN0JykudGV4dENvbnRlbnQpLnRvLmNvbnRhaW4oJ0No cmlzIER1bWV6Jyk7Ci0gICAgICAgICAgICAgICAgZXhwZWN0KHZpZXdlci5jb250ZW50KCdjb21t aXRzLWxpc3QnKS50ZXh0Q29udGVudCkudG8uY29udGFpbigncjIxMDk1MCcpOwotICAgICAgICAg ICAgICAgIGV4cGVjdCh2aWV3ZXIuY29udGVudCgnY29tbWl0cy1saXN0JykudGV4dENvbnRlbnQp LnRvLmNvbnRhaW4oJ0NvbW1pdCBRdWV1ZScpOwotICAgICAgICAgICAgICAgIGV4cGVjdCh2aWV3 ZXIuY29udGVudCgncmVwb3NpdG9yeS1uYW1lJykubWF0Y2hlcygnOmVtcHR5JykpLnRvLmJlKGZh bHNlKTsKLSAgICAgICAgICAgICAgICBleHBlY3Qodmlld2VyLmNvbnRlbnQoJ3JlcG9zaXRvcnkt bmFtZScpLnRleHRDb250ZW50KS50by5jb250YWluKCdXZWJLaXQnKTsKLSAgICAgICAgICAgICAg ICBleHBlY3Qodmlld2VyLmNvbnRlbnQoJ2NvbW1pdHMtbGlzdCcpLnF1ZXJ5U2VsZWN0b3IoJ2En KSkudG8uYmUobnVsbCk7CisgICAgICAgICAgICBhd2FpdCB3YWl0Rm9yQ29tcG9uZW50c1RvUmVu ZGVyKGNvbnRleHQpOworCisgICAgICAgICAgICB2aWV3ZXIudmlldyh3ZWJraXQsICcyMTA5NDgn LCAnMjEwOTUwJyk7CisgICAgICAgICAgICBhd2FpdCB3YWl0Rm9yQ29tcG9uZW50c1RvUmVuZGVy KGNvbnRleHQpOworCisgICAgICAgICAgICBleHBlY3Qodmlld2VyLmNvbnRlbnQoJ3NwaW5uZXIt Y29udGFpbmVyJykub2Zmc2V0SGVpZ2h0KS50by5ub3QuYmUoMCk7CisgICAgICAgICAgICBleHBl Y3Qodmlld2VyLmNvbnRlbnQoJ2NvbW1pdHMtbGlzdCcpLm1hdGNoZXMoJzplbXB0eScpKS50by5i ZSh0cnVlKTsKKyAgICAgICAgICAgIGV4cGVjdCh2aWV3ZXIuY29udGVudCgncmVwb3NpdG9yeS1u YW1lJykubWF0Y2hlcygnOmVtcHR5JykpLnRvLmJlKGZhbHNlKTsKKyAgICAgICAgICAgIGV4cGVj dCh2aWV3ZXIuY29udGVudCgncmVwb3NpdG9yeS1uYW1lJykudGV4dENvbnRlbnQpLnRvLmNvbnRh aW4oJ1dlYktpdCcpOworICAgICAgICAgICAgZXhwZWN0KHJlcXVlc3RzLmxlbmd0aCkudG8uYmUo Mik7CisgICAgICAgICAgICBleHBlY3QocmVxdWVzdHNbMF0udXJsKS50by5iZSgnL2FwaS9jb21t aXRzLzEvP3ByZWNlZGluZ1JldmlzaW9uPTIxMDk0OCZsYXN0UmV2aXNpb249MjEwOTUwJyk7Cisg ICAgICAgICAgICBleHBlY3QocmVxdWVzdHNbMV0udXJsKS50by5iZSgnL2FwaS9jb21taXRzLzEv MjEwOTQ4Jyk7CisgICAgICAgICAgICByZXF1ZXN0c1swXS5yZXNvbHZlKHsKKyAgICAgICAgICAg ICAgICAic3RhdHVzIjogIk9LIiwKKyAgICAgICAgICAgICAgICAiY29tbWl0cyI6IFt3ZWJraXRD b21taXQyMTA5NDksIHdlYmtpdENvbW1pdDIxMDk1MF0sCiAgICAgICAgICAgICB9KTsKKyAgICAg ICAgICAgIHJlcXVlc3RzWzFdLnJlc29sdmUoeworICAgICAgICAgICAgICAgICJzdGF0dXMiOiAi T0siLAorICAgICAgICAgICAgICAgICJjb21taXRzIjogW3dlYmtpdENvbW1pdDIxMDk0OF0sCisg ICAgICAgICAgICB9KTsKKworICAgICAgICAgICAgYXdhaXQgd2FpdEZvckNvbXBvbmVudHNUb1Jl bmRlcihjb250ZXh0KTsKKworICAgICAgICAgICAgZXhwZWN0KHZpZXdlci5jb250ZW50KCdzcGlu bmVyLWNvbnRhaW5lcicpLm9mZnNldEhlaWdodCkudG8uYmUoMCk7CisgICAgICAgICAgICBleHBl Y3Qodmlld2VyLmNvbnRlbnQoJ2NvbW1pdHMtbGlzdCcpLm1hdGNoZXMoJzplbXB0eScpKS50by5i ZShmYWxzZSk7CisgICAgICAgICAgICBleHBlY3Qodmlld2VyLmNvbnRlbnQoJ2NvbW1pdHMtbGlz dCcpLnRleHRDb250ZW50KS50by5jb250YWluKCdyMjEwOTQ5Jyk7CisgICAgICAgICAgICBleHBl Y3Qodmlld2VyLmNvbnRlbnQoJ2NvbW1pdHMtbGlzdCcpLnRleHRDb250ZW50KS50by5jb250YWlu KCdDaHJpcyBEdW1leicpOworICAgICAgICAgICAgZXhwZWN0KHZpZXdlci5jb250ZW50KCdjb21t aXRzLWxpc3QnKS50ZXh0Q29udGVudCkudG8uY29udGFpbigncjIxMDk1MCcpOworICAgICAgICAg ICAgZXhwZWN0KHZpZXdlci5jb250ZW50KCdjb21taXRzLWxpc3QnKS50ZXh0Q29udGVudCkudG8u Y29udGFpbignQ29tbWl0IFF1ZXVlJyk7CisgICAgICAgICAgICBleHBlY3Qodmlld2VyLmNvbnRl bnQoJ3JlcG9zaXRvcnktbmFtZScpLm1hdGNoZXMoJzplbXB0eScpKS50by5iZShmYWxzZSk7Cisg ICAgICAgICAgICBleHBlY3Qodmlld2VyLmNvbnRlbnQoJ3JlcG9zaXRvcnktbmFtZScpLnRleHRD b250ZW50KS50by5jb250YWluKCdXZWJLaXQnKTsKKyAgICAgICAgICAgIGV4cGVjdCh2aWV3ZXIu Y29udGVudCgnY29tbWl0cy1saXN0JykucXVlcnlTZWxlY3RvcignYScpKS50by5iZShudWxsKTsK ICAgICAgICAgfSk7CiAgICAgfSk7CiAKZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYud2Via2l0 Lm9yZy9wdWJsaWMvdjMvY29tcG9uZW50cy9jb21taXQtbG9nLXZpZXdlci5qcyBiL1dlYnNpdGVz L3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvY29tcG9uZW50cy9jb21taXQtbG9nLXZpZXdlci5q cwppbmRleCBjYzIwYzI2ODUwNjYyNTk0OTgxZjk4ODY1ZGRiMjdiNmY0ZGRiYjk2Li4wMDViNTUy ZmE1NmI2ZGFjZDNkOTBmYjM2M2JmOWVhMzI2MmIwYjdiIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9w ZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL2NvbXBvbmVudHMvY29tbWl0LWxvZy12aWV3ZXIuanMK KysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9jb21wb25lbnRzL2NvbW1p dC1sb2ctdmlld2VyLmpzCkBAIC0zNiwxMSArMzYsMjkgQEAgY2xhc3MgQ29tbWl0TG9nVmlld2Vy IGV4dGVuZHMgQ29tcG9uZW50QmFzZSB7CiAgICAgICAgIH0KIAogICAgICAgICBsZXQgcHJvbWlz ZTsKKyAgICAgICAgbGV0IHByZWNlZGluZ0NvbW1pdFByb21pc2U7CiAgICAgICAgIGNvbnN0IGZl dGNoU2luZ2xlQ29tbWl0ID0gIXByZWNlZGluZ1JldmlzaW9uIHx8IHByZWNlZGluZ1JldmlzaW9u ID09IGxhc3RSZXZpc2lvbjsKLSAgICAgICAgaWYgKGZldGNoU2luZ2xlQ29tbWl0KQotICAgICAg ICAgICAgcHJvbWlzZSA9IENvbW1pdExvZy5mZXRjaEZvclNpbmdsZVJldmlzaW9uKHJlcG9zaXRv cnksIGxhc3RSZXZpc2lvbik7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIHByb21pc2UgPSBD b21taXRMb2cuZmV0Y2hCZXR3ZWVuUmV2aXNpb25zKHJlcG9zaXRvcnksIHByZWNlZGluZ1Jldmlz aW9uLCBsYXN0UmV2aXNpb24pOworICAgICAgICBpZiAoZmV0Y2hTaW5nbGVDb21taXQpIHsKKyAg ICAgICAgICAgIHByb21pc2UgPSBDb21taXRMb2cuZmV0Y2hGb3JTaW5nbGVSZXZpc2lvbihyZXBv c2l0b3J5LCBsYXN0UmV2aXNpb24pLnRoZW4oKGNvbW1pdHMpID0+IHsKKyAgICAgICAgICAgICAg ICBpZiAodGhpcy5fZmV0Y2hpbmdQcm9taXNlICE9IHByb21pc2UpCisgICAgICAgICAgICAgICAg ICAgIHJldHVybjsKKyAgICAgICAgICAgICAgICB0aGlzLl9jb21taXRzID0gY29tbWl0czsKKyAg ICAgICAgICAgICAgICB0aGlzLl9wcmVjZWRpbmdDb21taXQgPSBudWxsOworICAgICAgICAgICAg fSk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBwcm9taXNlID0gUHJvbWlzZS5hbGwo WworICAgICAgICAgICAgICAgIENvbW1pdExvZy5mZXRjaEJldHdlZW5SZXZpc2lvbnMocmVwb3Np dG9yeSwgcHJlY2VkaW5nUmV2aXNpb24sIGxhc3RSZXZpc2lvbikudGhlbigoY29tbWl0cykgPT4g eworICAgICAgICAgICAgICAgICAgICBpZiAodGhpcy5fZmV0Y2hpbmdQcm9taXNlICE9IHByb21p c2UpCisgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgICAg IHRoaXMuX2NvbW1pdHMgPSBjb21taXRzOworICAgICAgICAgICAgICAgIH0pLAorICAgICAgICAg ICAgICAgIENvbW1pdExvZy5mZXRjaEZvclNpbmdsZVJldmlzaW9uKHJlcG9zaXRvcnksIHByZWNl ZGluZ1JldmlzaW9uKS50aGVuKChwcmVjZWRpbmdDb21taXQpID0+IHsKKyAgICAgICAgICAgICAg ICAgICAgaWYgKHRoaXMuX2ZldGNoaW5nUHJvbWlzZSAhPSBwcm9taXNlKQorICAgICAgICAgICAg ICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgICAgICB0aGlzLl9wcmVjZWRpbmdD b21taXQgPSBudWxsOworICAgICAgICAgICAgICAgIH0pCisgICAgICAgICAgICBdKTsKKyAgICAg ICAgfQogCiAgICAgICAgIHRoaXMuX3JlcG9zaXRvcnkgPSByZXBvc2l0b3J5OwogICAgICAgICB0 aGlzLl9mZXRjaGluZ1Byb21pc2UgPSBwcm9taXNlOwpAQCAtNDgsMzEgKzY2LDE0IEBAIGNsYXNz IENvbW1pdExvZ1ZpZXdlciBleHRlbmRzIENvbXBvbmVudEJhc2UgewogICAgICAgICB0aGlzLl9m ZXRjaGluZ1Byb21pc2UudGhlbigoY29tbWl0cykgPT4gewogICAgICAgICAgICAgaWYgKHRoaXMu X2ZldGNoaW5nUHJvbWlzZSAhPSBwcm9taXNlKQogICAgICAgICAgICAgICAgIHJldHVybjsKLSAg ICAgICAgICAgIHRoaXMuX2NvbW1pdHMgPSBjb21taXRzOwotICAgICAgICAgICAgaWYgKGZldGNo U2luZ2xlQ29tbWl0KSB7Ci0gICAgICAgICAgICAgICAgdGhpcy5fZmV0Y2hpbmdQcm9taXNlID0g bnVsbDsKLSAgICAgICAgICAgICAgICB0aGlzLl9wcmVjZWRpbmdDb21taXQgPSBudWxsOwotICAg ICAgICAgICAgICAgIHRoaXMuZW5xdWV1ZVRvUmVuZGVyKCk7Ci0gICAgICAgICAgICAgICAgcmV0 dXJuOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgcmV0dXJuIENvbW1pdExvZy5mZXRjaEZv clNpbmdsZVJldmlzaW9uKHJlcG9zaXRvcnksIHByZWNlZGluZ1JldmlzaW9uKS50aGVuKChwcmVj ZWRpbmdDb21taXQpID0+IHsKLSAgICAgICAgICAgICAgICBpZiAodGhpcy5fZmV0Y2hpbmdQcm9t aXNlICE9IHByb21pc2UpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAg ICAgICB0aGlzLl9mZXRjaGluZ1Byb21pc2UgPSBudWxsOwotICAgICAgICAgICAgICAgIHRoaXMu X3ByZWNlZGluZ0NvbW1pdCA9IHByZWNlZGluZ0NvbW1pdFswXTsKLSAgICAgICAgICAgICAgICB0 aGlzLmVucXVldWVUb1JlbmRlcigpOwotICAgICAgICAgICAgfSwgKGVycm9yKSA9PiB7Ci0gICAg ICAgICAgICAgICAgaWYgKHRoaXMuX2ZldGNoaW5nUHJvbWlzZSAhPSBwcm9taXNlKQotICAgICAg ICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICAgICAgdGhpcy5fZmV0Y2hpbmdQcm9t aXNlID0gbnVsbDsKLSAgICAgICAgICAgICAgICB0aGlzLl9wcmVjZWRpbmdDb21taXQgPSBudWxs OwotICAgICAgICAgICAgICAgIHRoaXMuZW5xdWV1ZVRvUmVuZGVyKCk7Ci0gICAgICAgICAgICB9 KTsKKyAgICAgICAgICAgIHRoaXMuX2ZldGNoaW5nUHJvbWlzZSA9IG51bGw7CisgICAgICAgICAg ICB0aGlzLmVucXVldWVUb1JlbmRlcigpOwogICAgICAgICB9LCAoZXJyb3IpID0+IHsKICAgICAg ICAgICAgIGlmICh0aGlzLl9mZXRjaGluZ1Byb21pc2UgIT0gcHJvbWlzZSkKICAgICAgICAgICAg ICAgICByZXR1cm47CiAgICAgICAgICAgICB0aGlzLl9mZXRjaGluZ1Byb21pc2UgPSBudWxsOwog ICAgICAgICAgICAgdGhpcy5fY29tbWl0cyA9IG51bGw7CisgICAgICAgICAgICB0aGlzLl9wcmVj ZWRpbmdDb21taXQgPSBudWxsOwogICAgICAgICAgICAgdGhpcy5lbnF1ZXVlVG9SZW5kZXIoKTsK ICAgICAgICAgfSk7CiAK