19713 2008-06-22 11:55:38 -0700 Web Inspector should group profiles of the same name into runs 2008-06-23 10:35:22 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 timothy timothy aroben kmccullough oldest_to_newest 84073 0 timothy 2008-06-22 11:55:38 -0700 Profiles of the same name in the Inspector should be grouped in the sidebar under a collapsable item that contains all the runs of that profile. This feature will be handy for repeated profiles. 84074 1 timothy 2008-06-22 11:56:07 -0700 I have a patch for this. 84077 2 21874 timothy 2008-06-22 13:07:52 -0700 Created attachment 21874 Proposed patch 84152 3 21874 darin 2008-06-23 10:22:23 -0700 Comment on attachment 21874 Proposed patch r=me 84155 4 timothy 2008-06-23 10:35:22 -0700 Landed in r34740. 21874 2008-06-22 13:07:52 -0700 2008-06-23 10:22:23 -0700 Proposed patch 0001-Make-profiles-of-the-same-name-in-the-Inspec.patch text/plain 19069 timothy RnJvbSBhYjQxYzE0M2QwN2IzZGVlMGYyNTFkN2I4NTQyMDU1YjhjNTM2OTYyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUaW1vdGh5IEhhdGNoZXIgPHRpbW90aHlAYXBwbGUuY29tPgpE YXRlOiBTdW4sIDIyIEp1biAyMDA4IDEzOjExOjAwIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gICAg ICAgICBNYWtlIHByb2ZpbGVzIG9mIHRoZSBzYW1lIG5hbWUgaW4gdGhlIEluc3BlY3RvciBncm91 cCBpbiB0aGUKICAgICAgICAgc2lkZWJhciB1bmRlciBhIGNvbGxhcHNhYmxlIGl0ZW0gdGhhdCBj b250YWlucyBhbGwgdGhlIHJ1bnMuCgogICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xOTcxMwoKICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K CiAgICAgICAgKiBFbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanM6IE5ldyBzdHJpbmdz LgogICAgICAgICogcGFnZS9pbnNwZWN0b3IvSW1hZ2VzL3Byb2ZpbGVHcm91cEljb24ucG5nOiBB ZGRlZC4KICAgICAgICAqIHBhZ2UvaW5zcGVjdG9yL0ltYWdlcy9wcm9maWxlU21hbGxJY29uLnBu ZzogQWRkZWQuCiAgICAgICAgKiBwYWdlL2luc3BlY3Rvci9Qcm9maWxlc1BhbmVsLmpzOgogICAg ICAgIChXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUucmVzZXQpOiBDbGVhciBf cHJvZmlsZUdyb3Vwcy4KICAgICAgICBSZW1vdmUgdGhlICJzb21lLWV4cGFuZGFibGUiIGNsYXNz IGZyb20gdGhlIHNpZGViYXJUcmVlLgogICAgICAgIChXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5l bC5wcm90b3R5cGUuYWRkUHJvZmlsZSk6IEFwcGVuZCBuZXcgcHJvZmlsZXMKICAgICAgICB0aGF0 IGhhdmUgdGhlIHNhbWUgbmFtZSBhcyBhIHByZXZpb3VzIHByb2ZpbGUgaW50byBhIGdyb3VwLiBX aGVuIGEKICAgICAgICBncm91cCBoYXMgMiBwcm9maWxlcyBhIFByb2ZpbGVHcm91cFNpZGViYXJU cmVlRWxlbWVudCBpcyBtYWRlIGFuZCB0aGUKICAgICAgICBQcm9maWxlU2lkZWJhclRyZWVFbGVt ZW50cyBhcmUgYXBwZW5kZWQgdG8gdGhlIGdyb3VwJ3MgZWxlbWVudC4KICAgICAgICAoV2ViSW5z cGVjdG9yLlByb2ZpbGVTaWRlYmFyVHJlZUVsZW1lbnQucHJvdG90eXBlLmdldCBtYWluVGl0bGUp OgogICAgICAgIFJldHVybiBfbWFpblRpdGxlIGlzIGl0IGlzIHNldC4KICAgICAgICAoV2ViSW5z cGVjdG9yLlByb2ZpbGVTaWRlYmFyVHJlZUVsZW1lbnQucHJvdG90eXBlLnNldCBtYWluVGl0bGUp OgogICAgICAgIFNldCBfbWFpblRpdGxlIHdoaWNoIGlzIGFuIG92ZXJyaWRlIHRpdGxlLgogICAg ICAgIChXZWJJbnNwZWN0b3IuUHJvZmlsZUdyb3VwU2lkZWJhclRyZWVFbGVtZW50KTogSW5oZXJp dCBTaWRlYmFyVHJlZUVsZW1lbnQuCiAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9maWxlR3JvdXBT aWRlYmFyVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uc2VsZWN0KToKICAgICAgICBTaG93IHRoZSBs YXN0IHByb2ZpbGUgaW4gdGhlIGdyb3VwIHdoZW4gc2VsZWN0ZWQuCiAgICAgICAgKiBwYWdlL2lu c3BlY3Rvci9TaWRlYmFyVHJlZUVsZW1lbnQuanM6CiAgICAgICAgKFdlYkluc3BlY3Rvci5TaWRl YmFyVHJlZUVsZW1lbnQucHJvdG90eXBlLmdldCBzbWFsbCk6IFJldHVybiBfc21hbGwuCiAgICAg ICAgKFdlYkluc3BlY3Rvci5TaWRlYmFyVHJlZUVsZW1lbnQucHJvdG90eXBlLnNldCBzbWFsbCk6 IFNldCBfc21hbGwgYW5kCiAgICAgICAgdXBkYXRlIHRoZSBzdHlsZSB0byBtYXRjaC4KICAgICAg ICAoV2ViSW5zcGVjdG9yLlNpZGViYXJUcmVlRWxlbWVudC5wcm90b3R5cGUub25hdHRhY2gpOiBT ZXQgdGhlIHNtYWxsCiAgICAgICAgY2xhc3MgaWYgdGhlIHNtYWxsIHByb3BlcnR5IGlzIHRydWUu CiAgICAgICAgKiBwYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuY3NzOiBOZXcgc3R5bGVzIGZvciBw cm9maWxlcyBncm91cHMKICAgICAgICBhbmQgZm9yIHRoZSBzbWFsbCBwcm9maWxlcy4KLS0tCiBX ZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMzUg KysrKysrKysrKwogV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgICAg ICAgICAgfCAgQmluIDE1MjgwIC0+IDE1MzU4IGJ5dGVzCiBXZWJDb3JlL3BhZ2UvaW5zcGVjdG9y L0ltYWdlcy9wcm9maWxlR3JvdXBJY29uLnBuZyB8ICBCaW4gMCAtPiA1MTI2IGJ5dGVzCiBXZWJD b3JlL3BhZ2UvaW5zcGVjdG9yL0ltYWdlcy9wcm9maWxlU21hbGxJY29uLnBuZyB8ICBCaW4gMCAt PiA1NzkgYnl0ZXMKIFdlYkNvcmUvcGFnZS9pbnNwZWN0b3IvUHJvZmlsZXNQYW5lbC5qcyAgICAg ICAgICAgIHwgICA2OCArKysrKysrKysrKysrKysrKysrLQogV2ViQ29yZS9wYWdlL2luc3BlY3Rv ci9TaWRlYmFyVHJlZUVsZW1lbnQuanMgICAgICAgfCAgIDIwICsrKysrKwogV2ViQ29yZS9wYWdl L2luc3BlY3Rvci9pbnNwZWN0b3IuY3NzICAgICAgICAgICAgICAgfCAgICA4ICsrCiA3IGZpbGVz IGNoYW5nZWQsIDEyOSBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQogY3JlYXRlIG1vZGUg MTAwNjQ0IFdlYkNvcmUvcGFnZS9pbnNwZWN0b3IvSW1hZ2VzL3Byb2ZpbGVHcm91cEljb24ucG5n CiBjcmVhdGUgbW9kZSAxMDA2NDQgV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9JbWFnZXMvcHJvZmls ZVNtYWxsSWNvbi5wbmcKCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUv Q2hhbmdlTG9nCmluZGV4IDkyYmM1ZTMuLmVkMzBhMmUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hh bmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzggQEAKKzIwMDgtMDYt MjIgIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgorCisgICAgICAgIE1ha2Ug cHJvZmlsZXMgb2YgdGhlIHNhbWUgbmFtZSBpbiB0aGUgSW5zcGVjdG9yIGdyb3VwIGluIHRoZQor ICAgICAgICBzaWRlYmFyIHVuZGVyIGEgY29sbGFwc2FibGUgaXRlbSB0aGF0IGNvbnRhaW5zIGFs bCB0aGUgcnVucy4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTk3MTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIEVuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczogTmV3IHN0cmluZ3MuCisg ICAgICAgICogcGFnZS9pbnNwZWN0b3IvSW1hZ2VzL3Byb2ZpbGVHcm91cEljb24ucG5nOiBBZGRl ZC4KKyAgICAgICAgKiBwYWdlL2luc3BlY3Rvci9JbWFnZXMvcHJvZmlsZVNtYWxsSWNvbi5wbmc6 IEFkZGVkLgorICAgICAgICAqIHBhZ2UvaW5zcGVjdG9yL1Byb2ZpbGVzUGFuZWwuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUucmVzZXQpOiBDbGVhciBf cHJvZmlsZUdyb3Vwcy4KKyAgICAgICAgUmVtb3ZlIHRoZSAic29tZS1leHBhbmRhYmxlIiBjbGFz cyBmcm9tIHRoZSBzaWRlYmFyVHJlZS4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9maWxlc1Bh bmVsLnByb3RvdHlwZS5hZGRQcm9maWxlKTogQXBwZW5kIG5ldyBwcm9maWxlcworICAgICAgICB0 aGF0IGhhdmUgdGhlIHNhbWUgbmFtZSBhcyBhIHByZXZpb3VzIHByb2ZpbGUgaW50byBhIGdyb3Vw LiBXaGVuIGEKKyAgICAgICAgZ3JvdXAgaGFzIDIgcHJvZmlsZXMgYSBQcm9maWxlR3JvdXBTaWRl YmFyVHJlZUVsZW1lbnQgaXMgbWFkZSBhbmQgdGhlCisgICAgICAgIFByb2ZpbGVTaWRlYmFyVHJl ZUVsZW1lbnRzIGFyZSBhcHBlbmRlZCB0byB0aGUgZ3JvdXAncyBlbGVtZW50LiAKKyAgICAgICAg KFdlYkluc3BlY3Rvci5Qcm9maWxlU2lkZWJhclRyZWVFbGVtZW50LnByb3RvdHlwZS5nZXQgbWFp blRpdGxlKToKKyAgICAgICAgUmV0dXJuIF9tYWluVGl0bGUgaXMgaXQgaXMgc2V0LgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVTaWRlYmFyVHJlZUVsZW1lbnQucHJvdG90eXBlLnNldCBt YWluVGl0bGUpOgorICAgICAgICBTZXQgX21haW5UaXRsZSB3aGljaCBpcyBhbiBvdmVycmlkZSB0 aXRsZS4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9maWxlR3JvdXBTaWRlYmFyVHJlZUVsZW1l bnQpOiBJbmhlcml0IFNpZGViYXJUcmVlRWxlbWVudC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5Q cm9maWxlR3JvdXBTaWRlYmFyVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uc2VsZWN0KToKKyAgICAg ICAgU2hvdyB0aGUgbGFzdCBwcm9maWxlIGluIHRoZSBncm91cCB3aGVuIHNlbGVjdGVkLgorICAg ICAgICAqIHBhZ2UvaW5zcGVjdG9yL1NpZGViYXJUcmVlRWxlbWVudC5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5TaWRlYmFyVHJlZUVsZW1lbnQucHJvdG90eXBlLmdldCBzbWFsbCk6IFJldHVy biBfc21hbGwuCisgICAgICAgIChXZWJJbnNwZWN0b3IuU2lkZWJhclRyZWVFbGVtZW50LnByb3Rv dHlwZS5zZXQgc21hbGwpOiBTZXQgX3NtYWxsIGFuZAorICAgICAgICB1cGRhdGUgdGhlIHN0eWxl IHRvIG1hdGNoLgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNpZGViYXJUcmVlRWxlbWVudC5wcm90 b3R5cGUub25hdHRhY2gpOiBTZXQgdGhlIHNtYWxsCisgICAgICAgIGNsYXNzIGlmIHRoZSBzbWFs bCBwcm9wZXJ0eSBpcyB0cnVlLgorICAgICAgICAqIHBhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5j c3M6IE5ldyBzdHlsZXMgZm9yIHByb2ZpbGVzIGdyb3VwcworICAgICAgICBhbmQgZm9yIHRoZSBz bWFsbCBwcm9maWxlcy4KKwogMjAwOC0wNi0yMSAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBh cHBsZS5jb20+CiAKICAgICAgICAgRml4IGEgdHlwbyAibmV3IiBpbiB0aGUga2V5d29yZHMgbGlz dCBmb3IgaHRlIEphdmFTY3JpcHQKZGlmZiAtLWdpdCBhL1dlYkNvcmUvRW5nbGlzaC5scHJvai9s b2NhbGl6ZWRTdHJpbmdzLmpzIGIvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmlu Z3MuanMKaW5kZXggYzI0YTM5MGYzM2FhNGYzMzJmZjdhYTQxM2VlNzZkNjhmZTU2N2JlOC4uYWY3 MzNkMTZjNTkxMjc3ZTBiMmRjMjljOWFiNTJiNmQyMjk5YTI1OSAxMDA2NDQKR0lUIGJpbmFyeSBw YXRjaApkZWx0YSAzOApxY21kbGB7O3p5UG9IQTw9TG4lWXY8Y0Y1UisrWUBpMClyfDslSClhYXh8 PFZ9MTAoPGdnJHVfMwoKZGVsdGEgMTIKVGNtZXhZek0qX1dvYnUqMSUwVXRVRUxhNykKCmRpZmYg LS1naXQgYS9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL0ltYWdlcy9wcm9maWxlR3JvdXBJY29uLnBu ZyBiL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvSW1hZ2VzL3Byb2ZpbGVHcm91cEljb24ucG5nCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAuLjQ0NjE2ZDRhOGNhZjk1M2Q0YjMzNzEyZmQwZTZlMWY2ZTc3MDFmZTQKR0lUIGJp bmFyeSBwYXRjaApsaXRlcmFsIDUxMjYKemNtVitoNiM0NmtQKTxoOzNLfExrMDAwZTFOSkxUcTAw MUJXMDAxQmUxXkBzNmI5I0Y4MDAwMDlhN2JCbTAwMFhVCnowMDBYVTBSV251N3l0a2M1QHx6MlAq Ny1aYlo+S0xaKlUrPExxaX5OYSZLbTdZLUlvZGMtcE8zWEZTeXB5I0RecQp6Rz5eVTRGKFJUPV9E bWNwZHErQ1B2OW9nUWtXc1ElcS0ya2IkVmY+ZkJ1VXZDTFB3PzJwZ319OV9lS0FFfDFhKzYKei11 dmMwdWIlSm87eVloRnBEekYjaSkmRGo5fHsyYzE0NHFXanZPVyljV0AtKVVqaTBUenlAcjw8d35J aj1+LUJxCnohMmdKfj1ZUmtKT2Uoa3IxXklDb257fVRIP21IUW1geyZuOWJzN28mY015VilKMihP JEAmTGY/Xl9MJDQwQipPeAp6K3koJSshJFgyWDAxJDVnO0hHJUh4JnQ4NTAzYVcxVzJGeSgpQipz KD5vMzBwMDBnKGNkPUxOI1ZIQj9yME9UYkEKemp4KWdCQ2piRWQ2IyVFPj9tP3ZoNWFhPkMtSk1H RDJPd2t2eitRajxLejlIXzQqPXxAMU88bHg1RWNQST5iUWQ9CnpAbyZwNihFI2MhME5BZDd3WkxH MldAaUI1bHolbnBNRjhGPWZNKGppK0tMcSowRCRuMFFhdWtJMDAwMWw8dUN5RAp6SEohZDk0Uz4l RCp2X0hUfDVWV0YrbSEoNVMlNGx0TkAjR3tLbD8oRVZTeFdEe3lYek9LcUNNczAxeVFxYyFmQTQK elRjfFBnNDM+elNXU0NedUI0RjR7eHh7el5fe3MlSmc8P2M+TWR5aUJha154KilGMF9rbkdkcUlh KChpJDNmWCUlCno2eTVldTl5Qyh3UlomJGZRUU93QSk0Wm5qVH1OM3I+YD1TanJvT2c4QkJ8Zi13 fkBxQTw3MitZPVNfLUNvNlkqbwp6ciFCcilGPFo7cFNsTEZ+SFEzS01GZ1lycGFCIWxZajNifFNq JnFeOT1ES3hKekljZHUrSVNePF94V3N8K1VNdXkKenBBfUZhY3JuUTl2X2JHNXMkZDk1Q2BUQXl4 TEN5USRiQ150WFNBYUFWfilmY287QDY9N0I4MHxsKnAyfWIjRDNtCnorb2IwZzl3JkZDVHVhU1Bp JWZVVEZ3UnVWK01PK3chPTgpSFVBOylsOF9hTEdsdlV0PSs0I3p5TFlCaHNTNj51JAp6N25oV1Rs XlUwY21NeGNlUndQd2dSZiR6Q1NOQn1ZdHFHfDtRQWV1WmVfZjtqLT59PmBlJmMjbWJUZ0BpdEww bmsKej85R3czLWRsSFhIPz4jYURlT3FRZCMyTzlPWk9pM1VQbXxlelM4fXpvK3JKUGVRXig1YHQ9 QDQ0ND88ekpzS0ZTCnpkPmxQd2A5JClgJiE9NihOaDQ7WHlyWndqcz5pKTFXRnxnTlIhKShoMnxq IUZKbngwZ09UTCRMKTBNOSVHdllJXgp6WFk9UHdVdD9aKChuOTdIPWZBeWFlTV4wSjtONz17WXdz T0R1emF9dChSLTExdkh3JShYUE03KVV5OG9rRVROWVEKem12PTNmZjgrbV9ebGpzTihHUnp1cSFw SHh0V31RSF5qfVFCXjRIfG5wMEMmYXpPa3toPHdCPGUwM1RSRDRJK1J2CnpwblQ4e217e3gjSzd9 IWNgM155ZHlAWDRNJERjMSU7SDszb0BVKkM9U1B0PT5ncUd3THNWISotbkohc3J4cnt3NAp6M1hY ZXc2P2c0RmNWSiNnTT4kOTNvdGx6Kmdocj80czx5biYzRWl8cT9SdX5FRiRQNF5BdyM8KHpEN3w7 bGE2SD4KelVwNlQ8dHVtYE11ZH0jcio9cUlCZGR9dmo5blBOcl8tPT1UanlmbGZJR0xaY0JhQHZl RSY7QSNadDt8Q19mbjUwCnomaigmMy1qOTZSZGBuTklfPVdocDF5fV4/MVN5O3I0UThqSnNwfSFq cCYhQyU7amJjSU0hdHhlSXhgJkk4Qi1oXgp6Yj1FT1hKNjx3QEliaylDY0pBcjxqLT1gZlM7PGk7 VWE5NzNzX0RZJV5vO3E7b34pQVcpU1E0XnlOakI2Vik+OXkKenlMN01NXjV4VDRqMCF+eVNGUyFS JH1qZFRRNyVRNWorVHt7cFJUYTIpVU1pOU97aVlHSGRwaFl3emUrNEtJcG5sCnpnSWMzZDxKT0pX UDR9QkNTYHUyX1o8NSsxK2NzfUt4cVlTRz9+Wk48U0k0S2p5YDlCZlFUSDZXSFNVWXtwbkU+YAp6 NClAKThQfH4wTGtVSFNfTlBVb1BAWklDfnBeSHhmcFBDTktrRmJzYGtCKkhzamJ9YEZQM2xaPlBB eG9aZExJNWwKel5UcFE3elVqdFNnKTxqc1B0ViFFKX0jczJSXzkwR1JLQklZKF9MVShuMFNCYmdU cUpSazhfS35wUFc5NmVfczlhCnpfLXBReHtqJVdsaSpJP34mNDF2M14jNj1zKE9ibz1QVy1CMCVV VnpSb3hrejtrSit8QW9lbHM1UHlgQ3B6eT9BPQp6Vz5NJFNXSzBCaDlHfTdIJEU/QSFPaHsjQzw/ IVJ8PGw1JHU8dSYwdSNlWVUxS2A9PXVMLT4rTmc9bksjMmwwWFUKejZOeXBEYWpCdFFVREVZM2BN YVpLVUZBcjc8bTVUenwwc09pSkdITXt2Mj1ncjBuMzlEMmJZIUZtQ3ZkZXN4cXJpCnpzZzxlK1hw bDY7d05QNWB3Rmg8VGJ1UyFwKE5vbDBLWVUwM2pEWnpOKWxsPlohO3V2dStSPi1TP2lpUHVCJDt9 ZAp6OEpLLUMmIypYWEB5N0MhbTQhOTheXjhyR1pHZkdzSj1pfXpVZytUSXNPWSRNOzt6JH5saURZ RCRpMj96VH0paUwKelQmTFpORFAodEhfaTJ3eW8+cEYqVVFeeCRKfH0mTnpPKytDZSlqJXN7c1JI QWZ2U04mZ1BLcEQ0cHNeTk99IWx3Cno2ZTw8XkF9bEhWSz1Ab2xhLT5xXitvOz8jcS1iMzlYdzIx RS0/TiU9JXlIQjRsP2s0UzspeVRMckpRJDJRb08pPQp6O2NOMHBOPXNeOVQxMntpaEhAcmI9RjY7 JVlebSZmSXBrYj9acmVyUUpnS31sYERLQCEzJmFXKkU7bjRFN09FQyoKelQ8c19kRklGeUlFb216 YUVtSlNzRFN1ZHpSJXV6cVRReVQlZSRBJndyNTBFRnM7OyNAXlNXPD9MOEVCbmBpO3FeCno9SH4y e2gqdE5UX0hFfDNqQmV8K0A0ckxyVkN3ak9jZEdNdFNKQXo9Wm07YFJKJGspcmVNJTNNYGMpcFA0 YEA3Ngp6OCQ5cT5kV2ReeV5VM19NIWJzaGkoRjk/Tl4qTHBsY2gtQThgVGZBeGtMeGpYST4yQT0w fDNDTzAyRil6SUFILWAKemF9Xi1kNG5VPn5mWDQ7RWYpJjY8OVoqaVkwVlJGfTVSJk1CYEcrOD1m ZmV8YFM7JkQoWG9HJjNndHpiPWJgVGFzCnoyJDRzJDVIckxEMnw8I1A1fkt9emloTXchUCt9K0Bs cnQmO1JmYCUke1lGY20mQyR7NT4qeUhfREBHMyFoSDFibwp6VWA0U0cqZ1dod2p0eXN1T1QhSn04 UyUmUD5HKkw1MFJ7Pn42VD1ScEliJFdgMjlxVnpiIUlISER8MHVDNUs5IXgKejlJR0t+RH1oTTMk aX5RKXooIXx9VmMrSjY8cGo9bkU7THM+SF5McHExM1VANVNsKUMjZSFlPlghfkFhclFVJGRJCnpw OSVSMFozJDxKaD5QNDVIND5jPjNuSm8pPD5LMW5hfXNmcVc+UlhxMWIzfVVLYSREY09fcjZHVTZ5 TyNiNih6Nwp6S311bjVAOUA0bCNrQm4pMml5KT9EO1grbHNfYSNqUVdIfD0qQVVjeyZ7RUxXKUgk a2FiQkxfeGJ2UXNqI3ZxXjYKelYpKXokal95Q15WU0wkUyRhSz9PKjIyVEckckB9TlpNKkVIazdx azxvXld2KkFvRG5yVTgtSGJRZEhiOGMrazl6Cnp5JDV9clBFR21DMmdDLUJvZlp4YnAhUzZGaEp9 UGJrMGVGU00wZG9kI2dYRWQ2TysjS0NSSFJXcnUzeFFxYCVLaAp6JS0pa2p5STdqPFNEPHIrcnxe NXhYaTBCYmRxcm99Z0tNTDs2Wk1rfkxwUz1IciZeYjhAd014Qmdtc3FQPiVCa1MKemBAM0llejxh UmtpUjV0bD07bm07KVpPUTYpNlRPUnc0UWdqS2xtPE1lMEUhVXszQ2V2KjFGUk1eJCo5RT4kYng3 CnpAMTBhU2otRSlUMUFxaF5oTGFFbThCaHVCRmEmZTNpfnohY05GWWlHMzkoMGZrWjI/ZXNYe3VD RzJ7fnBqU0BwPwp6cXNYV1BSMn1MQzhpIVV4cEYpP1FDb3ApNzdBNkdLZk8tR1Y8dEszTElDRVMh WlVXRFhjZndjVnpjOHBVQnI9Uk0KemlaZ35YNGx6a0UjV0t3PlljWkZ3cGpkb2FyZFNXTHdofC0+ Zz19MUcrM2Y3PmNeclpxNmBYckhKR280YD1EOTw4CnpGZyk0M1YhU1BVQiklRWBQeXNIMVJ6WHxB T2AmcShxciQmTE48fmRZSF5waip3Jkdhdm4tVWFCM0NXKlExR2BHMwp6ISk0NU8lZ1crcC1edW10 RFYye15Bbig9UUMlVFdXTlpXdF5LKmhtaXJBWHlpbTJ9a3R3Rj5uKmpobVdYU2BWfmAKemJ6YlJ5 SWtiSjRwZjZgWUI2JUJUQUwlbXNjOHVMdityLVFDdmV+YyZsalR2WDlQMnEtTVl8O1gxcVVPPzgl fX5KCnpHc3hSNktDWlZZU2ElemI4cVkwbkpEO3t3SmJ2TitiQWJqeUV4fV5jb0tTUkZSUVVKRVEm QjY/UytOSnNqPlAqVgp6R009a1VRb3J5dGdgQiNTOStpcER4e0BRRittPzRZZjI2P3NpYiZ5SFFF Nz1+OE1lSD0oemphaCtIaEBCSiprMWMKemFpT1dOclMpZHh0XjRmKjlsQFFfVHtHUnFKKE5EeGV1 ME5PazUoVVZKWV5uezhaKDxYR3U4WmpYPEJ8cFZ+I2AlCnpkKCptcntvdTZ0QFFjKF4/Ni0tWm17 cTx0cnVGZlN6KWppfj8+MjZHWmx7PVRNeUNVU0lgfjUjdzgwcEJNZ1pZTwp6PFBtK3UyPzw5b0F9 ej1TQChVJTVHREp+UG04aDMhY0p3aUgzVkltQmdDUyQ7RnUkPCsqbylackkxT0FiWlY3TFUKelop T2wreFdLVCU3fDhnRSQlRS1GdmtObmcjZjlZfllYcEhuWGtmRXMraCVYJWFPTEZUOU84PVBtZ1hN a2lSRCRgCnplYWx6RT87KVRyQ0BsQzxzN0JhSkxgR3kkXnR4Q2VRQyVEX0p9WXJZXjVaVFpYKGJ0 Pi1JbFYpPDtaKHs8cyVkbAp6X1U3IVhRNUBMNmJkWDwocSliJlFRNXt3WDRJUnh5dHF+bSZVR0dE IWRZayUyMkc8T2tqKVdVNjkmPEUpV1U2U0UKelhNdEVJU2hMeUcrZ1RxK0lrY1cycEcxPXJvSHR6 cSt9Xm1LQFI7P1lgaVN8eV9kRGYzQTd+bFc5Vnx+UjN9cCZTCnpqNmZwTyZ2P2RFcFk0aDdQT0xm fmJIT3IyQ1VyQ1llcjgmPllwITBOKyRHLTJhT0x5VyhjPFJQe1BMSmV6aU5rPwp6ISojXl5eQGpj JT5DSEIrUWE5SWM0WW42X3hPUiRramRlJSUyPjEzcTJ6bj96dXNHTkBsPXs/dEx9UUc1e052PjkK elhPUz1WeV98b1FITEUlSWlCfGdOIzU8e2xqU3BgWlhgbDdLTTFMKGA+Ujlna2NLPl9ya0Y9aypF QnFAWHQ2eyZ5CnplbEBNQnVsMjdWVDV0TC1fQi0/VSVFcXljaWo5cDtpX05PZGcrRWUlSnBOU3dg TEhGdTwrK3UhYiNINU5uYD5LbAp6K2psI0V5TGJFUjQqIW5QJmVAJllKNzRMTmJWcXMpZVVNSEVg MT55YjAwNUpJcGtIN3goTH48Pnsoc0BgN3k2JHkKejVDQ0JEMihZeVYwOFJpOTI3TCR3S0x+X2lB YzZfI2c4eyhiVWt2fk4jfH1gRzJtc0s+TEhLV1pMcCZsdjAwOHNACnpnQ2Nge3l1M3EqZE88O2M5 YGVNYTBoR1ArIX49P29ZVmFTNXlifDxTTDh+a1AwMDFDa05LI0R6MEJ4ODYwQ1NFMgp6ME9HMHUw RSg5WTBERWl6ME1ZJmMwNWRRRTAyPCY1ZVVgLWwwMG5NSUxfdCh8K1FnVUpaJlh6aiMoKEViVFdZ WTEKenIzJHB4MEJ2bU5hXn1vWEQtVmhuT2lXQmpCTSV9RV8rKDtDZEA9cTlDaT57KmpwJjF5Xz1L VnVIRiR8OE0kajA7CnpPczdManImb3ghI1ktV1VMQGgwUUVnJHdkbjs5NXM1ZSsrO1dTX35JeX10 RldaKyZaenI+YjFmPDs0S3o9SD50eAp6KnRJPmVybiRNbHYkSnl9TmB0QzQwMVpIYzVsUSUtKkM/ VjFBUTYzXlB9SyZ7QmNWIXpoJGlCXz1pJGV7Xlk5V3QKelZ0IyhVYm85SCp7dW5eUnJIRUFWI2Mx b3hGVEhmPS0oO2shczB5bV8taE07ezY9aCZ4X21rRHtJezs1VndMN3Q8Cnp4dyhKR2VMRmhOJSVB RDJSNFJ4RkI3elk/cXJIZUNCS0EtYlIwVSg/Oz05SXZDbjgpaDF7RTg7PDtFODctaExOfgp6SHJF OVpYYTRGZHVOP2U4R0pwNUlnUXpHZGpkY05CJU12a3sxeSlyUWJxcCs+VXFWQ3h7UW5GPGI9R2xO c3NtVD0KemphZiFTKGJXUkB7QDl9MVBmbmVyeUs3NiReVlkzKmZQekxxcmx3QUBXeT45KVlUM1g3 eEdRWG9LempKVGhYLTteCno0MlQrM0Y0byF3alA/Py1mQ0ZJPXYxUGd7MX0zTFl5OFg8fD4wMHlm ZVdzXlJSV1Nnd3ZwPjdDUHtseGh0e2RNTQp6Mk9qV04xel9MZk53K1QpbWcoekRJPjhrUlclQnU7 TXNVVCFLZ29zTlBXNkAkc2JXQTdxcEpye0Qzb2lTan0/YTQKem1ke1dxbHNSIT8hZ18tJEw/V3dI Q0w8M31SREBoRU8+dUM5RnE9ZUNqTSNFcXk4YVBCVXRpV3lkYU9gbFRSd30zCnpsRk1aPFFHalp0 OHhnezY4ZFUpbFZ9eHdCSCE+dzYhJjB6U1RPOStVMXs2anxDJit+djNkSigyTkBaKlVGJFBnMwp6 N3A1NTs5SHVmaFZjays4JXFBKDdqdzFydUZhO3tFV21pPUtSVkFOS3laJHpqJkJqQGE1eUUmY0xL cjQ3QV9QRykKejV9eXpSPjhTb3o2OUMzaWFiKkNwc30lfUU8bnNaQVZ3dXMoSUFWPEo/QERGVCY0 S3ZmQCRvNUNFP0J6bE52Sn1RCno+Mi02MUkrTVErMDkpNXdGNXxLbVZfZTNuKnlrfG1ZTzUtVTVp KV9MVGEra2tkektxIXN9VyZyc2x+eXYzc0BQTwp6YmNYO2AjLT1iTHc2KFFIPF55WSpvMCp4SnN8 aFJ1bzchKSl6TXZZbjtSKm52SmBTXyNpXkR7T0ZxP0FmSGV2e34KejVkKX5yZGdIQjtMdSV4Qmtz Km1oeTBCLWoycTJ6YiNvfT5MMipWVnJMVUN9fCk/OV9rKmZob3tWWWIpTkpeUn0pCnp3NzE9ZzUj ajhAMCV5PHQmZW8zR3Q0enM/X2JNMiQ4SCs/Yzk7UGhhTFp0WCFqOFhuTnpzVTElP0J8eDJvOU9F Mwp6PGsxfkZgVFUxKD5BTiQ5bjV1fndGfCNyTlc4MGB5OG4kaE5HQ25wJWtWI1MrOFVjanlAb0Jg XncpXnF0KHt5IW8KenZpRzQhYz03R214SHBeVT83MFFEWjBlfTg8QGo9OSExSnpiTTZxYFZMRElS SEcxZitkcHg2MDg1Wks9RD5nZVJkCnpaQCE5eFp7eHQxcFlobSg0Pk5iPlMybkMkQUwkNkVyeGwm aDclUTVnKHJfZCkrc31pOEJheW1jZH01a1p4KEMhdwp6eE0lbjVMbHZmR2Y4eHghMSYkMEFuVnk/ cmFwXnFJP1JtbHBRdENMTmU+bnFvWUdyfkgqPSNSQ2tWMiFIcl87VHAKekdkKjs3WkZZVGF5VGw2 ak5WJispZF9VZ35tdzBDUFVlP3slIXUwN0dUWlVDTFV9YTVkPSFFTyhAcmpkR2MkcDtTCnpAKDJA P3IhWnAzcTxmdm5qKlg3NnNrTSFwKlM0QFQtX0h5MHl3MWtmXj0jaElVWlZ2TTdGUllSKEpCa284 b0paegp6OSNXfkVuajVkR3ZUPVBJSilONW9IOVV+KDxObU1AUUV9RmVYUE5oWFooIyk9c0FERTdS aTskJChnXz5ad2J0QiUKellwIWEqO2xyTn1mQUlkSHFuX3swdWgwYj1PfDlDJT8lSXYqMDtsZmlv ajcxTUU3anxVPUI2KUReWVFZc2VxSHkhCno7bFFyIzRVTFVXX2JlX2g/PT5QRm0pPjZnXzA9OHhn endLQEZpUmkzYFBMXyYwPF5jYypKVkpPbndsbm4xSGZBRgpvey1lTG0+SCZYVG4pemk2VCg5LV8w Tnk8c2dAU0Fxdmo2fTkwNypxb002TjwkZzZjLSNuZzlSKgoKbGl0ZXJhbCAwCkhjbVY/ZDAwMDAx CgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9JbWFnZXMvcHJvZmlsZVNtYWxs SWNvbi5wbmcgYi9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL0ltYWdlcy9wcm9maWxlU21hbGxJY29u LnBuZwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwLi43OTM1NTIwN2FiYjBmOWU0NmI5OTUyZDQ2MjE5YTdlYTljNzEyZDkw CkdJVCBiaW5hcnkgcGF0Y2gKbGl0ZXJhbCA1NzkKemNtVi1KMD0pZitQKTxoOzNLfExrMDAwZTFO SkxUcTAwMG1HMDAwbU8xXkBzNkFNXmlWMDAwMDlhN2JCbTAwMFhVCnowMDBYVTBSV251N3l0a09B WSh7VU8jbEZUQj4oX2BnOCVeZXt7UjRoPT5QekFGYVFBUlU7cUYqbTtlQTVaPDFmZAp6TWdSWi0k d0A+KFJDd0JxbGZpMmZLQF45LSo9KW5RclZeV0NUWElPNjM1YztoaCMtfXNVT1deSm9faT0xNn0q YzcKemlnKVFyeWNCdkJCb3NYOClxMm5wWCVsSHQzb2ZDRnlBNGZ1b2ArPURPPjB1O0AqWHF1YGAq MFklcVM3eihkdHJXCnpZJUVuI08xWGV5IzFONHEtfHV7VF59Nn40enk9NkliN083bzwtMm8pYWE+ K3JjP1BAeXVtRDA2UEE0fXZUZGd4PAp6NXk2OyM2dyVSfC1IJEg3YWt0Q0hXfGZUVkdCdUlvPUN1 a1JLNWEzWiZ2V0pTTD5+a1FtbSt8YmpMbFl5PkQobXUKelohTkkxenNLKCZwelF8PHVeP2lTZzx9 OCFRQElATnotTUUjJUdFLVZfZ2YhWG40aVp4SldLIyZwZ3NHdk5lPnE5CnpBUl8kcWUkbjs9ekJH MEBASH4jWUNwXjQrPytuMDcwd1Ire2d6Wk0xSWp6flFIKDB2OCRWSkVEITFHMX1MPTQ2Vgp6Sk50 V05Hdm0wOSE8XlF2U0tsSENsaTRne2hPfVR6JnQ0SXNJRnBhXz5tXk5Qd2drZD85dkV1MWRNdT11 Xns/JmsKem9Zc1ptQ1lIO0VVWm5fPCRwN21XWUZ+R3doY2JBUU5RfElNTVdQKXN6KjUkY2gpfndX Zmh6eVhNR1EoUWUqbG41CnpzbjNzfUpiaTlMR1h0Yll7SGQ7R3NpeHprPiEofXplISlxPEYtRkVn P0JSTkswQEFUPHlBI2QpODMyNlBGUk5eTwpSOVpMV0owMDJvdlBESExrVjFuZ1ZgaE5mYgoKbGl0 ZXJhbCAwCkhjbVY/ZDAwMDAxCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9Q cm9maWxlc1BhbmVsLmpzIGIvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9Qcm9maWxlc1BhbmVsLmpz CmluZGV4IGNlYTk4MTYuLmQwNjU0ZTAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9pbnNwZWN0 b3IvUHJvZmlsZXNQYW5lbC5qcworKysgYi9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL1Byb2ZpbGVz UGFuZWwuanMKQEAgLTEwNSw2ICsxMDUsOSBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5w cm90b3R5cGUgPSB7CiAgICAgICAgIH0KIAogICAgICAgICB0aGlzLl9wcm9maWxlcyA9IFtdOwor ICAgICAgICB0aGlzLl9wcm9maWxlR3JvdXBzID0ge307CisKKyAgICAgICAgdGhpcy5zaWRlYmFy VHJlZUVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygic29tZS1leHBhbmRhYmxlIik7CiAKICAgICAg ICAgdGhpcy5zaWRlYmFyVHJlZS5yZW1vdmVDaGlsZHJlbigpOwogICAgICAgICB0aGlzLnByb2Zp bGVWaWV3cy5yZW1vdmVDaGlsZHJlbigpOwpAQCAtMTIxLDEwICsxMjQsNTQgQEAgV2ViSW5zcGVj dG9yLlByb2ZpbGVzUGFuZWwucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgdGhpcy5fcHJv ZmlsZXMucHVzaChwcm9maWxlKTsKIAorICAgICAgICB2YXIgc2lkZWJhclBhcmVudCA9IHRoaXMu c2lkZWJhclRyZWU7CisgICAgICAgIHZhciBzbWFsbCA9IGZhbHNlOworICAgICAgICB2YXIgYWx0 ZXJuYXRlVGl0bGU7CisKKyAgICAgICAgaWYgKHByb2ZpbGUudGl0bGUgIT09ICJvcmcud2Via2l0 LnByb2ZpbGVzLnVzZXItaW5pdGlhdGVkIikgeworICAgICAgICAgICAgaWYgKCEocHJvZmlsZS50 aXRsZSBpbiB0aGlzLl9wcm9maWxlR3JvdXBzKSkKKyAgICAgICAgICAgICAgICB0aGlzLl9wcm9m aWxlR3JvdXBzW3Byb2ZpbGUudGl0bGVdID0gW107CisKKyAgICAgICAgICAgIHZhciBncm91cCA9 IHRoaXMuX3Byb2ZpbGVHcm91cHNbcHJvZmlsZS50aXRsZV07CisgICAgICAgICAgICBncm91cC5w dXNoKHByb2ZpbGUpOworCisgICAgICAgICAgICBpZiAoZ3JvdXAubGVuZ3RoID09PSAyKSB7Cisg ICAgICAgICAgICAgICAgLy8gTWFrZSBhIGdyb3VwIFRyZWVFbGVtZW50IG5vdyB0aGF0IHRoZXJl IGFyZSAyIHByb2ZpbGVzLgorICAgICAgICAgICAgICAgIGdyb3VwLl9wcm9maWxlc1RyZWVFbGVt ZW50ID0gbmV3IFdlYkluc3BlY3Rvci5Qcm9maWxlR3JvdXBTaWRlYmFyVHJlZUVsZW1lbnQocHJv ZmlsZS50aXRsZSk7CisKKyAgICAgICAgICAgICAgICAvLyBJbnNlcnQgYXQgdGhlIHNhbWUgaW5k ZXggZm9yIHRoZSBmaXJzdCBwcm9maWxlIG9mIHRoZSBncm91cC4KKyAgICAgICAgICAgICAgICB2 YXIgaW5kZXggPSB0aGlzLnNpZGViYXJUcmVlLmNoaWxkcmVuLmluZGV4T2YoZ3JvdXBbMF0uX3By b2ZpbGVzVHJlZUVsZW1lbnQpOworICAgICAgICAgICAgICAgIHRoaXMuc2lkZWJhclRyZWUuaW5z ZXJ0Q2hpbGQoZ3JvdXAuX3Byb2ZpbGVzVHJlZUVsZW1lbnQsIGluZGV4KTsKKworICAgICAgICAg ICAgICAgIC8vIE1vdmUgdGhlIGZpcnN0IHByb2ZpbGUgdG8gdGhlIGdyb3VwLgorICAgICAgICAg ICAgICAgIHZhciBzZWxlY3RlZCA9IGdyb3VwWzBdLl9wcm9maWxlc1RyZWVFbGVtZW50LnNlbGVj dGVkOworICAgICAgICAgICAgICAgIHRoaXMuc2lkZWJhclRyZWUucmVtb3ZlQ2hpbGQoZ3JvdXBb MF0uX3Byb2ZpbGVzVHJlZUVsZW1lbnQpOworICAgICAgICAgICAgICAgIGdyb3VwLl9wcm9maWxl c1RyZWVFbGVtZW50LmFwcGVuZENoaWxkKGdyb3VwWzBdLl9wcm9maWxlc1RyZWVFbGVtZW50KTsK KyAgICAgICAgICAgICAgICBpZiAoc2VsZWN0ZWQpIHsKKyAgICAgICAgICAgICAgICAgICAgZ3Jv dXBbMF0uX3Byb2ZpbGVzVHJlZUVsZW1lbnQuc2VsZWN0KCk7CisgICAgICAgICAgICAgICAgICAg IGdyb3VwWzBdLl9wcm9maWxlc1RyZWVFbGVtZW50LnJldmVhbCgpOworICAgICAgICAgICAgICAg IH0KKworICAgICAgICAgICAgICAgIGdyb3VwWzBdLl9wcm9maWxlc1RyZWVFbGVtZW50LnNtYWxs ID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICBncm91cFswXS5fcHJvZmlsZXNUcmVlRWxlbWVudC5t YWluVGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJ1biAlZCIsIDEpOworCisgICAgICAg ICAgICAgICAgdGhpcy5zaWRlYmFyVHJlZUVsZW1lbnQuYWRkU3R5bGVDbGFzcygic29tZS1leHBh bmRhYmxlIik7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGlmIChncm91cC5sZW5ndGgg Pj0gMikgeworICAgICAgICAgICAgICAgIHNpZGViYXJQYXJlbnQgPSBncm91cC5fcHJvZmlsZXNU cmVlRWxlbWVudDsKKyAgICAgICAgICAgICAgICBhbHRlcm5hdGVUaXRsZSA9IFdlYkluc3BlY3Rv ci5VSVN0cmluZygiUnVuICVkIiwgZ3JvdXAubGVuZ3RoKTsKKyAgICAgICAgICAgICAgICBzbWFs bCA9IHRydWU7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKwogICAgICAgICB2YXIgcHJvZmls ZVRyZWVFbGVtZW50ID0gbmV3IFdlYkluc3BlY3Rvci5Qcm9maWxlU2lkZWJhclRyZWVFbGVtZW50 KHByb2ZpbGUpOworICAgICAgICBwcm9maWxlVHJlZUVsZW1lbnQuc21hbGwgPSBzbWFsbDsKKyAg ICAgICAgaWYgKGFsdGVybmF0ZVRpdGxlKQorICAgICAgICAgICAgcHJvZmlsZVRyZWVFbGVtZW50 Lm1haW5UaXRsZSA9IGFsdGVybmF0ZVRpdGxlOwogICAgICAgICBwcm9maWxlLl9wcm9maWxlc1Ry ZWVFbGVtZW50ID0gcHJvZmlsZVRyZWVFbGVtZW50OwogCi0gICAgICAgIHRoaXMuc2lkZWJhclRy ZWUuYXBwZW5kQ2hpbGQocHJvZmlsZVRyZWVFbGVtZW50KTsKKyAgICAgICAgc2lkZWJhclBhcmVu dC5hcHBlbmRDaGlsZChwcm9maWxlVHJlZUVsZW1lbnQpOwogICAgIH0sCiAKICAgICBzaG93UHJv ZmlsZTogZnVuY3Rpb24ocHJvZmlsZSkKQEAgLTI1NSw2ICszMDIsOCBAQCBXZWJJbnNwZWN0b3Iu UHJvZmlsZVNpZGViYXJUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAKICAgICBnZXQgbWFpblRp dGxlKCkKICAgICB7CisgICAgICAgIGlmICh0aGlzLl9tYWluVGl0bGUpCisgICAgICAgICAgICBy ZXR1cm4gdGhpcy5fbWFpblRpdGxlOwogICAgICAgICBpZiAodGhpcy5wcm9maWxlLnRpdGxlID09 PSAib3JnLndlYmtpdC5wcm9maWxlcy51c2VyLWluaXRpYXRlZCIpCiAgICAgICAgICAgICByZXR1 cm4gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJQcm9maWxlICVkIiwgdGhpcy5fcHJvZmlsZU51bWJl cik7CiAgICAgICAgIHJldHVybiB0aGlzLnByb2ZpbGUudGl0bGU7CkBAIC0yNjIsNyArMzExLDgg QEAgV2ViSW5zcGVjdG9yLlByb2ZpbGVTaWRlYmFyVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewog CiAgICAgc2V0IG1haW5UaXRsZSh4KQogICAgIHsKLSAgICAgICAgLy8gQ2FuJ3QgY2hhbmdlIG1h aW5UaXRsZS4KKyAgICAgICAgdGhpcy5fbWFpblRpdGxlID0geDsKKyAgICAgICAgdGhpcy5yZWZy ZXNoVGl0bGVzKCk7CiAgICAgfSwKIAogICAgIGdldCBzdWJ0aXRsZSgpCkBAIC0yNzcsMyArMzI3 LDE3IEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlU2lkZWJhclRyZWVFbGVtZW50LnByb3RvdHlwZSA9 IHsKIH0KIAogV2ViSW5zcGVjdG9yLlByb2ZpbGVTaWRlYmFyVHJlZUVsZW1lbnQucHJvdG90eXBl Ll9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5TaWRlYmFyVHJlZUVsZW1lbnQucHJvdG90eXBlOwor CitXZWJJbnNwZWN0b3IuUHJvZmlsZUdyb3VwU2lkZWJhclRyZWVFbGVtZW50ID0gZnVuY3Rpb24o dGl0bGUsIHN1YnRpdGxlKQoreworICAgIFdlYkluc3BlY3Rvci5TaWRlYmFyVHJlZUVsZW1lbnQu Y2FsbCh0aGlzLCAicHJvZmlsZS1ncm91cC1zaWRlYmFyLXRyZWUtaXRlbSIsIHRpdGxlLCBzdWJ0 aXRsZSwgbnVsbCwgdHJ1ZSk7Cit9CisKK1dlYkluc3BlY3Rvci5Qcm9maWxlR3JvdXBTaWRlYmFy VHJlZUVsZW1lbnQucHJvdG90eXBlID0geworICAgIG9uc2VsZWN0OiBmdW5jdGlvbigpCisgICAg eworICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnByb2ZpbGVzLnNob3dQcm9maWxlKHRoaXMu Y2hpbGRyZW5bdGhpcy5jaGlsZHJlbi5sZW5ndGggLSAxXS5wcm9maWxlKTsKKyAgICB9Cit9CisK K1dlYkluc3BlY3Rvci5Qcm9maWxlR3JvdXBTaWRlYmFyVHJlZUVsZW1lbnQucHJvdG90eXBlLl9f cHJvdG9fXyA9IFdlYkluc3BlY3Rvci5TaWRlYmFyVHJlZUVsZW1lbnQucHJvdG90eXBlOwpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9TaWRlYmFyVHJlZUVsZW1lbnQuanMgYi9X ZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL1NpZGViYXJUcmVlRWxlbWVudC5qcwppbmRleCBjODQ5ZjJm Li5jMDhiMGVmIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL1NpZGViYXJUcmVl RWxlbWVudC5qcworKysgYi9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL1NpZGViYXJUcmVlRWxlbWVu dC5qcwpAQCAtOTcsNiArOTcsMjMgQEAgV2ViSW5zcGVjdG9yLlNpZGViYXJUcmVlRWxlbWVudCA9 IGZ1bmN0aW9uKGNsYXNzTmFtZSwgdGl0bGUsIHN1YnRpdGxlLCByZXByZXNlbnQKIH0KIAogV2Vi SW5zcGVjdG9yLlNpZGViYXJUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CisgICAgZ2V0IHNtYWxs KCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9zbWFsbDsKKyAgICB9LAorCisgICAgc2V0 IHNtYWxsKHgpCisgICAgeworICAgICAgICB0aGlzLl9zbWFsbCA9IHg7CisKKyAgICAgICAgaWYg KHRoaXMuX2xpc3RJdGVtTm9kZSkgeworICAgICAgICAgICAgaWYgKHRoaXMuX3NtYWxsKQorICAg ICAgICAgICAgICAgIHRoaXMuX2xpc3RJdGVtTm9kZS5hZGRTdHlsZUNsYXNzKCJzbWFsbCIpOwor ICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIHRoaXMuX2xpc3RJdGVtTm9kZS5yZW1v dmVTdHlsZUNsYXNzKCJzbWFsbCIpOworICAgICAgICB9CisgICAgfSwKKwogICAgIGdldCBtYWlu VGl0bGUoKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX21haW5UaXRsZTsKQEAgLTE2Myw2 ICsxODAsOSBAQCBXZWJJbnNwZWN0b3IuU2lkZWJhclRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsK ICAgICAgICAgaWYgKHRoaXMuY2xhc3NOYW1lKQogICAgICAgICAgICAgdGhpcy5fbGlzdEl0ZW1O b2RlLmFkZFN0eWxlQ2xhc3ModGhpcy5jbGFzc05hbWUpOwogCisgICAgICAgIGlmICh0aGlzLnNt YWxsKQorICAgICAgICAgICAgdGhpcy5fbGlzdEl0ZW1Ob2RlLmFkZFN0eWxlQ2xhc3MoInNtYWxs Iik7CisKICAgICAgICAgaWYgKHRoaXMuaGFzQ2hpbGRyZW4gJiYgdGhpcy5kaXNjbG9zdXJlQnV0 dG9uKQogICAgICAgICAgICAgdGhpcy5fbGlzdEl0ZW1Ob2RlLmFwcGVuZENoaWxkKHRoaXMuZGlz Y2xvc3VyZUJ1dHRvbik7CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvaW5z cGVjdG9yLmNzcyBiL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmNzcwppbmRleCBi Mzk5MGM4Li43OTkwZTQxIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL2luc3Bl Y3Rvci5jc3MKKysrIGIvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuY3NzCkBAIC0y NDg2LDYgKzI0ODYsMTQgQEAgYm9keS5pbmFjdGl2ZSAuc2lkZWJhci10cmVlLWl0ZW0uc2VsZWN0 ZWQgewogICAgIGNvbnRlbnQ6IHVybChJbWFnZXMvcHJvZmlsZUljb24ucG5nKTsKIH0KIAorLnBy b2ZpbGUtc2lkZWJhci10cmVlLWl0ZW0uc21hbGwgLmljb24geworICAgIGNvbnRlbnQ6IHVybChJ bWFnZXMvcHJvZmlsZVNtYWxsSWNvbi5wbmcpOworfQorCisucHJvZmlsZS1ncm91cC1zaWRlYmFy LXRyZWUtaXRlbSAuaWNvbiB7CisgICAgY29udGVudDogdXJsKEltYWdlcy9wcm9maWxlR3JvdXBJ Y29uLnBuZyk7Cit9CisKIC5wcm9maWxlLXZpZXcgewogICAgIGRpc3BsYXk6IG5vbmU7CiAgICAg b3ZlcmZsb3c6IGhpZGRlbjsKLS0gCjEuNS40LjQKCg==