26640 2009-06-22 22:08:09 -0700 JSON.stringify needs to special case Boolean objects 2009-06-22 22:45:30 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 26249 1 oliver oliver oldest_to_newest 127570 0 oliver 2009-06-22 22:08:09 -0700 Boolean is special cased alongside Number and String objects now (http://wiki.ecmascript.org/lib/exe/fetch.php?id=es3.1%3Aes3.1_proposal_working_draft&cache=cache&media=es3.1:es5_candidate_errata_june_17.pdf) 127573 1 31705 oliver 2009-06-22 22:34:58 -0700 Created attachment 31705 Special case Boolean 127574 2 31705 ap 2009-06-22 22:42:31 -0700 Comment on attachment 31705 Special case Boolean r=me. LayoutTests/ChangeLog should mention that you added other primitive tests, not just booleans. 127575 3 oliver 2009-06-22 22:45:30 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M JavaScriptCore/ChangeLog M JavaScriptCore/runtime/JSONObject.cpp M LayoutTests/ChangeLog M LayoutTests/fast/js/JSON-stringify-expected.txt M LayoutTests/fast/js/resources/JSON-stringify.js M LayoutTests/fast/js/resources/json2-es5-compat.js Committed r44974 31705 2009-06-22 22:34:58 -0700 2009-06-22 22:42:31 -0700 Special case Boolean JSON.stringify.Boolean.patch text/plain 9011 oliver ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCA3YzBmZWM5Li4wNzRlMjYxIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAg QEAKIDIwMDktMDYtMjIgIE9saXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4KIAorICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBCdWcgMjY2NDA6IEpTT04u c3RyaW5naWZ5IG5lZWRzIHRvIHNwZWNpYWwgY2FzZSBCb29sZWFuIG9iamVjdHMKKyAgICAgICAg PGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjY0MD4KKworICAgICAg ICBBZGQgc3BlY2lhbCBjYXNlIGhhbmRsaW5nIG9mIHRoZSBCb29sZWFuIG9iamVjdCBzbyB3ZSBt YXRjaCBjdXJyZW50CisgICAgICAgIEVTNSBlcnJhdGEuCisKKyAgICAgICAgKiBydW50aW1lL0pT T05PYmplY3QuY3BwOgorICAgICAgICAoSlNDOjp1bndyYXBCb3hlZFByaW1pdGl2ZSk6IHJlbmFt ZWQgZnJvbSB1bndyYXBOdW1iZXJPclN0cmluZworICAgICAgICAoSlNDOjpnYXApOgorICAgICAg ICAoSlNDOjpTdHJpbmdpZmllcjo6YXBwZW5kU3RyaW5naWZpZWRWYWx1ZSk6CisKKzIwMDktMDYt MjIgIE9saXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4KKwogICAgICAgICBSZXZpZXdlZCBi eSBEYXJpbiBBZGxlci4KIAogICAgICAgICBCdWcgMjY1OTE6IFN1cHBvcnQgcmV2aXZlcnMgaW4g SlNPTi5wYXJzZQpkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09OT2JqZWN0 LmNwcCBiL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPTk9iamVjdC5jcHAKaW5kZXggZTM4NjY1 NC4uNGE4OWM1NSAxMDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09OT2JqZWN0 LmNwcAorKysgYi9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT05PYmplY3QuY3BwCkBAIC0yNiw2 ICsyNiw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiSlNPTk9iamVjdC5oIgog CisjaW5jbHVkZSAiQm9vbGVhbk9iamVjdC5oIgogI2luY2x1ZGUgIkVycm9yLmgiCiAjaW5jbHVk ZSAiRXhjZXB0aW9uSGVscGVycy5oIgogI2luY2x1ZGUgIkpTQXJyYXkuaCIKQEAgLTExOSwxOCAr MTIwLDE4IEBAIHByaXZhdGU6CiAKIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSBo ZWxwZXIgZnVuY3Rpb25zIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKLXN0YXRp YyBpbmxpbmUgSlNWYWx1ZSB1bndyYXBOdW1iZXJPclN0cmluZyhKU1ZhbHVlIHZhbHVlKQorc3Rh dGljIGlubGluZSBKU1ZhbHVlIHVud3JhcEJveGVkUHJpbWl0aXZlKEpTVmFsdWUgdmFsdWUpCiB7 CiAgICAgaWYgKCF2YWx1ZS5pc09iamVjdCgpKQogICAgICAgICByZXR1cm4gdmFsdWU7Ci0gICAg aWYgKCFhc09iamVjdCh2YWx1ZSktPmluaGVyaXRzKCZOdW1iZXJPYmplY3Q6OmluZm8pICYmICFh c09iamVjdCh2YWx1ZSktPmluaGVyaXRzKCZTdHJpbmdPYmplY3Q6OmluZm8pKQorICAgIGlmICgh YXNPYmplY3QodmFsdWUpLT5pbmhlcml0cygmTnVtYmVyT2JqZWN0OjppbmZvKSAmJiAhYXNPYmpl Y3QodmFsdWUpLT5pbmhlcml0cygmU3RyaW5nT2JqZWN0OjppbmZvKSAmJiAhYXNPYmplY3QodmFs dWUpLT5pbmhlcml0cygmQm9vbGVhbk9iamVjdDo6aW5mbykpCiAgICAgICAgIHJldHVybiB2YWx1 ZTsKICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8SlNXcmFwcGVyT2JqZWN0Kj4oYXNPYmplY3QodmFs dWUpKS0+aW50ZXJuYWxWYWx1ZSgpOwogfQogCiBzdGF0aWMgaW5saW5lIFVTdHJpbmcgZ2FwKEpT VmFsdWUgc3BhY2UpCiB7Ci0gICAgc3BhY2UgPSB1bndyYXBOdW1iZXJPclN0cmluZyhzcGFjZSk7 CisgICAgc3BhY2UgPSB1bndyYXBCb3hlZFByaW1pdGl2ZShzcGFjZSk7CiAKICAgICAvLyBJZiB0 aGUgc3BhY2UgdmFsdWUgaXMgYSBudW1iZXIsIGNyZWF0ZSBhIGdhcCBzdHJpbmcgd2l0aCB0aGF0 IG51bWJlciBvZiBzcGFjZXMuCiAgICAgZG91YmxlIHNwYWNlQ291bnQ7CkBAIC0zNTUsMTMgKzM1 NiwxMyBAQCBTdHJpbmdpZmllcjo6U3RyaW5naWZ5UmVzdWx0IFN0cmluZ2lmaWVyOjphcHBlbmRT dHJpbmdpZmllZFZhbHVlKFN0cmluZ0J1aWxkZXImCiAgICAgICAgIHJldHVybiBTdHJpbmdpZnlT dWNjZWVkZWQ7CiAgICAgfQogCisgICAgdmFsdWUgPSB1bndyYXBCb3hlZFByaW1pdGl2ZSh2YWx1 ZSk7CisKICAgICBpZiAodmFsdWUuaXNCb29sZWFuKCkpIHsKICAgICAgICAgYnVpbGRlci5hcHBl bmQodmFsdWUuZ2V0Qm9vbGVhbigpID8gInRydWUiIDogImZhbHNlIik7CiAgICAgICAgIHJldHVy biBTdHJpbmdpZnlTdWNjZWVkZWQ7CiAgICAgfQogCi0gICAgdmFsdWUgPSB1bndyYXBOdW1iZXJP clN0cmluZyh2YWx1ZSk7Ci0KICAgICBVU3RyaW5nIHN0cmluZ1ZhbHVlOwogICAgIGlmICh2YWx1 ZS5nZXRTdHJpbmcoc3RyaW5nVmFsdWUpKSB7CiAgICAgICAgIGFwcGVuZFF1b3RlZFN0cmluZyhi dWlsZGVyLCBzdHJpbmdWYWx1ZSk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYWIzODQ3Mi4uOGQ0YzYwYiAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE3IEBACisyMDA5LTA2LTIyICBPbGl2ZXIgSHVudCAgPG9saXZlckBhcHBsZS5jb20+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQnVnIDI2 NjQwOiBKU09OLnN0cmluZ2lmeSBuZWVkcyB0byBzcGVjaWFsIGNhc2UgQm9vbGVhbiBvYmplY3Rz CisgICAgICAgIDxodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjY2NDA+ CisKKyAgICAgICAgQWRkIHRlc3RzIGZvciBib29sZWFuIGFuZCBCb29sZWFuIHNlcmlhbGlzYXRp b24uCisKKyAgICAgICAgKiBmYXN0L2pzL0pTT04tc3RyaW5naWZ5LWV4cGVjdGVkLnR4dDoKKyAg ICAgICAgKiBmYXN0L2pzL3Jlc291cmNlcy9KU09OLXN0cmluZ2lmeS5qczoKKyAgICAgICAgKiBm YXN0L2pzL3Jlc291cmNlcy9qc29uMi1lczUtY29tcGF0LmpzOgorICAgICAgICAgIE1vZGlmeSBT dHIoKSB0byBtYXRjaCBFUzUgZXJyYXRhCisKIDIwMDktMDYtMjIgIFNhbSBXZWluaWcgIDxzYW1A d2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBHYXZpbiBCYXJyYWNsb3VnaC4KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvanMvSlNPTi1zdHJpbmdpZnktZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvZmFzdC9qcy9KU09OLXN0cmluZ2lmeS1leHBlY3RlZC50eHQKaW5kZXgg MzA3Y2Q0ZC4uMDMyNDlhYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9qcy9KU09OLXN0 cmluZ2lmeS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9qcy9KU09OLXN0cmlu Z2lmeS1leHBlY3RlZC50eHQKQEAgLTEsNCArMSw2OCBAQAogZnVuY3Rpb24gKGpzb25PYmplY3Qp IHsKKyAgICAgICAgcmV0dXJuIGpzb25PYmplY3Quc3RyaW5naWZ5KDEpOworICAgIH0KK1BBU1Mg dGVzdHNbaV0obmF0aXZlSlNPTikgaXMgdGVzdHNbaV0oSlNPTikKK2Z1bmN0aW9uIChqc29uT2Jq ZWN0KSB7CisgICAgICAgIHJldHVybiBqc29uT2JqZWN0LnN0cmluZ2lmeSgxLjUpOworICAgIH0K K1BBU1MgdGVzdHNbaV0obmF0aXZlSlNPTikgaXMgdGVzdHNbaV0oSlNPTikKK2Z1bmN0aW9uIChq c29uT2JqZWN0KSB7CisgICAgICAgIHJldHVybiBqc29uT2JqZWN0LnN0cmluZ2lmeSgtMSk7Cisg ICAgfQorUEFTUyB0ZXN0c1tpXShuYXRpdmVKU09OKSBpcyB0ZXN0c1tpXShKU09OKQorZnVuY3Rp b24gKGpzb25PYmplY3QpIHsKKyAgICAgICAgcmV0dXJuIGpzb25PYmplY3Quc3RyaW5naWZ5KC0x LjUpOworICAgIH0KK1BBU1MgdGVzdHNbaV0obmF0aXZlSlNPTikgaXMgdGVzdHNbaV0oSlNPTikK K2Z1bmN0aW9uIChqc29uT2JqZWN0KSB7CisgICAgICAgIHJldHVybiBqc29uT2JqZWN0LnN0cmlu Z2lmeShudWxsKTsKKyAgICB9CitQQVNTIHRlc3RzW2ldKG5hdGl2ZUpTT04pIGlzIHRlc3RzW2ld KEpTT04pCitmdW5jdGlvbiAoanNvbk9iamVjdCkgeworICAgICAgICByZXR1cm4ganNvbk9iamVj dC5zdHJpbmdpZnkoInN0cmluZyIpOworICAgIH0KK1BBU1MgdGVzdHNbaV0obmF0aXZlSlNPTikg aXMgdGVzdHNbaV0oSlNPTikKK2Z1bmN0aW9uIChqc29uT2JqZWN0KSB7CisgICAgICAgIHJldHVy biBqc29uT2JqZWN0LnN0cmluZ2lmeShuZXcgTnVtYmVyKDApKTsKKyAgICB9CitQQVNTIHRlc3Rz W2ldKG5hdGl2ZUpTT04pIGlzIHRlc3RzW2ldKEpTT04pCitmdW5jdGlvbiAoanNvbk9iamVjdCkg eworICAgICAgICByZXR1cm4ganNvbk9iamVjdC5zdHJpbmdpZnkobmV3IE51bWJlcigxKSk7Cisg ICAgfQorUEFTUyB0ZXN0c1tpXShuYXRpdmVKU09OKSBpcyB0ZXN0c1tpXShKU09OKQorZnVuY3Rp b24gKGpzb25PYmplY3QpIHsKKyAgICAgICAgcmV0dXJuIGpzb25PYmplY3Quc3RyaW5naWZ5KG5l dyBOdW1iZXIoMS41KSk7CisgICAgfQorUEFTUyB0ZXN0c1tpXShuYXRpdmVKU09OKSBpcyB0ZXN0 c1tpXShKU09OKQorZnVuY3Rpb24gKGpzb25PYmplY3QpIHsKKyAgICAgICAgcmV0dXJuIGpzb25P YmplY3Quc3RyaW5naWZ5KG5ldyBOdW1iZXIoLTEpKTsKKyAgICB9CitQQVNTIHRlc3RzW2ldKG5h dGl2ZUpTT04pIGlzIHRlc3RzW2ldKEpTT04pCitmdW5jdGlvbiAoanNvbk9iamVjdCkgeworICAg ICAgICByZXR1cm4ganNvbk9iamVjdC5zdHJpbmdpZnkobmV3IE51bWJlcigtMS41KSk7CisgICAg fQorUEFTUyB0ZXN0c1tpXShuYXRpdmVKU09OKSBpcyB0ZXN0c1tpXShKU09OKQorZnVuY3Rpb24g KGpzb25PYmplY3QpIHsKKyAgICAgICAgcmV0dXJuIGpzb25PYmplY3Quc3RyaW5naWZ5KG5ldyBT dHJpbmcoImEgc3RyaW5nIG9iamVjdCIpKTsKKyAgICB9CitQQVNTIHRlc3RzW2ldKG5hdGl2ZUpT T04pIGlzIHRlc3RzW2ldKEpTT04pCitmdW5jdGlvbiAoanNvbk9iamVjdCkgeworICAgICAgICBy ZXR1cm4ganNvbk9iamVjdC5zdHJpbmdpZnkobmV3IEJvb2xlYW4odHJ1ZSkpOworICAgIH0KK1BB U1MgdGVzdHNbaV0obmF0aXZlSlNPTikgaXMgdGVzdHNbaV0oSlNPTikKK2Z1bmN0aW9uIChqc29u T2JqZWN0KSB7CisgICAgICAgIHJldHVybiBqc29uT2JqZWN0LnN0cmluZ2lmeShuZXcgQm9vbGVh bihmYWxzZSkpOworICAgIH0KK1BBU1MgdGVzdHNbaV0obmF0aXZlSlNPTikgaXMgdGVzdHNbaV0o SlNPTikKK2Z1bmN0aW9uIChqc29uT2JqZWN0KSB7CisgICAgICAgIHJldHVybiBqc29uT2JqZWN0 LnN0cmluZ2lmeSh0cnVlKTsKKyAgICB9CitQQVNTIHRlc3RzW2ldKG5hdGl2ZUpTT04pIGlzIHRl c3RzW2ldKEpTT04pCitmdW5jdGlvbiAoanNvbk9iamVjdCkgeworICAgICAgICByZXR1cm4ganNv bk9iamVjdC5zdHJpbmdpZnkoZmFsc2UpOworICAgIH0KK1BBU1MgdGVzdHNbaV0obmF0aXZlSlNP TikgaXMgdGVzdHNbaV0oSlNPTikKK2Z1bmN0aW9uIChqc29uT2JqZWN0KSB7CiAgICAgICAgIHJl dHVybiBqc29uT2JqZWN0LnN0cmluZ2lmeShuZXcgRGF0ZSgwKSk7CiAgICAgfQogUEFTUyB0ZXN0 c1tpXShuYXRpdmVKU09OKSBpcyB0ZXN0c1tpXShKU09OKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvZmFzdC9qcy9yZXNvdXJjZXMvSlNPTi1zdHJpbmdpZnkuanMgYi9MYXlvdXRUZXN0cy9mYXN0 L2pzL3Jlc291cmNlcy9KU09OLXN0cmluZ2lmeS5qcwppbmRleCA0YjlhMDYyLi5lNDAyMzEzIDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2pzL3Jlc291cmNlcy9KU09OLXN0cmluZ2lmeS5q cworKysgYi9MYXlvdXRUZXN0cy9mYXN0L2pzL3Jlc291cmNlcy9KU09OLXN0cmluZ2lmeS5qcwpA QCAtNiw2ICs2LDU0IEBAIGZ1bmN0aW9uIGNyZWF0ZVRlc3RzKCkgewogICAgIHZhciBjb21wbGV4 T2JqZWN0ID0ge2E6IjEiLCBiOiIyIiwgYzoiMyIsIGQ6dW5kZWZpbmVkLCBlOm51bGwsICIiOjEy LCBnZXQgZigpeyByZXR1cm4gc2ltcGxlQXJyYXk7IH0sIGFycmF5OiBjb21wbGV4QXJyYXl9Owog ICAgIHZhciByZXN1bHQgPSBbXTsKICAgICByZXN1bHQucHVzaChmdW5jdGlvbihqc29uT2JqZWN0 KXsKKyAgICAgICAgcmV0dXJuIGpzb25PYmplY3Quc3RyaW5naWZ5KDEpOworICAgIH0pOworICAg IHJlc3VsdC5wdXNoKGZ1bmN0aW9uKGpzb25PYmplY3QpeworICAgICAgICByZXR1cm4ganNvbk9i amVjdC5zdHJpbmdpZnkoMS41KTsKKyAgICB9KTsKKyAgICByZXN1bHQucHVzaChmdW5jdGlvbihq c29uT2JqZWN0KXsKKyAgICAgICAgcmV0dXJuIGpzb25PYmplY3Quc3RyaW5naWZ5KC0xKTsKKyAg ICB9KTsKKyAgICByZXN1bHQucHVzaChmdW5jdGlvbihqc29uT2JqZWN0KXsKKyAgICAgICAgcmV0 dXJuIGpzb25PYmplY3Quc3RyaW5naWZ5KC0xLjUpOworICAgIH0pOworICAgIHJlc3VsdC5wdXNo KGZ1bmN0aW9uKGpzb25PYmplY3QpeworICAgICAgICByZXR1cm4ganNvbk9iamVjdC5zdHJpbmdp ZnkobnVsbCk7CisgICAgfSk7CisgICAgcmVzdWx0LnB1c2goZnVuY3Rpb24oanNvbk9iamVjdCl7 CisgICAgICAgIHJldHVybiBqc29uT2JqZWN0LnN0cmluZ2lmeSgic3RyaW5nIik7CisgICAgfSk7 CisgICAgcmVzdWx0LnB1c2goZnVuY3Rpb24oanNvbk9iamVjdCl7CisgICAgICAgIHJldHVybiBq c29uT2JqZWN0LnN0cmluZ2lmeShuZXcgTnVtYmVyKDApKTsKKyAgICB9KTsKKyAgICByZXN1bHQu cHVzaChmdW5jdGlvbihqc29uT2JqZWN0KXsKKyAgICAgICAgcmV0dXJuIGpzb25PYmplY3Quc3Ry aW5naWZ5KG5ldyBOdW1iZXIoMSkpOworICAgIH0pOworICAgIHJlc3VsdC5wdXNoKGZ1bmN0aW9u KGpzb25PYmplY3QpeworICAgICAgICByZXR1cm4ganNvbk9iamVjdC5zdHJpbmdpZnkobmV3IE51 bWJlcigxLjUpKTsKKyAgICB9KTsKKyAgICByZXN1bHQucHVzaChmdW5jdGlvbihqc29uT2JqZWN0 KXsKKyAgICAgICAgcmV0dXJuIGpzb25PYmplY3Quc3RyaW5naWZ5KG5ldyBOdW1iZXIoLTEpKTsK KyAgICB9KTsKKyAgICByZXN1bHQucHVzaChmdW5jdGlvbihqc29uT2JqZWN0KXsKKyAgICAgICAg cmV0dXJuIGpzb25PYmplY3Quc3RyaW5naWZ5KG5ldyBOdW1iZXIoLTEuNSkpOworICAgIH0pOwor ICAgIHJlc3VsdC5wdXNoKGZ1bmN0aW9uKGpzb25PYmplY3QpeworICAgICAgICByZXR1cm4ganNv bk9iamVjdC5zdHJpbmdpZnkobmV3IFN0cmluZygiYSBzdHJpbmcgb2JqZWN0IikpOworICAgIH0p OworICAgIHJlc3VsdC5wdXNoKGZ1bmN0aW9uKGpzb25PYmplY3QpeworICAgICAgICByZXR1cm4g anNvbk9iamVjdC5zdHJpbmdpZnkobmV3IEJvb2xlYW4odHJ1ZSkpOworICAgIH0pOworICAgIHJl c3VsdC5wdXNoKGZ1bmN0aW9uKGpzb25PYmplY3QpeworICAgICAgICByZXR1cm4ganNvbk9iamVj dC5zdHJpbmdpZnkobmV3IEJvb2xlYW4oZmFsc2UpKTsKKyAgICB9KTsKKyAgICByZXN1bHQucHVz aChmdW5jdGlvbihqc29uT2JqZWN0KXsKKyAgICAgICAgcmV0dXJuIGpzb25PYmplY3Quc3RyaW5n aWZ5KHRydWUpOworICAgIH0pOworICAgIHJlc3VsdC5wdXNoKGZ1bmN0aW9uKGpzb25PYmplY3Qp eworICAgICAgICByZXR1cm4ganNvbk9iamVjdC5zdHJpbmdpZnkoZmFsc2UpOworICAgIH0pOwor ICAgIHJlc3VsdC5wdXNoKGZ1bmN0aW9uKGpzb25PYmplY3QpewogICAgICAgICByZXR1cm4ganNv bk9iamVjdC5zdHJpbmdpZnkobmV3IERhdGUoMCkpOwogICAgIH0pOwogICAgIHJlc3VsdC5wdXNo KGZ1bmN0aW9uKGpzb25PYmplY3QpewpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9qcy9y ZXNvdXJjZXMvanNvbjItZXM1LWNvbXBhdC5qcyBiL0xheW91dFRlc3RzL2Zhc3QvanMvcmVzb3Vy Y2VzL2pzb24yLWVzNS1jb21wYXQuanMKaW5kZXggZmRiNDZjNi4uMDQ3YjNkNCAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvZmFzdC9qcy9yZXNvdXJjZXMvanNvbjItZXM1LWNvbXBhdC5qcworKysg Yi9MYXlvdXRUZXN0cy9mYXN0L2pzL3Jlc291cmNlcy9qc29uMi1lczUtY29tcGF0LmpzCkBAIC0x NzksMTIgKzE3OSw2IEBAIGlmICghdGhpcy5KU09OKSB7CiAgICAgICAgICAgICAgICAgIGYodGhp cy5nZXRVVENNaW51dGVzKCkpICAgKyAnOicgKwogICAgICAgICAgICAgICAgICBmKHRoaXMuZ2V0 VVRDU2Vjb25kcygpKSAgICsgJ1onOwogICAgICAgICB9OwotCi0gICAgICAgIFN0cmluZy5wcm90 b3R5cGUudG9KU09OID0KLSAgICAgICAgTnVtYmVyLnByb3RvdHlwZS50b0pTT04gPQotICAgICAg ICBCb29sZWFuLnByb3RvdHlwZS50b0pTT04gPSBmdW5jdGlvbiAoa2V5KSB7Ci0gICAgICAgICAg ICByZXR1cm4gdGhpcy52YWx1ZU9mKCk7Ci0gICAgICAgIH07CiAgICAgfQogCiAgICAgdmFyIGN4 ID0gL1tcdTAwMDBcdTAwYWRcdTA2MDAtXHUwNjA0XHUwNzBmXHUxN2I0XHUxN2I1XHUyMDBjLVx1 MjAwZlx1MjAyOC1cdTIwMmZcdTIwNjAtXHUyMDZmXHVmZWZmXHVmZmYwLVx1ZmZmZl0vZywKQEAg LTI0OSw2ICsyNDMsMTEgQEAgaWYgKCF0aGlzLkpTT04pIHsKIAogLy8gV2hhdCBoYXBwZW5zIG5l eHQgZGVwZW5kcyBvbiB0aGUgdmFsdWUncyB0eXBlLgogCisgICAgICAgIGlmICh2YWx1ZSAmJiAo KHR5cGVvZiB2YWx1ZSkgPT09ICJvYmplY3QiKSkgeworICAgICAgICAgICAgaWYgKHZhbHVlLmNv bnN0cnVjdG9yID09PSBTdHJpbmcgfHwgdmFsdWUuY29uc3RydWN0b3IgPT09IE51bWJlciB8fCB2 YWx1ZS5jb25zdHJ1Y3RvciA9PT0gQm9vbGVhbikKKyAgICAgICAgICAgICAgICB2YWx1ZSA9IHZh bHVlLnZhbHVlT2YoKTsKKyAgICAgICAgfQorCiAgICAgICAgIHN3aXRjaCAodHlwZW9mIHZhbHVl KSB7CiAgICAgICAgIGNhc2UgJ3N0cmluZyc6CiAgICAgICAgICAgICByZXR1cm4gcXVvdGUodmFs dWUpOwo=