36988 2010-04-01 16:30:51 -0700 Need a way to figure out if a database or an origin has been successfully deleted 2010-04-01 17:13:55 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 adachan adachan oldest_to_newest 207474 0 adachan 2010-04-01 16:30:51 -0700 Currently the SPI WebDatabaseManager::deleteDatabase() and WebDatabaseManager::deleteOrigin() are void so there's no way to find out whether there's an error in deleting a database or an origin. 207485 1 52351 adachan 2010-04-01 16:42:31 -0700 Created attachment 52351 Patch Make deleteDatabase() and deleteOrigin() in DatabaseTracker and WebDatabaseManager return a boolean so the caller can find out if there are any errors during the delete operation. 207522 2 adachan 2010-04-01 17:13:55 -0700 Fixed in r56954 52351 2010-04-01 16:42:31 -0700 2010-04-01 16:52:53 -0700 Patch 20100401.patch.txt text/plain 9281 adachan SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1Njk0NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDQtMDEgIEFkYSBDaGFuICA8YWRhY2hhbkBhcHBsZS5jb20+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAg ICBDaGFuZ2UgRGF0YWJhc2VUcmFja2VyOjpkZWxldGVPcmlnaW4oKSB0byByZXR1cm4gdHJ1ZSBp ZiB0aGVyZSBhcmUgbm8gZXJyb3JzIGluIGRlbGV0aW5nIHRoZSBvcmlnaW4uCisgICAgICAgIERp dHRvIGZvciBEYXRhYmFzZVRyYWNrZXI6OmRlbGV0ZURhdGFiYXNlKCkuCisgICAgICAgIAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzY5ODgKKworICAg ICAgICAqIHN0b3JhZ2UvRGF0YWJhc2VUcmFja2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRh dGFiYXNlVHJhY2tlcjo6ZGVsZXRlT3JpZ2luKToKKyAgICAgICAgKFdlYkNvcmU6OkRhdGFiYXNl VHJhY2tlcjo6ZGVsZXRlRGF0YWJhc2UpOgorICAgICAgICAqIHN0b3JhZ2UvRGF0YWJhc2VUcmFj a2VyLmg6CisKIDIwMTAtMDMtMjkgIER1bWl0cnUgRGFuaWxpdWMgIDxkdW1pQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEaW1pdHJpIEdsYXprb3YuCkluZGV4OiBXZWJDb3Jl L3N0b3JhZ2UvRGF0YWJhc2VUcmFja2VyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3N0b3Jh Z2UvRGF0YWJhc2VUcmFja2VyLmNwcAkocmV2aXNpb24gNTY5NDYpCisrKyBXZWJDb3JlL3N0b3Jh Z2UvRGF0YWJhc2VUcmFja2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjkxLDIzICs2OTEsMjMg QEAgdm9pZCBEYXRhYmFzZVRyYWNrZXI6OmRlbGV0ZUFsbERhdGFiYXNlcwogCiAvLyBJdCBpcyB0 aGUgY2FsbGVyJ3MgcmVzcG9uc2liaWxpdHkgdG8gbWFrZSBzdXJlIHRoYXQgbm9ib2R5IGlzIHRy eWluZyB0byBjcmVhdGUsIGRlbGV0ZSwgb3Blbiwgb3IgY2xvc2UgZGF0YWJhc2VzIGluIHRoaXMg b3JpZ2luIHdoaWxlIHRoZSBkZWxldGlvbiBpcwogLy8gdGFraW5nIHBsYWNlLgotdm9pZCBEYXRh YmFzZVRyYWNrZXI6OmRlbGV0ZU9yaWdpbihTZWN1cml0eU9yaWdpbiogb3JpZ2luKQorYm9vbCBE YXRhYmFzZVRyYWNrZXI6OmRlbGV0ZU9yaWdpbihTZWN1cml0eU9yaWdpbiogb3JpZ2luKQogewog ICAgIFZlY3RvcjxTdHJpbmc+IGRhdGFiYXNlTmFtZXM7CiAgICAgewogICAgICAgICBNdXRleExv Y2tlciBsb2NrRGF0YWJhc2UobV9kYXRhYmFzZUd1YXJkKTsKICAgICAgICAgb3BlblRyYWNrZXJE YXRhYmFzZShmYWxzZSk7CiAgICAgICAgIGlmICghbV9kYXRhYmFzZS5pc09wZW4oKSkKLSAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgICAgICBpZiAo IWRhdGFiYXNlTmFtZXNGb3JPcmlnaW5Ob0xvY2sob3JpZ2luLCBkYXRhYmFzZU5hbWVzKSkgewog ICAgICAgICAgICAgTE9HX0VSUk9SKCJVbmFibGUgdG8gcmV0cmlldmUgbGlzdCBvZiBkYXRhYmFz ZSBuYW1lcyBmb3Igb3JpZ2luICVzIiwgb3JpZ2luLT5kYXRhYmFzZUlkZW50aWZpZXIoKS5hc2Np aSgpLmRhdGEoKSk7Ci0gICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICByZXR1cm4gZmFs c2U7CiAgICAgICAgIH0KICAgICAgICAgaWYgKCFjYW5EZWxldGVPcmlnaW4ob3JpZ2luKSkgewog ICAgICAgICAgICAgTE9HX0VSUk9SKCJUcmllZCB0byBkZWxldGUgYW4gb3JpZ2luICglcykgd2hp bGUgZWl0aGVyIGNyZWF0aW5nIGRhdGFiYXNlIGluIGl0IG9yIGFscmVhZHkgZGVsZXRpbmcgaXQi LCBvcmlnaW4tPmRhdGFiYXNlSWRlbnRpZmllcigpLmFzY2lpKCkuZGF0YSgpKTsKICAgICAgICAg ICAgIEFTU0VSVChmYWxzZSk7Ci0gICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICByZXR1 cm4gZmFsc2U7CiAgICAgICAgIH0KICAgICAgICAgcmVjb3JkRGVsZXRpbmdPcmlnaW4ob3JpZ2lu KTsKICAgICB9CkBAIC03MzAsMjcgKzczMCwyNyBAQCB2b2lkIERhdGFiYXNlVHJhY2tlcjo6ZGVs ZXRlT3JpZ2luKFNlY3VyCiAKICAgICAgICAgaWYgKHN0YXRlbWVudC5wcmVwYXJlKCkgIT0gU1FM UmVzdWx0T2spIHsKICAgICAgICAgICAgIExPR19FUlJPUigiVW5hYmxlIHRvIHByZXBhcmUgZGVs ZXRpb24gb2YgZGF0YWJhc2VzIGZyb20gb3JpZ2luICVzIGZyb20gdHJhY2tlciIsIG9yaWdpbi0+ ZGF0YWJhc2VJZGVudGlmaWVyKCkuYXNjaWkoKS5kYXRhKCkpOwotICAgICAgICAgICAgcmV0dXJu OworICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9CiAKICAgICAgICAgc3RhdGVt ZW50LmJpbmRUZXh0KDEsIG9yaWdpbi0+ZGF0YWJhc2VJZGVudGlmaWVyKCkpOwogCiAgICAgICAg IGlmICghc3RhdGVtZW50LmV4ZWN1dGVDb21tYW5kKCkpIHsKICAgICAgICAgICAgIExPR19FUlJP UigiVW5hYmxlIHRvIGV4ZWN1dGUgZGVsZXRpb24gb2YgZGF0YWJhc2VzIGZyb20gb3JpZ2luICVz IGZyb20gdHJhY2tlciIsIG9yaWdpbi0+ZGF0YWJhc2VJZGVudGlmaWVyKCkuYXNjaWkoKS5kYXRh KCkpOwotICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAg ICAgICB9CiAKICAgICAgICAgU1FMaXRlU3RhdGVtZW50IG9yaWdpblN0YXRlbWVudChtX2RhdGFi YXNlLCAiREVMRVRFIEZST00gT3JpZ2lucyBXSEVSRSBvcmlnaW49PyIpOwogICAgICAgICBpZiAo b3JpZ2luU3RhdGVtZW50LnByZXBhcmUoKSAhPSBTUUxSZXN1bHRPaykgewogICAgICAgICAgICAg TE9HX0VSUk9SKCJVbmFibGUgdG8gcHJlcGFyZSBkZWxldGlvbiBvZiBvcmlnaW4gJXMgZnJvbSB0 cmFja2VyIiwgb3JpZ2luLT5kYXRhYmFzZUlkZW50aWZpZXIoKS5hc2NpaSgpLmRhdGEoKSk7Ci0g ICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIH0K IAogICAgICAgICBvcmlnaW5TdGF0ZW1lbnQuYmluZFRleHQoMSwgb3JpZ2luLT5kYXRhYmFzZUlk ZW50aWZpZXIoKSk7CiAKICAgICAgICAgaWYgKCFvcmlnaW5TdGF0ZW1lbnQuZXhlY3V0ZUNvbW1h bmQoKSkgewogICAgICAgICAgICAgTE9HX0VSUk9SKCJVbmFibGUgdG8gZXhlY3V0ZSBkZWxldGlv biBvZiBkYXRhYmFzZXMgZnJvbSBvcmlnaW4gJXMgZnJvbSB0cmFja2VyIiwgb3JpZ2luLT5kYXRh YmFzZUlkZW50aWZpZXIoKS5hc2NpaSgpLmRhdGEoKSk7Ci0gICAgICAgICAgICByZXR1cm47Cisg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIH0KIAogICAgICAgICBTUUxpdGVGaWxl U3lzdGVtOjpkZWxldGVFbXB0eURhdGFiYXNlRGlyZWN0b3J5KG9yaWdpblBhdGgob3JpZ2luKSk7 CkBAIC03NzQsNiArNzc0LDcgQEAgdm9pZCBEYXRhYmFzZVRyYWNrZXI6OmRlbGV0ZU9yaWdpbihT ZWN1cgogICAgICAgICAgICAgICAgIG1fY2xpZW50LT5kaXNwYXRjaERpZE1vZGlmeURhdGFiYXNl KG9yaWdpbiwgZGF0YWJhc2VOYW1lc1tpXSk7CiAgICAgICAgIH0KICAgICB9CisgICAgcmV0dXJu IHRydWU7CiB9CiAKIGJvb2wgRGF0YWJhc2VUcmFja2VyOjpjYW5DcmVhdGVEYXRhYmFzZShTZWN1 cml0eU9yaWdpbiAqb3JpZ2luLCBjb25zdCBTdHJpbmcmIG5hbWUpCkBAIC04ODksMTcgKzg5MCwx NyBAQCB2b2lkIERhdGFiYXNlVHJhY2tlcjo6ZG9uZURlbGV0aW5nT3JpZ2luCiAgICAgbV9vcmln aW5zQmVpbmdEZWxldGVkLnJlbW92ZShvcmlnaW4pOwogfQogCi12b2lkIERhdGFiYXNlVHJhY2tl cjo6ZGVsZXRlRGF0YWJhc2UoU2VjdXJpdHlPcmlnaW4qIG9yaWdpbiwgY29uc3QgU3RyaW5nJiBu YW1lKQorYm9vbCBEYXRhYmFzZVRyYWNrZXI6OmRlbGV0ZURhdGFiYXNlKFNlY3VyaXR5T3JpZ2lu KiBvcmlnaW4sIGNvbnN0IFN0cmluZyYgbmFtZSkKIHsKICAgICB7CiAgICAgICAgIE11dGV4TG9j a2VyIGxvY2tEYXRhYmFzZShtX2RhdGFiYXNlR3VhcmQpOwogICAgICAgICBvcGVuVHJhY2tlckRh dGFiYXNlKGZhbHNlKTsKICAgICAgICAgaWYgKCFtX2RhdGFiYXNlLmlzT3BlbigpKQotICAgICAg ICAgICAgcmV0dXJuOworICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgICAgIGlmICgh Y2FuRGVsZXRlRGF0YWJhc2Uob3JpZ2luLCBuYW1lKSkgewogICAgICAgICAgICAgQVNTRVJUKEZB TFNFKTsKLSAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAg ICAgICAgfQogICAgICAgICByZWNvcmREZWxldGluZ0RhdGFiYXNlKG9yaWdpbiwgbmFtZSk7CiAg ICAgfQpAQCAtOTA5LDcgKzkxMCw3IEBAIHZvaWQgRGF0YWJhc2VUcmFja2VyOjpkZWxldGVEYXRh YmFzZShTZWMKICAgICAgICAgTE9HX0VSUk9SKCJVbmFibGUgdG8gZGVsZXRlIGZpbGUgZm9yIGRh dGFiYXNlICVzIGluIG9yaWdpbiAlcyIsIG5hbWUuYXNjaWkoKS5kYXRhKCksIG9yaWdpbi0+ZGF0 YWJhc2VJZGVudGlmaWVyKCkuYXNjaWkoKS5kYXRhKCkpOwogICAgICAgICBNdXRleExvY2tlciBs b2NrRGF0YWJhc2UobV9kYXRhYmFzZUd1YXJkKTsKICAgICAgICAgZG9uZURlbGV0aW5nRGF0YWJh c2Uob3JpZ2luLCBuYW1lKTsKLSAgICAgICAgcmV0dXJuOworICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgfQogCiAgICAgLy8gVG8gc2F0aXNmeSB0aGUgbG9jayBoaWVyYXJjaHksIHdlIGhhdmUg dG8gbG9jayB0aGUgb3JpZ2luUXVvdGFNYW5hZ2VyIGJlZm9yZSBtX2RhdGFiYXNlR3VhcmQgaWYg dGhlcmUncyBhbnkgY2hhbmNlIHdlJ2xsIHRvIGxvY2sgYm90aC4KQEAgLTkyMCw3ICs5MjEsNyBA QCB2b2lkIERhdGFiYXNlVHJhY2tlcjo6ZGVsZXRlRGF0YWJhc2UoU2VjCiAgICAgaWYgKHN0YXRl bWVudC5wcmVwYXJlKCkgIT0gU1FMUmVzdWx0T2spIHsKICAgICAgICAgTE9HX0VSUk9SKCJVbmFi bGUgdG8gcHJlcGFyZSBkZWxldGlvbiBvZiBkYXRhYmFzZSAlcyBmcm9tIG9yaWdpbiAlcyBmcm9t IHRyYWNrZXIiLCBuYW1lLmFzY2lpKCkuZGF0YSgpLCBvcmlnaW4tPmRhdGFiYXNlSWRlbnRpZmll cigpLmFzY2lpKCkuZGF0YSgpKTsKICAgICAgICAgZG9uZURlbGV0aW5nRGF0YWJhc2Uob3JpZ2lu LCBuYW1lKTsKLSAgICAgICAgcmV0dXJuOworICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQog CiAgICAgc3RhdGVtZW50LmJpbmRUZXh0KDEsIG9yaWdpbi0+ZGF0YWJhc2VJZGVudGlmaWVyKCkp OwpAQCAtOTI5LDcgKzkzMCw3IEBAIHZvaWQgRGF0YWJhc2VUcmFja2VyOjpkZWxldGVEYXRhYmFz ZShTZWMKICAgICBpZiAoIXN0YXRlbWVudC5leGVjdXRlQ29tbWFuZCgpKSB7CiAgICAgICAgIExP R19FUlJPUigiVW5hYmxlIHRvIGV4ZWN1dGUgZGVsZXRpb24gb2YgZGF0YWJhc2UgJXMgZnJvbSBv cmlnaW4gJXMgZnJvbSB0cmFja2VyIiwgbmFtZS5hc2NpaSgpLmRhdGEoKSwgb3JpZ2luLT5kYXRh YmFzZUlkZW50aWZpZXIoKS5hc2NpaSgpLmRhdGEoKSk7CiAgICAgICAgIGRvbmVEZWxldGluZ0Rh dGFiYXNlKG9yaWdpbiwgbmFtZSk7Ci0gICAgICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIGZh bHNlOwogICAgIH0KIAogICAgIG9yaWdpblF1b3RhTWFuYWdlck5vTG9jaygpLnJlbW92ZURhdGFi YXNlKG9yaWdpbiwgbmFtZSk7CkBAIC05MzksNiArOTQwLDggQEAgdm9pZCBEYXRhYmFzZVRyYWNr ZXI6OmRlbGV0ZURhdGFiYXNlKFNlYwogICAgICAgICBtX2NsaWVudC0+ZGlzcGF0Y2hEaWRNb2Rp ZnlEYXRhYmFzZShvcmlnaW4sIG5hbWUpOwogICAgIH0KICAgICBkb25lRGVsZXRpbmdEYXRhYmFz ZShvcmlnaW4sIG5hbWUpOworICAgIAorICAgIHJldHVybiB0cnVlOwogfQogCiAvLyBkZWxldGVE YXRhYmFzZUZpbGUgaGFzIHRvIHJlbGVhc2UgbG9ja3MgYmV0d2VlbiBsb29raW5nIHVwIHRoZSBs aXN0IG9mIGRhdGFiYXNlcyB0byBjbG9zZSBhbmQgY2xvc2luZyB0aGVtLiAgV2hpbGUgdGhpcyBp cyBpbiBwcm9ncmVzcywgdGhlIGNhbGxlcgpJbmRleDogV2ViQ29yZS9zdG9yYWdlL0RhdGFiYXNl VHJhY2tlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvc3RvcmFnZS9EYXRhYmFzZVRyYWNrZXIu aAkocmV2aXNpb24gNTY5NDYpCisrKyBXZWJDb3JlL3N0b3JhZ2UvRGF0YWJhc2VUcmFja2VyLmgJ KHdvcmtpbmcgY29weSkKQEAgLTEwMiw4ICsxMDIsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRR dW90YShTZWN1cml0eU9yaWdpbiosIHVuc2lnbmVkIGxvbmcgbG9uZyk7CiAKICAgICB2b2lkIGRl bGV0ZUFsbERhdGFiYXNlcygpOwotICAgIHZvaWQgZGVsZXRlT3JpZ2luKFNlY3VyaXR5T3JpZ2lu Kik7Ci0gICAgdm9pZCBkZWxldGVEYXRhYmFzZShTZWN1cml0eU9yaWdpbiosIGNvbnN0IFN0cmlu ZyYgbmFtZSk7CisgICAgYm9vbCBkZWxldGVPcmlnaW4oU2VjdXJpdHlPcmlnaW4qKTsKKyAgICBi b29sIGRlbGV0ZURhdGFiYXNlKFNlY3VyaXR5T3JpZ2luKiwgY29uc3QgU3RyaW5nJiBuYW1lKTsK IAogICAgIHZvaWQgc2V0Q2xpZW50KERhdGFiYXNlVHJhY2tlckNsaWVudCopOwogCkluZGV4OiBX ZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL0NoYW5nZUxvZwko cmV2aXNpb24gNTY5NDYpCisrKyBXZWJLaXQvbWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE3IEBACisyMDEwLTA0LTAxICBBZGEgQ2hhbiAgPGFkYWNoYW5AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENoYW5n ZSBXZWJEYXRhYmFzZU1hbmFnZXI6OmRlbGV0ZU9yaWdpbigpIHRvIHJldHVybiB0cnVlIGlmIHRo ZXJlIGFyZSBubyBlcnJvcnMgaW4gZGVsZXRpbmcgdGhlIG9yaWdpbi4KKyAgICAgICAgRGl0dG8g Zm9yIFdlYkRhdGFiYXNlTWFuYWdlcjo6ZGVsZXRlRGF0YWJhc2UoKS4KKyAgICAgICAgCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNjk4OAorCisgICAg ICAgICogU3RvcmFnZS9XZWJEYXRhYmFzZU1hbmFnZXIubW06CisgICAgICAgICgtW1dlYkRhdGFi YXNlTWFuYWdlciBkZWxldGVPcmlnaW46XSk6CisgICAgICAgICgtW1dlYkRhdGFiYXNlTWFuYWdl ciBkZWxldGVEYXRhYmFzZTp3aXRoT3JpZ2luOl0pOgorICAgICAgICAqIFN0b3JhZ2UvV2ViRGF0 YWJhc2VNYW5hZ2VyUHJpdmF0ZS5oOgorCiAyMDEwLTA0LTAxICBBbGV4ZXkgUHJvc2t1cnlha292 ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJbmRl eDogV2ViS2l0L21hYy9TdG9yYWdlL1dlYkRhdGFiYXNlTWFuYWdlci5tbQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXQvbWFjL1N0b3JhZ2UvV2ViRGF0YWJhc2VNYW5hZ2VyLm1tCShyZXZpc2lvbiA1Njk0 NikKKysrIFdlYktpdC9tYWMvU3RvcmFnZS9XZWJEYXRhYmFzZU1hbmFnZXIubW0JKHdvcmtpbmcg Y29weSkKQEAgLTEwNywxNCArMTA3LDE0IEBAIC0gKHZvaWQpZGVsZXRlQWxsRGF0YWJhc2VzCiAg ICAgRGF0YWJhc2VUcmFja2VyOjp0cmFja2VyKCkuZGVsZXRlQWxsRGF0YWJhc2VzKCk7CiB9CiAK LS0gKHZvaWQpZGVsZXRlT3JpZ2luOihXZWJTZWN1cml0eU9yaWdpbiAqKW9yaWdpbgorLSAoQk9P TClkZWxldGVPcmlnaW46KFdlYlNlY3VyaXR5T3JpZ2luICopb3JpZ2luCiB7Ci0gICAgRGF0YWJh c2VUcmFja2VyOjp0cmFja2VyKCkuZGVsZXRlT3JpZ2luKFtvcmlnaW4gX2NvcmVdKTsKKyAgICBy ZXR1cm4gRGF0YWJhc2VUcmFja2VyOjp0cmFja2VyKCkuZGVsZXRlT3JpZ2luKFtvcmlnaW4gX2Nv cmVdKTsKIH0KIAotLSAodm9pZClkZWxldGVEYXRhYmFzZTooTlNTdHJpbmcgKilkYXRhYmFzZUlk ZW50aWZpZXIgd2l0aE9yaWdpbjooV2ViU2VjdXJpdHlPcmlnaW4gKilvcmlnaW4KKy0gKEJPT0wp ZGVsZXRlRGF0YWJhc2U6KE5TU3RyaW5nICopZGF0YWJhc2VJZGVudGlmaWVyIHdpdGhPcmlnaW46 KFdlYlNlY3VyaXR5T3JpZ2luICopb3JpZ2luCiB7Ci0gICAgRGF0YWJhc2VUcmFja2VyOjp0cmFj a2VyKCkuZGVsZXRlRGF0YWJhc2UoW29yaWdpbiBfY29yZV0sIGRhdGFiYXNlSWRlbnRpZmllcik7 CisgICAgcmV0dXJuIERhdGFiYXNlVHJhY2tlcjo6dHJhY2tlcigpLmRlbGV0ZURhdGFiYXNlKFtv cmlnaW4gX2NvcmVdLCBkYXRhYmFzZUlkZW50aWZpZXIpOwogfQogCiBAZW5kCkluZGV4OiBXZWJL aXQvbWFjL1N0b3JhZ2UvV2ViRGF0YWJhc2VNYW5hZ2VyUHJpdmF0ZS5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC9tYWMvU3RvcmFnZS9XZWJEYXRhYmFzZU1hbmFnZXJQcml2YXRlLmgJKHJldmlzaW9u IDU2OTQ2KQorKysgV2ViS2l0L21hYy9TdG9yYWdlL1dlYkRhdGFiYXNlTWFuYWdlclByaXZhdGUu aAkod29ya2luZyBjb3B5KQpAQCAtNjAsOCArNjAsOCBAQCBAaW50ZXJmYWNlIFdlYkRhdGFiYXNl TWFuYWdlciA6IE5TT2JqZWN0CiAtIChOU0RpY3Rpb25hcnkgKilkZXRhaWxzRm9yRGF0YWJhc2U6 KE5TU3RyaW5nICopZGF0YWJhc2VJZGVudGlmaWVyIHdpdGhPcmlnaW46KFdlYlNlY3VyaXR5T3Jp Z2luICopb3JpZ2luOwogCiAtICh2b2lkKWRlbGV0ZUFsbERhdGFiYXNlczsgLy8gRGVsZXRlcyBh bGwgZGF0YWJhc2VzIGFuZCBhbGwgb3JpZ2lucy4KLS0gKHZvaWQpZGVsZXRlT3JpZ2luOihXZWJT ZWN1cml0eU9yaWdpbiAqKW9yaWdpbjsKLS0gKHZvaWQpZGVsZXRlRGF0YWJhc2U6KE5TU3RyaW5n ICopZGF0YWJhc2VJZGVudGlmaWVyIHdpdGhPcmlnaW46KFdlYlNlY3VyaXR5T3JpZ2luICopb3Jp Z2luOworLSAoQk9PTClkZWxldGVPcmlnaW46KFdlYlNlY3VyaXR5T3JpZ2luICopb3JpZ2luOwor LSAoQk9PTClkZWxldGVEYXRhYmFzZTooTlNTdHJpbmcgKilkYXRhYmFzZUlkZW50aWZpZXIgd2l0 aE9yaWdpbjooV2ViU2VjdXJpdHlPcmlnaW4gKilvcmlnaW47CiAKIEBlbmQKIAo=