145218 2015-05-20 12:09:22 -0700 Refactor process pool enumeration code in WebsiteDataStore 2015-05-20 16:04:26 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1096309 0 andersca 2015-05-20 12:09:22 -0700 Refactor process pool enumeration code in WebsiteDataStore 1096310 1 253454 andersca 2015-05-20 12:11:20 -0700 Created attachment 253454 Patch 1096372 2 andersca 2015-05-20 16:04:26 -0700 Committed r184669: <http://trac.webkit.org/changeset/184669> 253454 2015-05-20 12:11:20 -0700 2015-05-20 15:23:29 -0700 Patch bug-145218-20150520121117.patch text/plain 9267 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg0NjQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMWU1MTQwNTk4YmI5NDgw NDk4NGYwNmI1YzcxYjgwNzBmOTAyM2Y1NC4uZGE1Mjc4ZDA4MTYwNmJmNGFkYTYyYzMxMmJhNmVl MzNkNmJkMTc4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE1LTA1LTIwICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVmYWN0b3IgcHJv Y2VzcyBwb29sIGVudW1lcmF0aW9uIGNvZGUgaW4gV2Vic2l0ZURhdGFTdG9yZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1MjE4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWxzbyBtYWtlIHN1cmUgdG8g a2VlcCB0aGUgV2ViUHJvY2Vzc1Bvb2wgb2JqZWN0cyBhbGl2ZSBmb3IgdGhlIGR1cmF0aW9uIG9m IHRoZSB2YXJpb3VzIGRhdGEgc3RvcmUKKyAgICAgICAgb3BlcmF0aW9ucy4gVGhpcyBpcyB0aGUg Zmlyc3Qgc3RlcCB0b3dhcmRzIGhhdmluZyB0aGUgZGF0YSBzdG9yZSBjcmVhdGUgYSBzaW5nbGUg cHJvY2VzcyBwb29sIGxhemlseSBpZgorICAgICAgICB0aGVyZSBhcmUgbm8gd2ViIHZpZXdzIGFz c29jaWF0ZWQgd2l0aCB0aGUgZGF0YSBzdG9yZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJz aXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURh dGFTdG9yZTo6ZmV0Y2hEYXRhKToKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6 cmVtb3ZlRGF0YSk6CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OnByb2Nlc3NQ b29scyk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUu aDoKKwogMjAxNS0wNS0yMCAgU3VuZ21hbm4gQ2hvICA8c3VuZ21hbm4uY2hvQG5hdmVyY29ycC5j b20+CiAKICAgICAgICAgTWlub3IgY2xlYW51cHMgdG8gUGx1Z2luUHJvY2Vzc1Byb3h5LgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRh U3RvcmUuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVE YXRhU3RvcmUuY3BwCmluZGV4IGI0ZjMwNTY4MjgzM2IyNDNhYmUyNGY0YzkyN2ExZGZiYTUyYmFh NTQuLmQ5Y2Q1ZThkNzdkYjVhNjNlMGQ2NzA3ZGYyODcxM2ZlZDE2NTczZDggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFT dG9yZS5jcHAKQEAgLTIxNSwxMSArMjE1LDcgQEAgdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpmZXRj aERhdGEoV2Vic2l0ZURhdGFUeXBlcyBkYXRhVHlwZXMsIHN0ZDo6ZnVuY3Rpb248dm9pZAogCiAg ICAgYXV0byBuZXR3b3JrUHJvY2Vzc0FjY2Vzc1R5cGUgPSBjb21wdXRlTmV0d29ya1Byb2Nlc3NB Y2Nlc3NUeXBlRm9yRGF0YUZldGNoKGRhdGFUeXBlcywgIWlzUGVyc2lzdGVudCgpKTsKICAgICBp ZiAobmV0d29ya1Byb2Nlc3NBY2Nlc3NUeXBlICE9IFByb2Nlc3NBY2Nlc3NUeXBlOjpOb25lKSB7 Ci0gICAgICAgIEhhc2hTZXQ8V2ViUHJvY2Vzc1Bvb2wqPiBwcm9jZXNzUG9vbHM7Ci0gICAgICAg IGZvciAoYXV0byYgcHJvY2VzcyA6IHByb2Nlc3NlcygpKQotICAgICAgICAgICAgcHJvY2Vzc1Bv b2xzLmFkZCgmcHJvY2Vzcy0+cHJvY2Vzc1Bvb2woKSk7Ci0KLSAgICAgICAgZm9yIChhdXRvJiBw cm9jZXNzUG9vbCA6IHByb2Nlc3NQb29scykgeworICAgICAgICBmb3IgKGF1dG8gcHJvY2Vzc1Bv b2wgOiBwcm9jZXNzUG9vbHMoKSkgewogICAgICAgICAgICAgc3dpdGNoIChuZXR3b3JrUHJvY2Vz c0FjY2Vzc1R5cGUpIHsKICAgICAgICAgICAgIGNhc2UgUHJvY2Vzc0FjY2Vzc1R5cGU6Ok9ubHlJ ZkxhdW5jaGVkOgogICAgICAgICAgICAgICAgIGlmICghcHJvY2Vzc1Bvb2wtPm5ldHdvcmtQcm9j ZXNzKCkpCkBAIC0yMzUsNyArMjMxLDcgQEAgdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpmZXRjaERh dGEoV2Vic2l0ZURhdGFUeXBlcyBkYXRhVHlwZXMsIHN0ZDo6ZnVuY3Rpb248dm9pZAogICAgICAg ICAgICAgfQogCiAgICAgICAgICAgICBjYWxsYmFja0FnZ3JlZ2F0b3ItPmFkZFBlbmRpbmdDYWxs YmFjaygpOwotICAgICAgICAgICAgcHJvY2Vzc1Bvb2wtPm5ldHdvcmtQcm9jZXNzKCktPmZldGNo V2Vic2l0ZURhdGEobV9zZXNzaW9uSUQsIGRhdGFUeXBlcywgW2NhbGxiYWNrQWdncmVnYXRvcl0o V2Vic2l0ZURhdGEgd2Vic2l0ZURhdGEpIHsKKyAgICAgICAgICAgIHByb2Nlc3NQb29sLT5uZXR3 b3JrUHJvY2VzcygpLT5mZXRjaFdlYnNpdGVEYXRhKG1fc2Vzc2lvbklELCBkYXRhVHlwZXMsIFtj YWxsYmFja0FnZ3JlZ2F0b3IsIHByb2Nlc3NQb29sXShXZWJzaXRlRGF0YSB3ZWJzaXRlRGF0YSkg ewogICAgICAgICAgICAgICAgIGNhbGxiYWNrQWdncmVnYXRvci0+cmVtb3ZlUGVuZGluZ0NhbGxi YWNrKFdURjo6bW92ZSh3ZWJzaXRlRGF0YSkpOwogICAgICAgICAgICAgfSk7CiAgICAgICAgIH0K QEAgLTMzNSwxNSArMzMxLDExIEBAIHZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6ZmV0Y2hEYXRhKFdl YnNpdGVEYXRhVHlwZXMgZGF0YVR5cGVzLCBzdGQ6OmZ1bmN0aW9uPHZvaWQKIAogI2lmIEVOQUJM RShEQVRBQkFTRV9QUk9DRVNTKQogICAgIGlmIChkYXRhVHlwZXMgJiBXZWJzaXRlRGF0YVR5cGVJ bmRleGVkREJEYXRhYmFzZXMgJiYgaXNQZXJzaXN0ZW50KCkpIHsKLSAgICAgICAgSGFzaFNldDxX ZWJQcm9jZXNzUG9vbCo+IHByb2Nlc3NQb29sczsKLSAgICAgICAgZm9yIChhdXRvJiBwcm9jZXNz IDogcHJvY2Vzc2VzKCkpCi0gICAgICAgICAgICBwcm9jZXNzUG9vbHMuYWRkKCZwcm9jZXNzLT5w cm9jZXNzUG9vbCgpKTsKLQotICAgICAgICBmb3IgKGF1dG8mIHByb2Nlc3NQb29sIDogcHJvY2Vz c1Bvb2xzKSB7CisgICAgICAgIGZvciAoYXV0byBwcm9jZXNzUG9vbCA6IHByb2Nlc3NQb29scygp KSB7CiAgICAgICAgICAgICBwcm9jZXNzUG9vbC0+ZW5zdXJlRGF0YWJhc2VQcm9jZXNzKCk7CiAK ICAgICAgICAgICAgIGNhbGxiYWNrQWdncmVnYXRvci0+YWRkUGVuZGluZ0NhbGxiYWNrKCk7Ci0g ICAgICAgICAgICBwcm9jZXNzUG9vbC0+ZGF0YWJhc2VQcm9jZXNzKCktPmZldGNoV2Vic2l0ZURh dGEobV9zZXNzaW9uSUQsIGRhdGFUeXBlcywgW2NhbGxiYWNrQWdncmVnYXRvcl0oV2Vic2l0ZURh dGEgd2Vic2l0ZURhdGEpIHsKKyAgICAgICAgICAgIHByb2Nlc3NQb29sLT5kYXRhYmFzZVByb2Nl c3MoKS0+ZmV0Y2hXZWJzaXRlRGF0YShtX3Nlc3Npb25JRCwgZGF0YVR5cGVzLCBbY2FsbGJhY2tB Z2dyZWdhdG9yLCBwcm9jZXNzUG9vbF0oV2Vic2l0ZURhdGEgd2Vic2l0ZURhdGEpIHsKICAgICAg ICAgICAgICAgICBjYWxsYmFja0FnZ3JlZ2F0b3ItPnJlbW92ZVBlbmRpbmdDYWxsYmFjayhXVEY6 Om1vdmUod2Vic2l0ZURhdGEpKTsKICAgICAgICAgICAgIH0pOwogICAgICAgICB9CkBAIC00MTcs MTEgKzQwOSw3IEBAIHZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6cmVtb3ZlRGF0YShXZWJzaXRlRGF0 YVR5cGVzIGRhdGFUeXBlcywgc3RkOjpjaHJvbm86OnN5c3RlCiAKICAgICBhdXRvIG5ldHdvcmtQ cm9jZXNzQWNjZXNzVHlwZSA9IGNvbXB1dGVOZXR3b3JrUHJvY2Vzc0FjY2Vzc1R5cGVGb3JEYXRh UmVtb3ZhbChkYXRhVHlwZXMsICFpc1BlcnNpc3RlbnQoKSk7CiAgICAgaWYgKG5ldHdvcmtQcm9j ZXNzQWNjZXNzVHlwZSAhPSBQcm9jZXNzQWNjZXNzVHlwZTo6Tm9uZSkgewotICAgICAgICBIYXNo U2V0PFdlYlByb2Nlc3NQb29sKj4gcHJvY2Vzc1Bvb2xzOwotICAgICAgICBmb3IgKGF1dG8mIHBy b2Nlc3MgOiBwcm9jZXNzZXMoKSkKLSAgICAgICAgICAgIHByb2Nlc3NQb29scy5hZGQoJnByb2Nl c3MtPnByb2Nlc3NQb29sKCkpOwotCi0gICAgICAgIGZvciAoYXV0byYgcHJvY2Vzc1Bvb2wgOiBw cm9jZXNzUG9vbHMpIHsKKyAgICAgICAgZm9yIChhdXRvIHByb2Nlc3NQb29sIDogcHJvY2Vzc1Bv b2xzKCkpIHsKICAgICAgICAgICAgIHN3aXRjaCAobmV0d29ya1Byb2Nlc3NBY2Nlc3NUeXBlKSB7 CiAgICAgICAgICAgICBjYXNlIFByb2Nlc3NBY2Nlc3NUeXBlOjpPbmx5SWZMYXVuY2hlZDoKICAg ICAgICAgICAgICAgICBpZiAoIXByb2Nlc3NQb29sLT5uZXR3b3JrUHJvY2VzcygpKQpAQCAtNDM3 LDcgKzQyNSw3IEBAIHZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6cmVtb3ZlRGF0YShXZWJzaXRlRGF0 YVR5cGVzIGRhdGFUeXBlcywgc3RkOjpjaHJvbm86OnN5c3RlCiAgICAgICAgICAgICB9CiAKICAg ICAgICAgICAgIGNhbGxiYWNrQWdncmVnYXRvci0+YWRkUGVuZGluZ0NhbGxiYWNrKCk7Ci0gICAg ICAgICAgICBwcm9jZXNzUG9vbC0+bmV0d29ya1Byb2Nlc3MoKS0+ZGVsZXRlV2Vic2l0ZURhdGEo bV9zZXNzaW9uSUQsIGRhdGFUeXBlcywgbW9kaWZpZWRTaW5jZSwgW2NhbGxiYWNrQWdncmVnYXRv cl0geworICAgICAgICAgICAgcHJvY2Vzc1Bvb2wtPm5ldHdvcmtQcm9jZXNzKCktPmRlbGV0ZVdl YnNpdGVEYXRhKG1fc2Vzc2lvbklELCBkYXRhVHlwZXMsIG1vZGlmaWVkU2luY2UsIFtjYWxsYmFj a0FnZ3JlZ2F0b3IsIHByb2Nlc3NQb29sXSB7CiAgICAgICAgICAgICAgICAgY2FsbGJhY2tBZ2dy ZWdhdG9yLT5yZW1vdmVQZW5kaW5nQ2FsbGJhY2soKTsKICAgICAgICAgICAgIH0pOwogICAgICAg ICB9CkBAIC01MTYsMTUgKzUwNCwxMSBAQCB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OnJlbW92ZURh dGEoV2Vic2l0ZURhdGFUeXBlcyBkYXRhVHlwZXMsIHN0ZDo6Y2hyb25vOjpzeXN0ZQogCiAjaWYg RU5BQkxFKERBVEFCQVNFX1BST0NFU1MpCiAgICAgaWYgKGRhdGFUeXBlcyAmIFdlYnNpdGVEYXRh VHlwZUluZGV4ZWREQkRhdGFiYXNlcyAmJiBpc1BlcnNpc3RlbnQoKSkgewotICAgICAgICBIYXNo U2V0PFdlYlByb2Nlc3NQb29sKj4gcHJvY2Vzc1Bvb2xzOwotICAgICAgICBmb3IgKGF1dG8mIHBy b2Nlc3MgOiBwcm9jZXNzZXMoKSkKLSAgICAgICAgICAgIHByb2Nlc3NQb29scy5hZGQoJnByb2Nl c3MtPnByb2Nlc3NQb29sKCkpOwotCi0gICAgICAgIGZvciAoYXV0byYgcHJvY2Vzc1Bvb2wgOiBw cm9jZXNzUG9vbHMpIHsKKyAgICAgICAgZm9yIChhdXRvIHByb2Nlc3NQb29sIDogcHJvY2Vzc1Bv b2xzKCkpIHsKICAgICAgICAgICAgIHByb2Nlc3NQb29sLT5lbnN1cmVEYXRhYmFzZVByb2Nlc3Mo KTsKIAogICAgICAgICAgICAgY2FsbGJhY2tBZ2dyZWdhdG9yLT5hZGRQZW5kaW5nQ2FsbGJhY2so KTsKLSAgICAgICAgICAgIHByb2Nlc3NQb29sLT5kYXRhYmFzZVByb2Nlc3MoKS0+ZGVsZXRlV2Vi c2l0ZURhdGEobV9zZXNzaW9uSUQsIGRhdGFUeXBlcywgbW9kaWZpZWRTaW5jZSwgW2NhbGxiYWNr QWdncmVnYXRvcl0oKSB7CisgICAgICAgICAgICBwcm9jZXNzUG9vbC0+ZGF0YWJhc2VQcm9jZXNz KCktPmRlbGV0ZVdlYnNpdGVEYXRhKG1fc2Vzc2lvbklELCBkYXRhVHlwZXMsIG1vZGlmaWVkU2lu Y2UsIFtjYWxsYmFja0FnZ3JlZ2F0b3IsIHByb2Nlc3NQb29sXSB7CiAgICAgICAgICAgICAgICAg Y2FsbGJhY2tBZ2dyZWdhdG9yLT5yZW1vdmVQZW5kaW5nQ2FsbGJhY2soKTsKICAgICAgICAgICAg IH0pOwogICAgICAgICB9CkBAIC01NzcsMTEgKzU2MSw3IEBAIHZvaWQgV2Vic2l0ZURhdGFTdG9y ZTo6cmVtb3ZlRGF0YShXZWJzaXRlRGF0YVR5cGVzIGRhdGFUeXBlcywgY29uc3QgVmVjdG9yPFdl YnNpCiAKICAgICBhdXRvIG5ldHdvcmtQcm9jZXNzQWNjZXNzVHlwZSA9IGNvbXB1dGVOZXR3b3Jr UHJvY2Vzc0FjY2Vzc1R5cGVGb3JEYXRhUmVtb3ZhbChkYXRhVHlwZXMsICFpc1BlcnNpc3RlbnQo KSk7CiAgICAgaWYgKG5ldHdvcmtQcm9jZXNzQWNjZXNzVHlwZSAhPSBQcm9jZXNzQWNjZXNzVHlw ZTo6Tm9uZSkgewotICAgICAgICBIYXNoU2V0PFdlYlByb2Nlc3NQb29sKj4gcHJvY2Vzc1Bvb2xz OwotICAgICAgICBmb3IgKGF1dG8mIHByb2Nlc3MgOiBwcm9jZXNzZXMoKSkKLSAgICAgICAgICAg IHByb2Nlc3NQb29scy5hZGQoJnByb2Nlc3MtPnByb2Nlc3NQb29sKCkpOwotCi0gICAgICAgIGZv ciAoYXV0byYgcHJvY2Vzc1Bvb2wgOiBwcm9jZXNzUG9vbHMpIHsKKyAgICAgICAgZm9yIChhdXRv IHByb2Nlc3NQb29sIDogcHJvY2Vzc1Bvb2xzKCkpIHsKICAgICAgICAgICAgIHN3aXRjaCAobmV0 d29ya1Byb2Nlc3NBY2Nlc3NUeXBlKSB7CiAgICAgICAgICAgICBjYXNlIFByb2Nlc3NBY2Nlc3NU eXBlOjpPbmx5SWZMYXVuY2hlZDoKICAgICAgICAgICAgICAgICBpZiAoIXByb2Nlc3NQb29sLT5u ZXR3b3JrUHJvY2VzcygpKQpAQCAtNjAzLDcgKzU4Myw3IEBAIHZvaWQgV2Vic2l0ZURhdGFTdG9y ZTo6cmVtb3ZlRGF0YShXZWJzaXRlRGF0YVR5cGVzIGRhdGFUeXBlcywgY29uc3QgVmVjdG9yPFdl YnNpCiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGNhbGxiYWNrQWdncmVnYXRvci0+YWRk UGVuZGluZ0NhbGxiYWNrKCk7Ci0gICAgICAgICAgICBwcm9jZXNzUG9vbC0+bmV0d29ya1Byb2Nl c3MoKS0+ZGVsZXRlV2Vic2l0ZURhdGFGb3JPcmlnaW5zKG1fc2Vzc2lvbklELCBkYXRhVHlwZXMs IG9yaWdpbnMsIGNvb2tpZUhvc3ROYW1lcywgW2NhbGxiYWNrQWdncmVnYXRvcl0geworICAgICAg ICAgICAgcHJvY2Vzc1Bvb2wtPm5ldHdvcmtQcm9jZXNzKCktPmRlbGV0ZVdlYnNpdGVEYXRhRm9y T3JpZ2lucyhtX3Nlc3Npb25JRCwgZGF0YVR5cGVzLCBvcmlnaW5zLCBjb29raWVIb3N0TmFtZXMs IFtjYWxsYmFja0FnZ3JlZ2F0b3IsIHByb2Nlc3NQb29sXSB7CiAgICAgICAgICAgICAgICAgY2Fs bGJhY2tBZ2dyZWdhdG9yLT5yZW1vdmVQZW5kaW5nQ2FsbGJhY2soKTsKICAgICAgICAgICAgIH0p OwogICAgICAgICB9CkBAIC02OTcsMTUgKzY3NywxMSBAQCB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6 OnJlbW92ZURhdGEoV2Vic2l0ZURhdGFUeXBlcyBkYXRhVHlwZXMsIGNvbnN0IFZlY3RvcjxXZWJz aQogCiAjaWYgRU5BQkxFKERBVEFCQVNFX1BST0NFU1MpCiAgICAgaWYgKGRhdGFUeXBlcyAmIFdl YnNpdGVEYXRhVHlwZUluZGV4ZWREQkRhdGFiYXNlcyAmJiBpc1BlcnNpc3RlbnQoKSkgewotICAg ICAgICBIYXNoU2V0PFdlYlByb2Nlc3NQb29sKj4gcHJvY2Vzc1Bvb2xzOwotICAgICAgICBmb3Ig KGF1dG8mIHByb2Nlc3MgOiBwcm9jZXNzZXMoKSkKLSAgICAgICAgICAgIHByb2Nlc3NQb29scy5h ZGQoJnByb2Nlc3MtPnByb2Nlc3NQb29sKCkpOwotCi0gICAgICAgIGZvciAoYXV0byYgcHJvY2Vz c1Bvb2wgOiBwcm9jZXNzUG9vbHMpIHsKKyAgICAgICAgZm9yIChhdXRvIHByb2Nlc3NQb29sIDog cHJvY2Vzc1Bvb2xzKCkpIHsKICAgICAgICAgICAgIHByb2Nlc3NQb29sLT5lbnN1cmVEYXRhYmFz ZVByb2Nlc3MoKTsKIAogICAgICAgICAgICAgY2FsbGJhY2tBZ2dyZWdhdG9yLT5hZGRQZW5kaW5n Q2FsbGJhY2soKTsKLSAgICAgICAgICAgIHByb2Nlc3NQb29sLT5kYXRhYmFzZVByb2Nlc3MoKS0+ ZGVsZXRlV2Vic2l0ZURhdGFGb3JPcmlnaW5zKG1fc2Vzc2lvbklELCBkYXRhVHlwZXMsIG9yaWdp bnMsIFtjYWxsYmFja0FnZ3JlZ2F0b3JdKCkgeworICAgICAgICAgICAgcHJvY2Vzc1Bvb2wtPmRh dGFiYXNlUHJvY2VzcygpLT5kZWxldGVXZWJzaXRlRGF0YUZvck9yaWdpbnMobV9zZXNzaW9uSUQs IGRhdGFUeXBlcywgb3JpZ2lucywgW2NhbGxiYWNrQWdncmVnYXRvciwgcHJvY2Vzc1Bvb2xdIHsK ICAgICAgICAgICAgICAgICBjYWxsYmFja0FnZ3JlZ2F0b3ItPnJlbW92ZVBlbmRpbmdDYWxsYmFj aygpOwogICAgICAgICAgICAgfSk7CiAgICAgICAgIH0KQEAgLTc1Miw0ICs3MjgsMTMgQEAgdm9p ZCBXZWJzaXRlRGF0YVN0b3JlOjp3ZWJQcm9jZXNzRGlkQ2xvc2VDb25uZWN0aW9uKFdlYlByb2Nl c3NQcm94eSYgd2ViUHJvY2Vzc1AKICAgICAgICAgbV9zdG9yYWdlTWFuYWdlci0+cHJvY2Vzc0Rp ZENsb3NlQ29ubmVjdGlvbih3ZWJQcm9jZXNzUHJveHksIGNvbm5lY3Rpb24pOwogfQogCitIYXNo U2V0PFJlZlB0cjxXZWJQcm9jZXNzUG9vbD4+IFdlYnNpdGVEYXRhU3RvcmU6OnByb2Nlc3NQb29s cygpIGNvbnN0Cit7CisgICAgSGFzaFNldDxSZWZQdHI8V2ViUHJvY2Vzc1Bvb2w+PiBwcm9jZXNz UG9vbHM7CisgICAgZm9yIChhdXRvJiBwcm9jZXNzIDogcHJvY2Vzc2VzKCkpCisgICAgICAgIHBy b2Nlc3NQb29scy5hZGQoJnByb2Nlc3MtPnByb2Nlc3NQb29sKCkpOworCisgICAgcmV0dXJuIHBy b2Nlc3NQb29sczsKK30KKwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmgKaW5kZXggZDI2N2ZiODdkMDQ1OTdhN2Q3 YzNjNDNkY2YyYTFlMWI5MjM1OTQ2MC4uMzBkMWEzMDE3YTY0ZmI4YTA0Yjk1ODNmZjI3NWJjOTcw YzdhYTFjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYnNpdGVEYXRh L1dlYnNpdGVEYXRhU3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vic2l0 ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oCkBAIC00MCw2ICs0MCw3IEBAIG5hbWVzcGFjZSBXZWJL aXQgewogCiBjbGFzcyBTdG9yYWdlTWFuYWdlcjsKIGNsYXNzIFdlYlBhZ2VQcm94eTsKK2NsYXNz IFdlYlByb2Nlc3NQb29sOwogc3RydWN0IFdlYnNpdGVEYXRhUmVjb3JkOwogCiBjbGFzcyBXZWJz aXRlRGF0YVN0b3JlIDogcHVibGljIFJlZkNvdW50ZWQ8V2Vic2l0ZURhdGFTdG9yZT4sIHB1Ymxp YyBXZWJQcm9jZXNzTGlmZXRpbWVPYnNlcnZlciB7CkBAIC04Myw2ICs4NCw4IEBAIHByaXZhdGU6 CiAgICAgdm9pZCBwbGF0Zm9ybUluaXRpYWxpemUoKTsKICAgICB2b2lkIHBsYXRmb3JtRGVzdHJv eSgpOwogCisgICAgSGFzaFNldDxSZWZQdHI8V2ViUHJvY2Vzc1Bvb2w+PiBwcm9jZXNzUG9vbHMo KSBjb25zdDsKKwogICAgIGNvbnN0IHVpbnQ2NF90IG1faWRlbnRpZmllcjsKICAgICBjb25zdCBX ZWJDb3JlOjpTZXNzaW9uSUQgbV9zZXNzaW9uSUQ7CiAK