109202 2013-02-07 09:13:00 -0800 [BlackBerry] Cookie database isn't loaded into memory in some rare cases 2013-02-07 10:25:49 -0800 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 otcheung webkit-unassigned mifenton rwlbuis tonikitoo webkit.review.bot yong.li.webkit oldest_to_newest 827594 0 otcheung 2013-02-07 09:13:00 -0800 If we get into a state where the get/setcookie calls are called before the database is loaded in the first async call, reload the cookie database using a sync call to make sure it's loaded properly. 827597 1 187126 otcheung 2013-02-07 09:15:56 -0800 Created attachment 187126 Patch 827602 2 187126 yong.li.webkit 2013-02-07 09:23:48 -0800 Comment on attachment 187126 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=187126&action=review > Source/WebCore/platform/blackberry/CookieDatabaseBackingStore/CookieDatabaseBackingStore.cpp:322 > + if (isCurrentThread()) > + BlackBerry::Platform::webKitThreadMessageClient()->dispatchSyncMessage(createMethodCallMessage(&CookieManager::getBackingStoreCookies, &cookieManager())); > + else > + cookieManager().getBackingStoreCookies(); I'm not sure this is right. we send message when it is current thread? maybe we want the opposite? 827607 3 187126 yong.li.webkit 2013-02-07 09:25:51 -0800 Comment on attachment 187126 Patch never mind 827608 4 187126 webkit.review.bot 2013-02-07 09:27:04 -0800 Comment on attachment 187126 Patch Rejecting attachment 187126 from commit-queue. otcheung@rim.com does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers.py. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 827670 5 187126 webkit.review.bot 2013-02-07 10:25:45 -0800 Comment on attachment 187126 Patch Clearing flags on attachment: 187126 Committed r142150: <http://trac.webkit.org/changeset/142150> 827671 6 webkit.review.bot 2013-02-07 10:25:49 -0800 All reviewed patches have been landed. Closing bug. 187126 2013-02-07 09:15:56 -0800 2013-02-07 10:25:45 -0800 Patch bug-109202-20130207121232.patch text/plain 9085 otcheung U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyMTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWZlZTNmNWQ5ZGRiZjVl NTA0MTI0YjcxZTlhNGExYmZkMTQxNjU1OS4uMzg1YWM3NTU3N2IxYjc3YzA3OGQ1YWU2MTJiZmRk YzJiN2I3NzcyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDEzLTAyLTA3ICBPdHRv IERlcmVrIENoZXVuZyAgPG90Y2hldW5nQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnld IENvb2tpZSBkYXRhYmFzZSBpc24ndCBsb2FkZWQgaW50byBtZW1vcnkgaW4gc29tZSByYXJlIGNh c2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDky MDIKKyAgICAgICAgUFIgMjg2MTg5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisgICAgICAgIEludGVybmFsbHkgUmV2aWV3ZWQgYnkgS29ucmFkIFBpYXNjaWsuCisKKyAg ICAgICAgSWYgYSBnZXQvc2V0Q29va2llIGNhbGwgaXMgbWFkZSBiZWZvcmUgdGhlIGRhdGFiYXNl IGlzIGxvYWRlZCwgb3IgaWYgdGhlcmUncyBzb21lCisgICAgICAgIGtpbmQgb2YgZXJyb3IgdGhh dCBjYXVzZXMgdGhlIGxvYWRpbmcgb2YgdGhlIGRhdGFiYXNlIHRvIGZhaWwgaW4gdGhlIGNvbnN0 cnVjdG9yCisgICAgICAgIG9mIENvb2tpZU1hbmFnZXIsIHRoZSBicm93c2VyIHdpbGwgZ2V0IGlu dG8gYSBzdGF0ZSB3aGVyZSBpdCBzZWVtcyBsaWtlIGNvb2tpZSBpcworICAgICAgICBwZXJtYW5l bnR5IGRpc2FibGVkLgorCisgICAgICAgIEluc3RlYWQgb2YgbG9nZ2luZyB0aGUgZXJyb3JzIGFu ZCByZWRpc3BhdGNoaW5nIHRoZSBzZXRDb29raWUsIHdlIHNob3VsZCBkbyBhIGZvcmNlIHN5bmMK KyAgICAgICAgdG8gbG9hZCB0aGUgY29va2llIGRhdGFiYXNlIGJlZm9yZSBjb250aW51aW5nLgor CisgICAgICAgIFNpbmNlIHRoZSBidWcgaXMgc28gZGlmZmljdWx0IHRvIHJlcHJvZHVjZSAoSSBu ZXZlciBkaWQgc28gbXlzZWxmKSwgSSBkaWQgdGhlIGZvbGxvdyB0ZXN0CisgICAgICAgIHRvIG1h a2Ugc3VyZSB0aGUgY29kZSBwYXRoIGlzIGNvcnJlY3Q6CisgICAgICAgIDEpIE1ha2Ugc3VyZSBv cmlnaW5hbCBpbXBsZW1lbnRhdGlvbiBpcyByZXRhaW5lZCAtIG9wZW4gYW5kIGxvYWRpbmcgZG9u ZSBpbiB0aGUgY29uc3RydWN0b3IKKyAgICAgICAgMikgUmVtb3ZlZCBvcGVuaW5nIGFuZCBsb2Fk aW5nIGluIGNvbnN0cnVjdG9yLCB0aGUgbmV3IGNhbGxzIGluIGdldC9zZXRjb29raWVzIGxvYWRl ZCB0aGUgZGIganVzdCBmaW5lIChhbHRob3VnaCB3aXRoCisgICAgICAgIGFuIGluaXRpYWwgbGFn IGJlY2F1c2Ugd2UgYXJlIGJsb2NraW5nIFdLVCB3aGlsZSBwZXJmb3JtaW5nIFNRTGl0ZSBvcHRp b25zKS4KKyAgICAgICAgMykgUmVtb3ZlZCBsb2FkaW5nIGluIGNvbnN0cnVjdG9yLCB0aGUgbmV3 IGNhbGxzIGxvYWRlZCB0aGUgZGIganVzdCBmaW5lLgorCisgICAgICAgICogcGxhdGZvcm0vYmxh Y2tiZXJyeS9Db29raWVEYXRhYmFzZUJhY2tpbmdTdG9yZS9Db29raWVEYXRhYmFzZUJhY2tpbmdT dG9yZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb29raWVEYXRhYmFzZUJhY2tpbmdTdG9yZTo6 b3BlbkFuZExvYWREYXRhYmFzZVN5bmNocm9ub3VzbHkpOgorICAgICAgICAoV2ViQ29yZSk6Cisg ICAgICAgICogcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVEYXRhYmFzZUJhY2tpbmdTdG9yZS9D b29raWVEYXRhYmFzZUJhY2tpbmdTdG9yZS5oOgorICAgICAgICAoQ29va2llRGF0YWJhc2VCYWNr aW5nU3RvcmUpOgorICAgICAgICAqIHBsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llTWFuYWdlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpDb29raWVNYW5hZ2VyOjpzZXRDb29raWVzKToKKyAgICAg ICAgKFdlYkNvcmU6OkNvb2tpZU1hbmFnZXI6OmdldENvb2tpZSk6CisgICAgICAgIChXZWJDb3Jl OjpDb29raWVNYW5hZ2VyOjpnZW5lcmF0ZUh0bWxGcmFnbWVudEZvckNvb2tpZXMpOgorICAgICAg ICAoV2ViQ29yZTo6Q29va2llTWFuYWdlcjo6Z2V0UmF3Q29va2llcyk6CisKIDIwMTMtMDItMDcg IE1pa2hhaWwgUG96ZG55YWtvdiAgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CiAKICAg ICAgICAgW1dLMl1bRUZMXVtRVF1SRUdSRVNTSU9OKHIxNDIwNDUpOiBTY3JvbGxpbmcgaXMgYnJv a2VuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tp ZURhdGFiYXNlQmFja2luZ1N0b3JlL0Nvb2tpZURhdGFiYXNlQmFja2luZ1N0b3JlLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llRGF0YWJhc2VCYWNraW5nU3Rv cmUvQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmUuY3BwCmluZGV4IGVmMGZjYzgzMDllMjIyYWVi NzEyZDgwNWJmMjhhMDBhMjUwYjBkMmMuLjkwNzYxNDZhMjNhZTMwMjE3YTVmMjQwMjFhZjFkZDcw MzY3MWMwMmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkv Q29va2llRGF0YWJhc2VCYWNraW5nU3RvcmUvQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmUuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llRGF0YWJhc2VC YWNraW5nU3RvcmUvQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmUuY3BwCkBAIC0zMTEsNiArMzEx LDIzIEBAIFZlY3RvcjxQYXJzZWRDb29raWUqPiogQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmU6 Omludm9rZUdldENvb2tpZXNXaXRoTGltaXQodW5zCiAgICAgcmV0dXJuIGNvb2tpZXM7CiB9CiAK K3ZvaWQgQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmU6Om9wZW5BbmRMb2FkRGF0YWJhc2VTeW5j aHJvbm91c2x5KGNvbnN0IFN0cmluZyYgY29va2llSmFyKQoreworICAgIENvb2tpZUxvZygiQ29v a2llQmFja2luZ1N0b3JlIC0gbG9hZGluZyBkYXRhYmFzZSBpbnRvIENvb2tpZU1hbmFnZXIgaW1t ZWRpYXRlbHkiKTsKKworICAgIGlmIChtX2RiLmlzT3BlbigpKSB7CisgICAgICAgIGlmIChpc0N1 cnJlbnRUaHJlYWQoKSkKKyAgICAgICAgICAgIEJsYWNrQmVycnk6OlBsYXRmb3JtOjp3ZWJLaXRU aHJlYWRNZXNzYWdlQ2xpZW50KCktPmRpc3BhdGNoU3luY01lc3NhZ2UoY3JlYXRlTWV0aG9kQ2Fs bE1lc3NhZ2UoJkNvb2tpZU1hbmFnZXI6OmdldEJhY2tpbmdTdG9yZUNvb2tpZXMsICZjb29raWVN YW5hZ2VyKCkpKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgY29va2llTWFuYWdlcigpLmdl dEJhY2tpbmdTdG9yZUNvb2tpZXMoKTsKKyAgICB9IGVsc2UgeworICAgICAgICBpZiAoaXNDdXJy ZW50VGhyZWFkKCkpCisgICAgICAgICAgICBpbnZva2VPcGVuKGNvb2tpZUphcik7CisgICAgICAg IGVsc2UKKyAgICAgICAgICAgIGRpc3BhdGNoU3luY01lc3NhZ2UoY3JlYXRlTWV0aG9kQ2FsbE1l c3NhZ2UoJkNvb2tpZURhdGFiYXNlQmFja2luZ1N0b3JlOjppbnZva2VPcGVuLCB0aGlzLCBjb29r aWVKYXIpKTsKKyAgICB9Cit9CisKIHZvaWQgQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmU6OnNl bmRDaGFuZ2VzVG9EYXRhYmFzZVN5bmNocm9ub3VzbHkoKQogewogICAgIENvb2tpZUxvZygiQ29v a2llQmFja2luZ1N0b3JlIC0gc2VuZGluZyB0byBkYXRhYmFzZSBpbW1lZGlhdGVseSIpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVEYXRhYmFz ZUJhY2tpbmdTdG9yZS9Db29raWVEYXRhYmFzZUJhY2tpbmdTdG9yZS5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVEYXRhYmFzZUJhY2tpbmdTdG9yZS9Db29raWVE YXRhYmFzZUJhY2tpbmdTdG9yZS5oCmluZGV4IDUzOWUyOWRhOWZiY2JjOGI0NzEwYmI2YWQxZDNm N2EyZTc3Mzg2NjcuLjg4MzRmNGVmMzRiZGUzMzRhMTk0MWFmMTA1NDNmMTE0YTQzOWM0YjEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llRGF0YWJh c2VCYWNraW5nU3RvcmUvQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmUuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZURhdGFiYXNlQmFja2luZ1N0b3JlL0Nv b2tpZURhdGFiYXNlQmFja2luZ1N0b3JlLmgKQEAgLTU5LDYgKzU5LDcgQEAgcHVibGljOgogICAg IC8vIElmIGEgbGltaXQgaXMgbm90IHNldCwgdGhlIG1ldGhvZCB3aWxsIHJldHVybiBhbGwgY29v a2llcyBpbiB0aGUgZGF0YWJhc2UKICAgICB2b2lkIGdldENvb2tpZXNGcm9tRGF0YWJhc2UoVmVj dG9yPFBhcnNlZENvb2tpZSo+JiBzdGFja09mQ29va2llcywgdW5zaWduZWQgaW50IGxpbWl0ID0g MCk7CiAKKyAgICB2b2lkIG9wZW5BbmRMb2FkRGF0YWJhc2VTeW5jaHJvbm91c2x5KGNvbnN0IFN0 cmluZyYgY29va2llSmFyKTsKICAgICB2b2lkIHNlbmRDaGFuZ2VzVG9EYXRhYmFzZVN5bmNocm9u b3VzbHkoKTsKIAogICAgIC8vIE1lc3NhZ2VDbGllbnQgbWV0aG9kcwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVNYW5hZ2VyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llTWFuYWdlci5jcHAKaW5kZXggYWNj ZDNiNjM0ZTQyNGJhZjY1YTc2NDc5Nzc3NzY1YjQyZjRiN2Q4YS4uYmRiNjVmODc4MGMwNjRjZTE5 MDc1MDEwMWI4ZGU2NGU5OWI2NzM0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vYmxhY2tiZXJyeS9Db29raWVNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZU1hbmFnZXIuY3BwCkBAIC0xMjYsMTUgKzEyNiw5IEBAIHN0 YXRpYyBib29sIHNob3VsZElnbm9yZVNjaGVtZShjb25zdCBTdHJpbmcmIHByb3RvY29sKQogCiB2 b2lkIENvb2tpZU1hbmFnZXI6OnNldENvb2tpZXMoY29uc3QgS1VSTCYgdXJsLCBjb25zdCBTdHJp bmcmIHZhbHVlLCBDb29raWVGaWx0ZXIgZmlsdGVyKQogewotICAgIC8vIERpc3BhdGNoIHRoZSBt ZXNzYWdlIGJlY2F1c2UgdGhlIGRhdGFiYXNlIGNvb2tpZXMgYXJlIG5vdCBsb2FkZWQgaW4gbWVt b3J5IHlldC4KLSAgICBpZiAoIW1fc3luY2VkV2l0aERhdGFiYXNlICYmICFtX3ByaXZhdGVNb2Rl KSB7Ci0gICAgICAgIHR5cGVkZWYgdm9pZCAoV2ViQ29yZTo6Q29va2llTWFuYWdlcjo6KkZ1bmN0 aW9uVHlwZSkoY29uc3QgS1VSTCYsIGNvbnN0IFN0cmluZyYsIENvb2tpZUZpbHRlcik7Ci0KLSAg ICAgICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06OndlYktpdFRocmVhZE1lc3NhZ2VDbGllbnQoKS0+ ZGlzcGF0Y2hNZXNzYWdlKAotICAgICAgICAgICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06OmNyZWF0 ZU1ldGhvZENhbGxNZXNzYWdlPEZ1bmN0aW9uVHlwZSwgQ29va2llTWFuYWdlciwgY29uc3QgS1VS TCwgY29uc3QgU3RyaW5nLCBDb29raWVGaWx0ZXI+KAotICAgICAgICAgICAgICAgICZDb29raWVN YW5hZ2VyOjpzZXRDb29raWVzLCB0aGlzLCB1cmwsIHZhbHVlLCBmaWx0ZXIpKTsKLSAgICAgICAg cmV0dXJuOwotICAgIH0KKyAgICAvLyBJZiB0aGUgZGF0YWJhc2UgaGFzbid0IGJlZW4gc3luYy1l ZCBhdCB0aGlzIHBvaW50LCBmb3JjZSBhIHN5bmMgbG9hZAorICAgIGlmICghbV9zeW5jZWRXaXRo RGF0YWJhc2UgJiYgIW1fcHJpdmF0ZU1vZGUpCisgICAgICAgIG1fY29va2llQmFja2luZ1N0b3Jl LT5vcGVuQW5kTG9hZERhdGFiYXNlU3luY2hyb25vdXNseShjb29raWVKYXIoKSk7CiAKICAgICBD b29raWVMb2coIkNvb2tpZU1hbmFnZXIgLSBTZXR0aW5nIGNvb2tpZXMiKTsKICAgICBDb29raWVQ YXJzZXIgcGFyc2VyKHVybCk7CkBAIC0xNDgsMTQgKzE0Miw5IEBAIHZvaWQgQ29va2llTWFuYWdl cjo6c2V0Q29va2llcyhjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYgdmFsdWUsIENvb2tp ZUZpbHRlCiAKIHZvaWQgQ29va2llTWFuYWdlcjo6c2V0Q29va2llcyhjb25zdCBLVVJMJiB1cmws IGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBjb29raWVzLCBDb29raWVGaWx0ZXIgZmlsdGVyKQogewot ICAgIC8vIERpc3BhdGNoIHRoZSBtZXNzYWdlIGJlY2F1c2UgdGhlIGRhdGFiYXNlIGNvb2tpZXMg YXJlIG5vdCBsb2FkZWQgaW4gbWVtb3J5IHlldC4KLSAgICBpZiAoIW1fc3luY2VkV2l0aERhdGFi YXNlICYmICFtX3ByaXZhdGVNb2RlKSB7Ci0gICAgICAgIHR5cGVkZWYgdm9pZCAoV2ViQ29yZTo6 Q29va2llTWFuYWdlcjo6KkZ1bmN0aW9uVHlwZSkoY29uc3QgS1VSTCYsIGNvbnN0IFZlY3RvcjxT dHJpbmc+JiwgQ29va2llRmlsdGVyKTsKLSAgICAgICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06Ondl YktpdFRocmVhZE1lc3NhZ2VDbGllbnQoKS0+ZGlzcGF0Y2hNZXNzYWdlKAotICAgICAgICAgICAg QmxhY2tCZXJyeTo6UGxhdGZvcm06OmNyZWF0ZU1ldGhvZENhbGxNZXNzYWdlPEZ1bmN0aW9uVHlw ZSwgQ29va2llTWFuYWdlciwgY29uc3QgS1VSTCwgY29uc3QgVmVjdG9yPFN0cmluZz4sIENvb2tp ZUZpbHRlcj4oCi0gICAgICAgICAgICAgICAgJkNvb2tpZU1hbmFnZXI6OnNldENvb2tpZXMsIHRo aXMsIHVybCwgY29va2llcywgZmlsdGVyKSk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9CisgICAg Ly8gSWYgdGhlIGRhdGFiYXNlIGhhc24ndCBiZWVuIHN5bmMtZWQgYXQgdGhpcyBwb2ludCwgZm9y Y2UgYSBzeW5jIGxvYWQKKyAgICBpZiAoIW1fc3luY2VkV2l0aERhdGFiYXNlICYmICFtX3ByaXZh dGVNb2RlKQorICAgICAgICBtX2Nvb2tpZUJhY2tpbmdTdG9yZS0+b3BlbkFuZExvYWREYXRhYmFz ZVN5bmNocm9ub3VzbHkoY29va2llSmFyKCkpOwogCiAgICAgQ29va2llTG9nKCJDb29raWVNYW5h Z2VyIC0gU2V0dGluZyBjb29raWVzIik7CiAgICAgQ29va2llUGFyc2VyIHBhcnNlcih1cmwpOwpA QCAtMTY4LDEwICsxNTcsOSBAQCB2b2lkIENvb2tpZU1hbmFnZXI6OnNldENvb2tpZXMoY29uc3Qg S1VSTCYgdXJsLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgY29va2llcywgQwogCiBTdHJpbmcgQ29v a2llTWFuYWdlcjo6Z2V0Q29va2llKGNvbnN0IEtVUkwmIHVybCwgQ29va2llRmlsdGVyIGZpbHRl cikgY29uc3QKIHsKLSAgICBpZiAoIW1fc3luY2VkV2l0aERhdGFiYXNlICYmICFtX3ByaXZhdGVN b2RlKSB7Ci0gICAgICAgIExPR19FUlJPUigiQ29va2llTWFuYWdlciBpcyBjYWxsaW5nIGdldENv b2tpZXMgYmVmb3JlIGRhdGFiYXNlIHZhbHVlcyBhcmUgbG9hZGVkLiIpOwotICAgICAgICByZXR1 cm4gU3RyaW5nKCk7Ci0gICAgfQorICAgIC8vIElmIHRoZSBkYXRhYmFzZSBoYXNuJ3QgYmVlbiBz eW5jLWVkIGF0IHRoaXMgcG9pbnQsIGZvcmNlIGEgc3luYyBsb2FkCisgICAgaWYgKCFtX3N5bmNl ZFdpdGhEYXRhYmFzZSAmJiAhbV9wcml2YXRlTW9kZSkKKyAgICAgICAgbV9jb29raWVCYWNraW5n U3RvcmUtPm9wZW5BbmRMb2FkRGF0YWJhc2VTeW5jaHJvbm91c2x5KGNvb2tpZUphcigpKTsKIAog ICAgIFZlY3RvcjxQYXJzZWRDb29raWUqPiByYXdDb29raWVzOwogICAgIHJhd0Nvb2tpZXMucmVz ZXJ2ZUluaXRpYWxDYXBhY2l0eShzX21heENvb2tpZUNvdW50UGVySG9zdCk7CkBAIC0xOTgsMTAg KzE4Niw5IEBAIFN0cmluZyBDb29raWVNYW5hZ2VyOjpnZXRDb29raWUoY29uc3QgS1VSTCYgdXJs LCBDb29raWVGaWx0ZXIgZmlsdGVyKSBjb25zdAogCiBTdHJpbmcgQ29va2llTWFuYWdlcjo6Z2Vu ZXJhdGVIdG1sRnJhZ21lbnRGb3JDb29raWVzKCkKIHsKLSAgICBpZiAoIW1fc3luY2VkV2l0aERh dGFiYXNlICYmICFtX3ByaXZhdGVNb2RlKSB7Ci0gICAgICAgIExPR19FUlJPUigiQ29va2llTWFu YWdlciBpcyBjYWxsaW5nIGdlbmVyYXRlSHRtbEZyYWdtZW50Rm9yQ29va2llcyBiZWZvcmUgZGF0 YWJhc2UgdmFsdWVzIGFyZSBsb2FkZWQuIik7Ci0gICAgICAgIHJldHVybiBTdHJpbmcoKTsKLSAg ICB9CisgICAgLy8gSWYgdGhlIGRhdGFiYXNlIGhhc24ndCBiZWVuIHN5bmMtZWQgYXQgdGhpcyBw b2ludCwgZm9yY2UgYSBzeW5jIGxvYWQKKyAgICBpZiAoIW1fc3luY2VkV2l0aERhdGFiYXNlICYm ICFtX3ByaXZhdGVNb2RlKQorICAgICAgICBtX2Nvb2tpZUJhY2tpbmdTdG9yZS0+b3BlbkFuZExv YWREYXRhYmFzZVN5bmNocm9ub3VzbHkoY29va2llSmFyKCkpOwogCiAgICAgQ29va2llTG9nKCJD b29raWVNYW5hZ2VyIC0gZ2VuZXJhdGVIdG1sRnJhZ21lbnRGb3JDb29raWVzXG4iKTsKIApAQCAt MjM4LDEwICsyMjUsOSBAQCBTdHJpbmcgQ29va2llTWFuYWdlcjo6Z2VuZXJhdGVIdG1sRnJhZ21l bnRGb3JDb29raWVzKCkKIAogdm9pZCBDb29raWVNYW5hZ2VyOjpnZXRSYXdDb29raWVzKFZlY3Rv cjxQYXJzZWRDb29raWUqPiAmc3RhY2tPZkNvb2tpZXMsIGNvbnN0IEtVUkwmIHJlcXVlc3RVUkws IENvb2tpZUZpbHRlciBmaWx0ZXIpIGNvbnN0CiB7Ci0gICAgaWYgKCFtX3N5bmNlZFdpdGhEYXRh YmFzZSAmJiAhbV9wcml2YXRlTW9kZSkgewotICAgICAgICBMT0dfRVJST1IoIkNvb2tpZU1hbmFn ZXIgaXMgY2FsbGluZyBnZXRSYXdDb29raWVzIGJlZm9yZSBkYXRhYmFzZSB2YWx1ZXMgYXJlIGxv YWRlZC4iKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KKyAgICAvLyBGb3JjZSBhIHN5bmMgbG9h ZCBvZiB0aGUgZGF0YWJhc2UKKyAgICBpZiAoIW1fc3luY2VkV2l0aERhdGFiYXNlICYmICFtX3By aXZhdGVNb2RlKQorICAgICAgICBtX2Nvb2tpZUJhY2tpbmdTdG9yZS0+b3BlbkFuZExvYWREYXRh YmFzZVN5bmNocm9ub3VzbHkoY29va2llSmFyKCkpOwogCiAgICAgQ29va2llTG9nKCJDb29raWVN YW5hZ2VyIC0gZ2V0UmF3Q29va2llcyAtIHByb2Nlc3NpbmcgdXJsIHdpdGggZG9tYWluIC0gJXMg JiBwcm90b2NvbDogJXMgJiBwYXRoOiAlc1xuIiwgcmVxdWVzdFVSTC5ob3N0KCkudXRmOCgpLmRh dGEoKSwgcmVxdWVzdFVSTC5wcm90b2NvbCgpLnV0ZjgoKS5kYXRhKCksIHJlcXVlc3RVUkwucGF0 aCgpLnV0ZjgoKS5kYXRhKCkpOwogCg==