152033 2015-12-08 20:10:35 -0800 Web Inspector: Adopt Number.prototype.toLocaleString For All Sizes and Times 2016-04-16 18:25:58 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 147605 1 timothy mattbaker bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1147578 0 timothy 2015-12-08 20:10:35 -0800 We can make our number utilities use this to get proper localization for numbers. 1147581 1 webkit-bug-importer 2015-12-08 20:11:00 -0800 <rdar://problem/23815589> 1147582 2 timothy 2015-12-08 20:11:25 -0800 Support landed in http://trac.webkit.org/changeset/193493. 1147871 3 timothy 2015-12-09 11:24:34 -0800 <rdar://problem/6869032> 1150073 4 bburg 2015-12-17 14:20:25 -0800 This won't do anything (formatting or locale-specific formatting) until Intl.NumberFormat is implemented. 1184174 5 276496 mattbaker 2016-04-15 12:43:45 -0700 Created attachment 276496 [Patch] Proposed Fix 1184179 6 276496 joepeck 2016-04-15 12:50:47 -0700 Comment on attachment 276496 [Patch] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=276496&action=review > Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js:605 > + let value = typeof obj.value === "number" ? obj.value : obj.description; > + return String.standardFormatters.f(value, token); We should have a test for this given it is a behavior change. For instance, this affects console.log("%.3f", Math.PI). 1184187 7 mattbaker 2016-04-15 13:01:33 -0700 (In reply to comment #6) > Comment on attachment 276496 [details] > [Patch] Proposed Fix > > View in context: > https://bugs.webkit.org/attachment.cgi?id=276496&action=review > > > Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js:605 > > + let value = typeof obj.value === "number" ? obj.value : obj.description; > > + return String.standardFormatters.f(value, token); > > We should have a test for this given it is a behavior change. For instance, > this affects console.log("%.3f", Math.PI). I looked at adding console tests, but wasn't sure how to go about it since message formatting is done at the view level. 1184408 8 276496 commit-queue 2016-04-16 18:25:55 -0700 Comment on attachment 276496 [Patch] Proposed Fix Clearing flags on attachment: 276496 Committed r199635: <http://trac.webkit.org/changeset/199635> 1184409 9 commit-queue 2016-04-16 18:25:58 -0700 All reviewed patches have been landed. Closing bug. 276496 2016-04-15 12:43:45 -0700 2016-04-16 18:25:55 -0700 [Patch] Proposed Fix bug-152033-20160415124359.patch text/plain 21955 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5NjA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBj NjcwZmJjNzEyNzI3ZGU4NjA4ZjdmY2Q5YTUwYzFhYjJmZjEyYmE5Li5lNDdhZGU0N2U5MTc5YTlm MjkwZGE4M2M2ZDkwZTQ4ODM5ODY2M2MyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw2MCBAQAorMjAxNi0wNC0xNSAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQWRvcHQgTnVtYmVyLnByb3RvdHlwZS50b0xvY2Fs ZVN0cmluZyBGb3IgQWxsIFNpemVzIGFuZCBUaW1lcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUyMDMzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8y MzgxNTU4OT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBVcGRhdGUgc3RyaW5nIGZvcm1hdHRlcnMgdG8gbG9jYWxpemUgZmxvYXQgYW5kIHBlcmNlbnRh Z2Ugc3RyaW5ncy4gSG9vayB1cAorICAgICAgICBjb25zb2xlIG1lc3NhZ2UgZm9ybWF0dGVycyB0 byB1c2UgU3RyaW5nLnN0YW5kYXJkRm9ybWF0dGVycyBzbyB0aGF0IGNvbnNvbGUKKyAgICAgICAg c3RhdGVtZW50cyAoZS5nLiBjb25zb2xlLmxvZygiJS4zZiIsIDMuMTQxNTkpKSBhcmUgcHJvcGVy bHkgZm9ybWF0dGVkLgorCisgICAgICAgICogTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6 ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanM6 CisgICAgICAgICh2YWx1ZSk6CisgICAgICAgIHRva2VuaXplRm9ybWF0U3RyaW5nIHNob3VsZCBk ZWZhdWx0IHRvIDYgZGlnaXRzIHdoZW4gbm8gcHJlY2lzaW9uCisgICAgICAgIHN1Yi1zcGVjaWZp ZXIgaXMgcHJvdmlkZWQuCisKKyAgICAgICAgcGVyY2VudGFnZVN0cmluZyBzaG91bGQgbG9jYWxp emUgZm9ybWF0dGluZywgYW5kIHRha2UgYSBmcmFjdGlvbiB2YWx1ZQorICAgICAgICAoMCB0byAx KSBpbnN0ZWFkIG9mIGEgcGVyY2VudGFnZS4KKworICAgICAgICBzZWNvbmRzVG9TdHJpbmcgc2hv dWxkIHBlcmZvcm0gc3BlY2lhbC1jYXNlIGZvcm1hdHRpbmcgZm9yIHplcm8gdmFsdWVzCisgICAg ICAgICgiMG1zIikgaW5zdGVhZCBvZiB0aGUgZ2VuZXJhbCBwdXJwb3NlIGZsb2F0IGZvcm1hdHRl ci4KKworICAgICAgICAodmFsdWUuZCk6CisgICAgICAgIFN3aXRjaCB0byBwYXJzZUludCB0byBm bG9vciBmbG9hdGluZyBwb2ludCB2YWx1ZXMgYW5kIHN1cHBvcnQgbnVtZXJpYyBzdHJpbmdzLgor ICAgICAgICBSZXR1cm4gTmFOIGluc3RlYWQgb2YgemVybyB3aGVuIHBhc3NlZCBhIHZhbHVlIHRo YXQgY2FuJ3QgYmUgY29udmVydGVkIHRvIGludGVnZXIuCisKKyAgICAgICAgKHZhbHVlLmYpOgor ICAgICAgICBTd2l0Y2ggdG8gcGFyc2VGbG9hdCB0byBzdXBwb3J0IG51bWVyaWMgc3RyaW5ncywg YW5kIGxvY2FsaXplIGZvcm1hdHRpbmcuCisgICAgICAgIFJlbW92ZSBwcmVjaXNpb24gY2hlY2ss IGFzIGl0IHdpbGwgbmV2ZXIgYmUgbGVzcyB0aGFuIHplcm8uIFJldHVybiBOYU4KKyAgICAgICAg aW5zdGVhZCBvZiB6ZXJvIHdoZW4gcGFzc2VkIGEgdmFsdWUgdGhhdCBjYW4ndCBiZSBjb252ZXJ0 ZWQgdG8gZmxvYXQuCisKKyAgICAgICAgKHByZXR0eUZ1bmN0aW9uTmFtZSk6CisgICAgICAgIENv bnZlcnQgc3Vic3RpdHV0aW9ucyAoYW4gYXJndW1lbnRzIG9iamVjdCkgdG8gYW4gYXJyYXkgYmVm b3JlIGNhbGxpbmcgam9pbi4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29uc29s ZU1lc3NhZ2VWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlVmll dy5wcm90b3R5cGUuX2Zvcm1hdFdpdGhTdWJzdGl0dXRpb25TdHJpbmcuZmxvYXRGb3JtYXR0ZXIp OgorICAgICAgICBVc2UgU3RyaW5nLnN0YW5kYXJkRm9ybWF0dGVycy5mLgorCisgICAgICAgIChX ZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2VWaWV3LnByb3RvdHlwZS5fZm9ybWF0V2l0aFN1YnN0 aXR1dGlvblN0cmluZy5pbnRlZ2VyRm9ybWF0dGVyKToKKyAgICAgICAgVXNlIFN0cmluZy5zdGFu ZGFyZEZvcm1hdHRlcnMuZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0 VGltZWxpbmVEYXRhR3JpZE5vZGUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTGF5b3V0VGlt ZWxpbmVEYXRhR3JpZE5vZGUucHJvdG90eXBlLmNyZWF0ZUNlbGxDb250ZW50KToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGluZURhdGFHcmlkTm9kZSk6CisgICAgICAgIFVzZSBp bnRlZ2VyIGZvcm1hdHRpbmcgZm9yIHBpeGVsIHZhbHVlcy4KKworICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvUHJvZmlsZURhdGFHcmlkTm9kZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5Qcm9maWxlRGF0YUdyaWROb2RlLnByb3RvdHlwZS5fcmVjYWxjdWxhdGVEYXRhKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5Qcm9maWxlRGF0YUdyaWROb2RlLnByb3RvdHlwZS5fdG90YWxUaW1l Q29udGVudCk6CisgICAgICAgIFRyZWF0IHBlcmNlbnRhZ2UgYXMgYSBmcmFjdGlvbiBmcm9tIDAg dG8gMS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VEZXRhaWxzU2lk ZWJhclBhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlRGV0YWlsc1NpZGVi YXJQYW5lbC5wcm90b3R5cGUuX3JlZnJlc2hJbWFnZVNpemVTZWN0aW9uKToKKyAgICAgICAgVXNl IGludGVnZXIgZm9ybWF0dGluZyBmb3IgcGl4ZWwgdmFsdWVzLgorCiAyMDE2LTA0LTE1ICBKb3Nl cGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3Rv cjogc291cmNlTWFwcGluZ1VSTCBub3QgdXNlZCB3aGVuIHNvdXJjZVVSTCBpcyBzZXQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2Fs aXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5s cHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IGU2ZmY3Y2MzZjZmMDQzZDFhZTkxNTc3M2Iw YzBlYjYxYmMxMmU1YjYuLmM2OTM1ZGQzNzRjMjZmZTg2MjkyZDlkZmIzZmRmMDM0ZTliMzc3MzUg MTAwNjQ0CkdJVCBiaW5hcnkgcGF0Y2gKZGVsdGEgNzIKemNtZG1WbXZ6JSEpKHkmPjt3Y09UMz42 R1k0NnpJZjQ3TmI1I0d1TG02cX4lQHh+P1JjMShlLXtGNWxlMXh4SW10CkgoSV4hRmktezBACgpk ZWx0YSA3Mgp6Y21kbVZtdnolISkoeSY+OyVOKjgzPjZHWTQ2eklmNDdOYjUjR3VMbTZxfiVAeH4/ UmMxKGUte0Y1bGUxeHhJbXQKSChJXiFGakk5dWIKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzCmluZGV4IGFhN2QzM2MyMmQz NzZhZmU3NDM0YTNlYjY1OTFmN2FiNzNkZjAzMWIuLjYyMmQzZmZkNTUyZTI3NjZmYWZkODY0ZTA3 MDJlYjBiMmNjZTYyNjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzCkBAIC02NDAsMTUgKzY0MCwxNyBAQCBPYmplY3Qu ZGVmaW5lUHJvcGVydHkoU3RyaW5nLCAidG9rZW5pemVGb3JtYXRTdHJpbmciLAogICAgICAgICAg ICAgICAgIH0KICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgdmFyIHByZWNpc2lvbiA9IC0x OworICAgICAgICAgICAgY29uc3QgZGVmYXVsdFByZWNpc2lvbiA9IDY7CisKKyAgICAgICAgICAg IGxldCBwcmVjaXNpb24gPSBkZWZhdWx0UHJlY2lzaW9uOwogICAgICAgICAgICAgaWYgKGZvcm1h dFtpbmRleF0gPT09ICIuIikgewogICAgICAgICAgICAgICAgIC8vIFRoaXMgaXMgYSBwcmVjaXNp b24gc3BlY2lmaWVyLiBJZiBubyBkaWdpdCBmb2xsb3dzIHRoZSAiLiIsCi0gICAgICAgICAgICAg ICAgLy8gdGhlbiB0aGUgcHJlY2lzaW9uIHNob3VsZCBiZSB6ZXJvLgorICAgICAgICAgICAgICAg IC8vIHRoZW4gdXNlIHRoZSBkZWZhdWx0IHByZWNpc2lvbiBvZiBzaXggZGlnaXRzIChJU08gQzk5 IHNwZWNpZmljYXRpb24pLgogICAgICAgICAgICAgICAgICsraW5kZXg7CiAKICAgICAgICAgICAg ICAgICBwcmVjaXNpb24gPSBwYXJzZUludChmb3JtYXQuc3Vic3RyaW5nKGluZGV4KSwgMTApOwog ICAgICAgICAgICAgICAgIGlmIChpc05hTihwcmVjaXNpb24pKQotICAgICAgICAgICAgICAgICAg ICBwcmVjaXNpb24gPSAwOworICAgICAgICAgICAgICAgICAgICBwcmVjaXNpb24gPSBkZWZhdWx0 UHJlY2lzaW9uOwogCiAgICAgICAgICAgICAgICAgd2hpbGUgKCFpc05hTihmb3JtYXRbaW5kZXhd KSkKICAgICAgICAgICAgICAgICAgICAgKytpbmRleDsKQEAgLTcxNSwxNCArNzE3LDIxIEBAIE9i amVjdC5kZWZpbmVQcm9wZXJ0eShTdHJpbmcsICJzdGFuZGFyZEZvcm1hdHRlcnMiLAogICAgIHZh bHVlOiB7CiAgICAgICAgIGQ6IGZ1bmN0aW9uKHN1YnN0aXR1dGlvbikKICAgICAgICAgewotICAg ICAgICAgICAgcmV0dXJuICFpc05hTihzdWJzdGl0dXRpb24pID8gc3Vic3RpdHV0aW9uIDogMDsK KyAgICAgICAgICAgIHJldHVybiBwYXJzZUludChzdWJzdGl0dXRpb24pOwogICAgICAgICB9LAog CiAgICAgICAgIGY6IGZ1bmN0aW9uKHN1YnN0aXR1dGlvbiwgdG9rZW4pCiAgICAgICAgIHsKLSAg ICAgICAgICAgIGlmIChzdWJzdGl0dXRpb24gJiYgdG9rZW4ucHJlY2lzaW9uID4gLTEpCi0gICAg ICAgICAgICAgICAgc3Vic3RpdHV0aW9uID0gc3Vic3RpdHV0aW9uLnRvRml4ZWQodG9rZW4ucHJl Y2lzaW9uKTsKLSAgICAgICAgICAgIHJldHVybiAhaXNOYU4oc3Vic3RpdHV0aW9uKSA/IHN1YnN0 aXR1dGlvbiA6ICh0b2tlbi5wcmVjaXNpb24gPiAtMSA/IE51bWJlcigwKS50b0ZpeGVkKHRva2Vu LnByZWNpc2lvbikgOiAwKTsKKyAgICAgICAgICAgIGxldCB2YWx1ZSA9IHBhcnNlRmxvYXQoc3Vi c3RpdHV0aW9uKTsKKyAgICAgICAgICAgIGlmIChpc05hTih2YWx1ZSkpCisgICAgICAgICAgICAg ICAgcmV0dXJuIE5hTjsKKworICAgICAgICAgICAgbGV0IG9wdGlvbnMgPSB7CisgICAgICAgICAg ICAgICAgbWluaW11bUZyYWN0aW9uRGlnaXRzOiB0b2tlbi5wcmVjaXNpb24sCisgICAgICAgICAg ICAgICAgbWF4aW11bUZyYWN0aW9uRGlnaXRzOiB0b2tlbi5wcmVjaXNpb24sCisgICAgICAgICAg ICAgICAgdXNlR3JvdXBpbmc6IGZhbHNlCisgICAgICAgICAgICB9OworICAgICAgICAgICAgcmV0 dXJuIHZhbHVlLnRvTG9jYWxlU3RyaW5nKHVuZGVmaW5lZCwgb3B0aW9ucyk7CiAgICAgICAgIH0s CiAKICAgICAgICAgczogZnVuY3Rpb24oc3Vic3RpdHV0aW9uKQpAQCAtNzQxLDcgKzc1MCw3IEBA IE9iamVjdC5kZWZpbmVQcm9wZXJ0eShTdHJpbmcsICJmb3JtYXQiLAogCiAgICAgICAgIGZ1bmN0 aW9uIHByZXR0eUZ1bmN0aW9uTmFtZSgpCiAgICAgICAgIHsKLSAgICAgICAgICAgIHJldHVybiAi U3RyaW5nLmZvcm1hdChcIiIgKyBmb3JtYXQgKyAiXCIsIFwiIiArIHN1YnN0aXR1dGlvbnMuam9p bigiXCIsIFwiIikgKyAiXCIpIjsKKyAgICAgICAgICAgIHJldHVybiAiU3RyaW5nLmZvcm1hdChc IiIgKyBmb3JtYXQgKyAiXCIsIFwiIiArIEFycmF5LmZyb20oc3Vic3RpdHV0aW9ucykuam9pbigi XCIsIFwiIikgKyAiXCIpIjsKICAgICAgICAgfQogCiAgICAgICAgIGZ1bmN0aW9uIHdhcm4obXNn KQpAQCAtOTEyLDEwICs5MjEsMTAgQEAgT2JqZWN0LmRlZmluZVByb3BlcnR5KE51bWJlciwgImNv bnN0cmFpbiIsCiAKIE9iamVjdC5kZWZpbmVQcm9wZXJ0eShOdW1iZXIsICJwZXJjZW50YWdlU3Ry aW5nIiwKIHsKLSAgICB2YWx1ZTogZnVuY3Rpb24ocGVyY2VudCwgcHJlY2lzaW9uID0gMSkKKyAg ICB2YWx1ZTogZnVuY3Rpb24oZnJhY3Rpb24sIHByZWNpc2lvbiA9IDEpCiAgICAgewotICAgICAg ICBjb25zb2xlLmFzc2VydChwZXJjZW50ID49IDAgJiYgcGVyY2VudCA8PSAxMDApOwotICAgICAg ICByZXR1cm4gcGVyY2VudC50b0ZpeGVkKHByZWNpc2lvbikgKyAiJSI7CisgICAgICAgIGNvbnNv bGUuYXNzZXJ0KGZyYWN0aW9uID49IDAgJiYgZnJhY3Rpb24gPD0gMSk7CisgICAgICAgIHJldHVy biBmcmFjdGlvbi50b0xvY2FsZVN0cmluZyh1bmRlZmluZWQsIHttaW5pbXVtRnJhY3Rpb25EaWdp dHM6IHByZWNpc2lvbiwgc3R5bGU6ICJwZXJjZW50In0pOwogICAgIH0KIH0pOwogCkBAIC05MzYs NiArOTQ1LDggQEAgT2JqZWN0LmRlZmluZVByb3BlcnR5KE51bWJlciwgInNlY29uZHNUb1N0cmlu ZyIsCiAgICAgdmFsdWU6IGZ1bmN0aW9uKHNlY29uZHMsIGhpZ2hlclJlc29sdXRpb24pCiAgICAg ewogICAgICAgICBsZXQgbXMgPSBzZWNvbmRzICogMTAwMDsKKyAgICAgICAgaWYgKCFtcykKKyAg ICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIiUuMGZtcyIpLmZvcm1hdCgw KTsKIAogICAgICAgICBpZiAoTWF0aC5hYnMobXMpIDwgMTApIHsKICAgICAgICAgICAgIGlmICho aWdoZXJSZXNvbHV0aW9uKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvQ29uc29sZU1lc3NhZ2VWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29uc29sZU1lc3NhZ2VWaWV3LmpzCmluZGV4IDZmNTcz Njk5MjQxMDA3MzRkMjQzODE4YzI3NGE4ZjJkMTE4YmIzYzQuLjU2YWI3MTY1OWJmNTU3NzIzNjI1 NjBjNGI5ZTA5NzExZmEyZWNmZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0NvbnNvbGVNZXNzYWdlVmlldy5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlTWVzc2FnZVZpZXcuanMKQEAg LTU5OSwxOCArNTk5LDE2IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZVZpZXcgPSBjbGFz cyBDb25zb2xlTWVzc2FnZVZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuCiAgICAgICAgICAgICBy ZXR1cm4gb2JqLmRlc2NyaXB0aW9uOwogICAgICAgICB9CiAKLSAgICAgICAgZnVuY3Rpb24gZmxv YXRGb3JtYXR0ZXIob2JqKQorICAgICAgICBmdW5jdGlvbiBmbG9hdEZvcm1hdHRlcihvYmosIHRv a2VuKQogICAgICAgICB7Ci0gICAgICAgICAgICBpZiAodHlwZW9mIG9iai52YWx1ZSAhPT0gIm51 bWJlciIpCi0gICAgICAgICAgICAgICAgcmV0dXJuIHBhcnNlRmxvYXQob2JqLmRlc2NyaXB0aW9u KTsKLSAgICAgICAgICAgIHJldHVybiBvYmoudmFsdWU7CisgICAgICAgICAgICBsZXQgdmFsdWUg PSB0eXBlb2Ygb2JqLnZhbHVlID09PSAibnVtYmVyIiA/IG9iai52YWx1ZSA6IG9iai5kZXNjcmlw dGlvbjsKKyAgICAgICAgICAgIHJldHVybiBTdHJpbmcuc3RhbmRhcmRGb3JtYXR0ZXJzLmYodmFs dWUsIHRva2VuKTsKICAgICAgICAgfQogCiAgICAgICAgIGZ1bmN0aW9uIGludGVnZXJGb3JtYXR0 ZXIob2JqKQogICAgICAgICB7Ci0gICAgICAgICAgICBpZiAodHlwZW9mIG9iai52YWx1ZSAhPT0g Im51bWJlciIpCi0gICAgICAgICAgICAgICAgcmV0dXJuIHBhcnNlSW50KG9iai5kZXNjcmlwdGlv bik7Ci0gICAgICAgICAgICByZXR1cm4gTWF0aC5mbG9vcihvYmoudmFsdWUpOworICAgICAgICAg ICAgbGV0IHZhbHVlID0gdHlwZW9mIG9iai52YWx1ZSA9PT0gIm51bWJlciIgPyBvYmoudmFsdWUg OiBvYmouZGVzY3JpcHRpb247CisgICAgICAgICAgICByZXR1cm4gU3RyaW5nLnN0YW5kYXJkRm9y bWF0dGVycy5kKHZhbHVlKTsKICAgICAgICAgfQogCiAgICAgICAgIHZhciBjdXJyZW50U3R5bGUg PSBudWxsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvTGF5b3V0VGltZWxpbmVEYXRhR3JpZE5vZGUuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXRUaW1lbGluZURhdGFHcmlkTm9kZS5qcwppbmRl eCA2MTA4NjdhYTM2MzgxYTFkMGE5ODg3MmM0MTU3ZGY4NzFkZTI0MWU4Li5iODU5ZWZjNjk3MGM5 OGFkNGQyZWNjZjBjMjgxYWE0OTA5OTBiZGYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXRUaW1lbGluZURhdGFHcmlkTm9kZS5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXRUaW1l bGluZURhdGFHcmlkTm9kZS5qcwpAQCAtNjgsMTAgKzY4LDEwIEBAIFdlYkluc3BlY3Rvci5MYXlv dXRUaW1lbGluZURhdGFHcmlkTm9kZSA9IGNsYXNzIExheW91dFRpbWVsaW5lRGF0YUdyaWROb2Rl IGV4dGVuCiAKICAgICAgICAgY2FzZSAid2lkdGgiOgogICAgICAgICBjYXNlICJoZWlnaHQiOgot ICAgICAgICAgICAgcmV0dXJuIGlzTmFOKHZhbHVlKSA/IGVtRGFzaCA6IFdlYkluc3BlY3Rvci5V SVN0cmluZygiJWZweCIpLmZvcm1hdCh2YWx1ZSk7CisgICAgICAgICAgICByZXR1cm4gaXNOYU4o dmFsdWUpID8gZW1EYXNoIDogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIlZHB4IikuZm9ybWF0KHZh bHVlKTsKIAogICAgICAgICBjYXNlICJhcmVhIjoKLSAgICAgICAgICAgIHJldHVybiBpc05hTih2 YWx1ZSkgPyBlbURhc2ggOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIiVmcHjCsiIpLmZvcm1hdCh2 YWx1ZSk7CisgICAgICAgICAgICByZXR1cm4gaXNOYU4odmFsdWUpID8gZW1EYXNoIDogV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCIlZHB4wrIiKS5mb3JtYXQodmFsdWUpOwogCiAgICAgICAgIGNhc2Ug InN0YXJ0VGltZSI6CiAgICAgICAgICAgICByZXR1cm4gaXNOYU4odmFsdWUpID8gZW1EYXNoIDog TnVtYmVyLnNlY29uZHNUb1N0cmluZyh2YWx1ZSAtIHRoaXMuX2Jhc2VTdGFydFRpbWUsIHRydWUp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv UHJvZmlsZURhdGFHcmlkTm9kZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1Byb2ZpbGVEYXRhR3JpZE5vZGUuanMKaW5kZXggZjFmNzRmN2IzNDEwYzdiZjc3 ZTM3NjBlMjgzNGU0MDk2YjNmOTBhYi4uNmE3Y2QxYTI5ZTc2NmIyOGJjYzQxZDg3ZjI2ZTQ0YWQw MDM2OGNhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvUHJvZmlsZURhdGFHcmlkTm9kZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9Qcm9maWxlRGF0YUdyaWROb2RlLmpzCkBAIC0xODgsMTQgKzE4 OCwxNCBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZURhdGFHcmlkTm9kZSA9IGNsYXNzIFByb2ZpbGVE YXRhR3JpZE5vZGUgZXh0ZW5kcyBXZWJJbnNwZWN0bwogCiAgICAgICAgIGxldCB0b3RhbFRpbWUg PSBkdXJhdGlvbjsKICAgICAgICAgbGV0IHNlbGZUaW1lID0gbGVhZkR1cmF0aW9uICsgdGhpcy5f ZXh0cmFTZWxmVGltZUZyb21DaGFyZ2VkQ2hpbGRyZW47Ci0gICAgICAgIGxldCBwZXJjZW50ID0g KHRvdGFsVGltZSAvIHRoaXMuX3RyZWUudG90YWxTYW1wbGVUaW1lKSAqIDEwMDsKKyAgICAgICAg bGV0IGZyYWN0aW9uID0gdG90YWxUaW1lIC8gdGhpcy5fdHJlZS50b3RhbFNhbXBsZVRpbWU7CiAK LSAgICAgICAgdGhpcy5fZGF0YSA9IHt0b3RhbFRpbWUsIHNlbGZUaW1lLCBwZXJjZW50fTsKKyAg ICAgICAgdGhpcy5fZGF0YSA9IHt0b3RhbFRpbWUsIHNlbGZUaW1lLCBmcmFjdGlvbn07CiAgICAg fQogCiAgICAgX3RvdGFsVGltZUNvbnRlbnQoKQogICAgIHsKLSAgICAgICAgbGV0IHt0b3RhbFRp bWUsIHBlcmNlbnR9ID0gdGhpcy5fZGF0YTsKKyAgICAgICAgbGV0IHt0b3RhbFRpbWUsIGZyYWN0 aW9ufSA9IHRoaXMuX2RhdGE7CiAKICAgICAgICAgbGV0IGZyYWdtZW50ID0gZG9jdW1lbnQuY3Jl YXRlRG9jdW1lbnRGcmFnbWVudCgpOwogICAgICAgICBsZXQgdGltZUVsZW1lbnQgPSBmcmFnbWVu dC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIikpOwpAQCAtMjAzLDcg KzIwMyw3IEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlRGF0YUdyaWROb2RlID0gY2xhc3MgUHJvZmls ZURhdGFHcmlkTm9kZSBleHRlbmRzIFdlYkluc3BlY3RvCiAgICAgICAgIHRpbWVFbGVtZW50LnRl eHRDb250ZW50ID0gTnVtYmVyLnNlY29uZHNUb01pbGxpc2Vjb25kc1N0cmluZyh0b3RhbFRpbWUp OwogICAgICAgICBsZXQgcGVyY2VudEVsZW1lbnQgPSBmcmFnbWVudC5hcHBlbmRDaGlsZChkb2N1 bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIikpOwogICAgICAgICBwZXJjZW50RWxlbWVudC5jbGFz c0xpc3QuYWRkKCJwZXJjZW50YWdlIik7Ci0gICAgICAgIHBlcmNlbnRFbGVtZW50LnRleHRDb250 ZW50ID0gTnVtYmVyLnBlcmNlbnRhZ2VTdHJpbmcocGVyY2VudCk7CisgICAgICAgIHBlcmNlbnRF bGVtZW50LnRleHRDb250ZW50ID0gTnVtYmVyLnBlcmNlbnRhZ2VTdHJpbmcoZnJhY3Rpb24pOwog ICAgICAgICByZXR1cm4gZnJhZ21lbnQ7CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZURldGFpbHNTaWRlYmFyUGFu ZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJj ZURldGFpbHNTaWRlYmFyUGFuZWwuanMKaW5kZXggM2M0ODI0ODUwNWU3NTc4OWNlMmY3OWUwZGE2 MjQ3ODQ5Mjg1NTIzMC4uOWNlMjUxZDA4ODYxZDM5ZTA0MmYwZDRhYTJlODQ1YWMxNjUyZmRlOCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVz b3VyY2VEZXRhaWxzU2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlRGV0YWlsc1NpZGViYXJQYW5lbC5qcwpAQCAtNDE2 LDggKzQxNiw4IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZURldGFpbHNTaWRlYmFyUGFuZWwgPSBj bGFzcyBSZXNvdXJjZURldGFpbHNTaWRlYmFyUGFuZWwgZXh0CiAKICAgICAgICAgLy8gR2V0IHRo ZSBtZXRyaWNzIGZvciB0aGlzIHJlc291cmNlIGFuZCBmaWxsIGluIHRoZSBtZXRyaWNzIHJvd3Mg d2l0aCB0aGF0IGluZm9ybWF0aW9uLgogICAgICAgICByZXNvdXJjZS5nZXRJbWFnZVNpemUoZnVu Y3Rpb24oc2l6ZSkgewotICAgICAgICAgICAgdGhpcy5faW1hZ2VXaWR0aFJvdy52YWx1ZSA9IFdl Ykluc3BlY3Rvci5VSVN0cmluZygiJWZweCIpLmZvcm1hdChzaXplLndpZHRoKTsKLSAgICAgICAg ICAgIHRoaXMuX2ltYWdlSGVpZ2h0Um93LnZhbHVlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIl ZnB4IikuZm9ybWF0KHNpemUuaGVpZ2h0KTsKKyAgICAgICAgICAgIHRoaXMuX2ltYWdlV2lkdGhS b3cudmFsdWUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIiVkcHgiKS5mb3JtYXQoc2l6ZS53aWR0 aCk7CisgICAgICAgICAgICB0aGlzLl9pbWFnZUhlaWdodFJvdy52YWx1ZSA9IFdlYkluc3BlY3Rv ci5VSVN0cmluZygiJWRweCIpLmZvcm1hdChzaXplLmhlaWdodCk7CiAgICAgICAgIH0uYmluZCh0 aGlzKSk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggOWExNDc1NTBmMzI5MDI0NTJlMzg0ZGY4ODQwNzcwOTBh MjIyNTg4NS4uYjk3OWEwZTJkM2NjYzZmMzViMjM5MjEyYjc3NzRkNzQ3MmY5NmYxOCAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE5IEBACisyMDE2LTA0LTE1ICBNYXR0IEJha2VyICA8bWF0dGJha2VyQGFwcGxl LmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBBZG9wdCBOdW1iZXIucHJvdG90eXBlLnRv TG9jYWxlU3RyaW5nIEZvciBBbGwgU2l6ZXMgYW5kIFRpbWVzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTIwMzMKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzIzODE1NTg5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEFkZCB0ZXN0IGNvdmVyYWdlIGZvciBzdHJpbmcgZm9ybWF0dGVycywgYW5kIGFkZGl0 aW9uYWwgdGVzdCBjYXNlcyBmb3IKKyAgICAgICAgTnVtYmVyLnBlcmNlbnRhZ2VTdHJpbmcgYW5k IE51bWJlci5zZWNvbmRzVG9TdHJpbmcuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvdW5pdC10ZXN0 cy9udW1iZXItdXRpbGl0aWVzLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBpbnNwZWN0b3IvdW5p dC10ZXN0cy9udW1iZXItdXRpbGl0aWVzLmh0bWw6CisgICAgICAgICogaW5zcGVjdG9yL3VuaXQt dGVzdHMvc3RyaW5nLXV0aWxpdGllcy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGlu c3BlY3Rvci91bml0LXRlc3RzL3N0cmluZy11dGlsaXRpZXMuaHRtbDogQWRkZWQuCisKIDIwMTYt MDQtMTUgIEppZXdlbiBUYW4gIDxqaWV3ZW5fdGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBNYXJr IGluc3BlY3Rvci9mb3JtYXR0aW5nL2Zvcm1hdHRpbmctamF2YXNjcmlwdC5odG1sIGFzIGZsYWt5 IG9uIG1hYwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3VuaXQtdGVzdHMvbnVt YmVyLXV0aWxpdGllcy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdW5pdC10 ZXN0cy9udW1iZXItdXRpbGl0aWVzLWV4cGVjdGVkLnR4dAppbmRleCA3ZTkyYmYxMjU0Y2JjNmVl NTRhMGFiMzJlM2ZiNDAzYzIyYmI5ZWQ3Li5lMDBhZjM4YjMyZjVlODlhMjZjOWY4NWUyNjFiZGJm Mjg3OTAwNzY2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdW5pdC10ZXN0cy9u dW1iZXItdXRpbGl0aWVzLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv dW5pdC10ZXN0cy9udW1iZXItdXRpbGl0aWVzLWV4cGVjdGVkLnR4dApAQCAtMTQsNiArMTQsNyBA QCBQQVNTOiBjb25zdHJhaW4gb2YgYSB2YWx1ZSBhYm92ZSBtYXggYmVjb21lcyBtYXgKIEZBSUw6 IGNvbnN0cmFpbiBvZiBOYU4gYmVjb21lcyBtaW4KIAogLS0gUnVubmluZyB0ZXN0IGNhc2U6IE51 bWJlci5zZWNvbmRzVG9TdHJpbmcKK1BBU1M6IG5vcm1hbCByZXNvbHV0aW9uIG9mIDBtcyBzaG91 bGQgYmUgbXMgd2l0aCBubyBkZWNpbWFscwogUEFTUzogbm9ybWFsIHJlc29sdXRpb24gb2Ygc3Vi IDFtcyBzaG91bGQgYmUgbXMKIFBBU1M6IG5vcm1hbCByZXNvbHV0aW9uIG9mIHN1YiAxMG1zIHNo b3VsZCBiZSBtcwogUEFTUzogbm9ybWFsIHJlc29sdXRpb24gb2Ygc3ViIDEwMG1zIHNob3VsZCBi ZSBtcwpAQCAtMjUsNiArMjYsNyBAQCBQQVNTOiBub3JtYWwgcmVzb2x1dGlvbiBvZiBncmVhdGVy IHRoYW4gMW1pbiBidXQgc3ViIDFociBzaG91bGQgYmUgbWludXRlcwogUEFTUzogbm9ybWFsIHJl c29sdXRpb24gb2YgZ3JlYXRlciB0aGFuIDFociBidXQgc3ViIDEgZGF5IHNob3VsZCBiZSBocnMK IFBBU1M6IG5vcm1hbCByZXNvbHV0aW9uIG9mIGdyZWF0ZXIgdGhhbiAxIGRheSBzaG91bGQgYmUg ZGF5cwogUEFTUzogbm9ybWFsIHJlc29sdXRpb24gb2YgZ3JlYXRlciB0aGFuIDEgZGF5IHNob3Vs ZCBiZSBkYXlzCitQQVNTOiBoaWdoIHJlc29sdXRpb24gb2YgMG1zIHNob3VsZCBiZSBtcyB3aXRo IG5vIGRlY2ltYWxzCiBQQVNTOiBoaWdoIHJlc29sdXRpb24gb2Ygc3ViIDFtcyBzaG91bGQgYmUg bXMgd2l0aCBkZWNpbWFscwogUEFTUzogaGlnaCByZXNvbHV0aW9uIG9mIHN1YiAxMG1zIHNob3Vs ZCBiZSBtcyB3aXRoIGRlY2ltYWxzCiBQQVNTOiBoaWdoIHJlc29sdXRpb24gb2Ygc3ViIDEwMG1z IHNob3VsZCBiZSBtcyB3aXRoIGRlY2ltYWxzCkBAIC00NiwzICs0OCw2IEBAIFBBU1M6IGhpZ2gg cmVzb2x1dGlvbiBvZiBzdWIgMTBrIHNob3VsZCBiZSBraWxvYnl0ZXMKIFBBU1M6IGhpZ2ggcmVz b2x1dGlvbiBvZiBzdWIgMTBtYiBzaG91bGQgYmUgbWVnYWJ5dGVzCiBQQVNTOiBoaWdoIHJlc29s dXRpb24gb2YgZ3JlYXRlciB0aGFuIDEwbWIgc2hvdWxkIGJlIG1lZ2FieXRlcwogCistLSBSdW5u aW5nIHRlc3QgY2FzZTogTnVtYmVyLnBlcmNlbnRhZ2VTdHJpbmcKK1BBU1M6IHByZWNpc2lvbiBz aG91bGQgZGVmYXVsdCB0byAxIGlmIHVuc3BlY2lmaWVkCisKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2luc3BlY3Rvci91bml0LXRlc3RzL251bWJlci11dGlsaXRpZXMuaHRtbCBiL0xheW91dFRl c3RzL2luc3BlY3Rvci91bml0LXRlc3RzL251bWJlci11dGlsaXRpZXMuaHRtbAppbmRleCA2NmEy YWFkMjkyMzkwZTQwOTRiZjI2Y2UwMzYwZTBiZjg3YTY1ODE1Li5mMjM5MmQ2ZjE4OGYwOTA5MTI4 YmVjYWI0ZjkyYzk5N2Q1ZjljODQ0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv dW5pdC10ZXN0cy9udW1iZXItdXRpbGl0aWVzLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL3VuaXQtdGVzdHMvbnVtYmVyLXV0aWxpdGllcy5odG1sCkBAIC0zMiw2ICszMiw3IEBAIGZ1 bmN0aW9uIHRlc3QoKQogICAgICAgICBuYW1lOiAiTnVtYmVyLnNlY29uZHNUb1N0cmluZyIsCiAg ICAgICAgIHRlc3Q6ICgpID0+IHsKICAgICAgICAgICAgIC8vIE5vcm1hbCByZXNvbHV0aW9uLgor ICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KE51bWJlci5zZWNvbmRzVG9TdHJp bmcoMCwgZmFsc2UpID09PSAiMG1zIiwgIm5vcm1hbCByZXNvbHV0aW9uIG9mIDBtcyBzaG91bGQg YmUgbXMgd2l0aCBubyBkZWNpbWFscyIpOwogICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBl Y3RUaGF0KE51bWJlci5zZWNvbmRzVG9TdHJpbmcoMC4wMDAxMjM0NTYsIGZhbHNlKSA9PT0gIjAu MTJtcyIsICJub3JtYWwgcmVzb2x1dGlvbiBvZiBzdWIgMW1zIHNob3VsZCBiZSBtcyIpOwogICAg ICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KE51bWJlci5zZWNvbmRzVG9TdHJpbmco MC4wMDEyMzQ1NiwgZmFsc2UpID09PSAiMS4yM21zIiwgIm5vcm1hbCByZXNvbHV0aW9uIG9mIHN1 YiAxMG1zIHNob3VsZCBiZSBtcyIpOwogICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RU aGF0KE51bWJlci5zZWNvbmRzVG9TdHJpbmcoMC4wMTIzNDU2LCBmYWxzZSkgPT09ICIxMi4zbXMi LCAibm9ybWFsIHJlc29sdXRpb24gb2Ygc3ViIDEwMG1zIHNob3VsZCBiZSBtcyIpOwpAQCAtNDUs NiArNDYsNyBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhw ZWN0VGhhdChOdW1iZXIuc2Vjb25kc1RvU3RyaW5nKDEyMzQ1NjcsIGZhbHNlKSA9PT0gIjE0LjMg ZGF5cyIsICJub3JtYWwgcmVzb2x1dGlvbiBvZiBncmVhdGVyIHRoYW4gMSBkYXkgc2hvdWxkIGJl IGRheXMiKTsKIAogICAgICAgICAgICAgLy8gSGlnaCByZXNvbHV0aW9uLgorICAgICAgICAgICAg SW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KE51bWJlci5zZWNvbmRzVG9TdHJpbmcoMCwgdHJ1ZSkg PT09ICIwbXMiLCAiaGlnaCByZXNvbHV0aW9uIG9mIDBtcyBzaG91bGQgYmUgbXMgd2l0aCBubyBk ZWNpbWFscyIpOwogICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KE51bWJlci5z ZWNvbmRzVG9TdHJpbmcoMC4wMDAxMjM0NTYsIHRydWUpID09PSAiMC4xMjNtcyIsICJoaWdoIHJl c29sdXRpb24gb2Ygc3ViIDFtcyBzaG91bGQgYmUgbXMgd2l0aCBkZWNpbWFscyIpOwogICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KE51bWJlci5zZWNvbmRzVG9TdHJpbmcoMC4w MDEyMzQ1NiwgdHJ1ZSkgPT09ICIxLjIzNW1zIiwgImhpZ2ggcmVzb2x1dGlvbiBvZiBzdWIgMTBt cyBzaG91bGQgYmUgbXMgd2l0aCBkZWNpbWFscyIpOwogICAgICAgICAgICAgSW5zcGVjdG9yVGVz dC5leHBlY3RUaGF0KE51bWJlci5zZWNvbmRzVG9TdHJpbmcoMC4wMTIzNDU2LCB0cnVlKSA9PT0g IjEyLjM1bXMiLCAiaGlnaCByZXNvbHV0aW9uIG9mIHN1YiAxMDBtcyBzaG91bGQgYmUgbXMgd2l0 aCBkZWNpbWFscyIpOwpAQCAtODIsNiArODQsMTUgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAg IH0KICAgICB9KTsKIAorICAgIHN1aXRlLmFkZFRlc3RDYXNlKHsKKyAgICAgICAgbmFtZTogIk51 bWJlci5wZXJjZW50YWdlU3RyaW5nIiwKKyAgICAgICAgdGVzdDogKCkgPT4geworICAgICAgICAg ICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KE51bWJlci5wZXJjZW50YWdlU3RyaW5nKDEgLyAz KSA9PT0gIjMzLjMlIiwgInByZWNpc2lvbiBzaG91bGQgZGVmYXVsdCB0byAxIGlmIHVuc3BlY2lm aWVkIik7CisKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9CisgICAgfSk7CisK ICAgICBzdWl0ZS5ydW5UZXN0Q2FzZXNBbmRGaW5pc2goKTsKIH0KIDwvc2NyaXB0PgpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3VuaXQtdGVzdHMvc3RyaW5nLXV0aWxpdGllcy1l eHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdW5pdC10ZXN0cy9zdHJpbmctdXRp bGl0aWVzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5mNzAxYTNkYzI3NjJjNzY3Mzc1MGY2YTI2 ODIxOWQzZGQ2MDY3YmY5Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L3VuaXQtdGVzdHMvc3RyaW5nLXV0aWxpdGllcy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwyMiBA QAorCis9PSBSdW5uaW5nIHRlc3Qgc3VpdGU6IFN0cmluZ1V0aWxpdGllcworLS0gUnVubmluZyB0 ZXN0IGNhc2U6IFN0cmluZy5mb3JtYXQKK1BBU1M6IGZsb2F0IGZvcm1hdCBzcGVjaWZpZXIgd2l0 aCBubyBzdWItc3BlY2lmaWVyIHNob3VsZCBzaG93IDYgZGVjaW1hbCBkaWdpdHMKK1BBU1M6IGZs b2F0IGZvcm1hdCBzcGVjaWZpZXIgd2l0aCBwcmVjaXNpb24gMCBzaG91bGQgc2hvdyAwIGRlY2lt YWwgZGlnaXRzCitQQVNTOiBmbG9hdCBmb3JtYXQgc3BlY2lmaWVyIHdpdGggcHJlY2lzaW9uIDEg c2hvdWxkIHNob3cgMSBkZWNpbWFsIGRpZ2l0CitQQVNTOiBmbG9hdCBmb3JtYXQgc3BlY2lmaWVy IHdpdGggcHJlY2lzaW9uIDIgc2hvdWxkIHNob3cgMiBkZWNpbWFsIGRpZ2l0cworUEFTUzogZmxv YXQgZm9ybWF0IHNwZWNpZmllciB3aXRoIHByZWNpc2lvbiAzIHNob3VsZCBzaG93IDMgZGVjaW1h bCBkaWdpdHMKK1BBU1M6IGZsb2F0IGZvcm1hdCBzcGVjaWZpZXIgd2l0aCBwcmVjaXNpb24gNCBz aG91bGQgc2hvdyA0IGRlY2ltYWwgZGlnaXRzCitQQVNTOiBmbG9hdCBmb3JtYXQgc3BlY2lmaWVy IHdpdGggcHJlY2lzaW9uIDUgc2hvdWxkIHNob3cgNSBkZWNpbWFsIGRpZ2l0cworUEFTUzogZmxv YXQgZm9ybWF0IHNwZWNpZmllciB3aXRoIHByZWNpc2lvbiA2IHNob3VsZCBzaG93IDYgZGVjaW1h bCBkaWdpdHMKK1BBU1M6IGZsb2F0IGZvcm1hdCBzcGVjaWZpZXIgd2l0aCBwcmVjaXNpb24gNyBz aG91bGQgc2hvdyA3IGRlY2ltYWwgZGlnaXRzCitQQVNTOiBmbG9hdCBmb3JtYXQgc3BlY2lmaWVy IHdpdGggcHJlY2lzaW9uIDggc2hvdWxkIHNob3cgOCBkZWNpbWFsIGRpZ2l0cworUEFTUzogZmxv YXQgZm9ybWF0IHNwZWNpZmllciB3aXRoIHByZWNpc2lvbiA5IHNob3VsZCBzaG93IDkgZGVjaW1h bCBkaWdpdHMKK1BBU1M6IGZsb2F0IGZvcm1hdCBzcGVjaWZpZXIgd2l0aCBzdHJpbmcgYXJndW1l bnQgc2hvdWxkIGF0dGVtcHQgY29udmVyc2lvbiB0byBmbG9hdAorUEFTUzogZmxvYXQgZm9ybWF0 IHNwZWNpZmllciB3aXRoIEluZmluaXR5IGFyZ3VtZW50IHNob3VsZCBzaG93ICLiiJ4iCitQQVNT OiBmbG9hdCBmb3JtYXQgc3BlY2lmaWVyIHdpdGggTmFOIGFyZ3VtZW50IHNob3VsZCBzaG93ICJO YU4iCitQQVNTOiBpbnRlZ2VyIGZvcm1hdCBzcGVjaWZpZXIgd2l0aCBmbG9hdCBhcmd1bWVudCBz aG91bGQgY29udmVydCB0byBpbnRlZ2VyCitQQVNTOiBpbnRlZ2VyIGZvcm1hdCBzcGVjaWZpZXIg d2l0aCBzdHJpbmcgYXJndW1lbnQgc2hvdWxkIGF0dGVtcHQgY29udmVyc2lvbiB0byBpbnRlZ2Vy CitQQVNTOiBpbnRlZ2VyIGZvcm1hdCBzcGVjaWZpZXIgd2l0aCBJbmZpbml0eSBhcmd1bWVudCBz aG91bGQgc2hvdyAiTmFOIgorUEFTUzogaW50ZWdlciBmb3JtYXQgc3BlY2lmaWVyIHdpdGggTmFO IGFyZ3VtZW50IHNob3VsZCBzaG93ICJOYU4iCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2lu c3BlY3Rvci91bml0LXRlc3RzL3N0cmluZy11dGlsaXRpZXMuaHRtbCBiL0xheW91dFRlc3RzL2lu c3BlY3Rvci91bml0LXRlc3RzL3N0cmluZy11dGlsaXRpZXMuaHRtbApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5lODll ZjcyMjg1YzM3MmFjOGY5OTRmOGU3ZTBhZDU5NzdkYzBlNDZkCi0tLSAvZGV2L251bGwKKysrIGIv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL3VuaXQtdGVzdHMvc3RyaW5nLXV0aWxpdGllcy5odG1sCkBA IC0wLDAgKzEsNDIgQEAKKzwhZG9jdHlwZSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQg c3JjPSIuLi8uLi9odHRwL3Rlc3RzL2luc3BlY3Rvci9yZXNvdXJjZXMvaW5zcGVjdG9yLXRlc3Qu anMiPjwvc2NyaXB0PgorPHNjcmlwdD4KK2Z1bmN0aW9uIHRlc3QoKQoreworICAgIGxldCBzdWl0 ZSA9IEluc3BlY3RvclRlc3QuY3JlYXRlU3luY1N1aXRlKCJTdHJpbmdVdGlsaXRpZXMiKTsKKwor ICAgIHN1aXRlLmFkZFRlc3RDYXNlKHsKKyAgICAgICAgbmFtZTogIlN0cmluZy5mb3JtYXQiLAor ICAgICAgICB0ZXN0OiAoKSA9PiB7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRo YXQoIiVmIi5mb3JtYXQoMS4yMzQ1Njc4OSkgPT09ICIxLjIzNDU2OCIsICJmbG9hdCBmb3JtYXQg c3BlY2lmaWVyIHdpdGggbm8gc3ViLXNwZWNpZmllciBzaG91bGQgc2hvdyA2IGRlY2ltYWwgZGln aXRzIik7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQoIiUuMGYiLmZvcm1h dCgxLjIzNDU2Nzg5KSA9PT0gIjEiLCAiZmxvYXQgZm9ybWF0IHNwZWNpZmllciB3aXRoIHByZWNp c2lvbiAwIHNob3VsZCBzaG93IDAgZGVjaW1hbCBkaWdpdHMiKTsKKyAgICAgICAgICAgIEluc3Bl Y3RvclRlc3QuZXhwZWN0VGhhdCgiJS4xZiIuZm9ybWF0KDEuMjM0NTY3ODkpID09PSAiMS4yIiwg ImZsb2F0IGZvcm1hdCBzcGVjaWZpZXIgd2l0aCBwcmVjaXNpb24gMSBzaG91bGQgc2hvdyAxIGRl Y2ltYWwgZGlnaXQiKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0VGhhdCgiJS4y ZiIuZm9ybWF0KDEuMjM0NTY3ODkpID09PSAiMS4yMyIsICJmbG9hdCBmb3JtYXQgc3BlY2lmaWVy IHdpdGggcHJlY2lzaW9uIDIgc2hvdWxkIHNob3cgMiBkZWNpbWFsIGRpZ2l0cyIpOworICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KCIlLjNmIi5mb3JtYXQoMS4yMzQ1Njc4OSkg PT09ICIxLjIzNSIsICJmbG9hdCBmb3JtYXQgc3BlY2lmaWVyIHdpdGggcHJlY2lzaW9uIDMgc2hv dWxkIHNob3cgMyBkZWNpbWFsIGRpZ2l0cyIpOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5l eHBlY3RUaGF0KCIlLjRmIi5mb3JtYXQoMS4yMzQ1Njc4OSkgPT09ICIxLjIzNDYiLCAiZmxvYXQg Zm9ybWF0IHNwZWNpZmllciB3aXRoIHByZWNpc2lvbiA0IHNob3VsZCBzaG93IDQgZGVjaW1hbCBk aWdpdHMiKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0VGhhdCgiJS41ZiIuZm9y bWF0KDEuMjM0NTY3ODkpID09PSAiMS4yMzQ1NyIsICJmbG9hdCBmb3JtYXQgc3BlY2lmaWVyIHdp dGggcHJlY2lzaW9uIDUgc2hvdWxkIHNob3cgNSBkZWNpbWFsIGRpZ2l0cyIpOworICAgICAgICAg ICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KCIlLjZmIi5mb3JtYXQoMS4yMzQ1Njc4OSkgPT09 ICIxLjIzNDU2OCIsICJmbG9hdCBmb3JtYXQgc3BlY2lmaWVyIHdpdGggcHJlY2lzaW9uIDYgc2hv dWxkIHNob3cgNiBkZWNpbWFsIGRpZ2l0cyIpOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5l eHBlY3RUaGF0KCIlLjdmIi5mb3JtYXQoMS4yMzQ1Njc4OSkgPT09ICIxLjIzNDU2NzkiLCAiZmxv YXQgZm9ybWF0IHNwZWNpZmllciB3aXRoIHByZWNpc2lvbiA3IHNob3VsZCBzaG93IDcgZGVjaW1h bCBkaWdpdHMiKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0VGhhdCgiJS44ZiIu Zm9ybWF0KDEuMjM0NTY3ODkpID09PSAiMS4yMzQ1Njc4OSIsICJmbG9hdCBmb3JtYXQgc3BlY2lm aWVyIHdpdGggcHJlY2lzaW9uIDggc2hvdWxkIHNob3cgOCBkZWNpbWFsIGRpZ2l0cyIpOworICAg ICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KCIlLjlmIi5mb3JtYXQoMS4yMzQ1Njc4 OSkgPT09ICIxLjIzNDU2Nzg5MCIsICJmbG9hdCBmb3JtYXQgc3BlY2lmaWVyIHdpdGggcHJlY2lz aW9uIDkgc2hvdWxkIHNob3cgOSBkZWNpbWFsIGRpZ2l0cyIpOworICAgICAgICAgICAgSW5zcGVj dG9yVGVzdC5leHBlY3RUaGF0KCIlZiIuZm9ybWF0KCIxLjIzNDU2Nzg5IikgPT09ICIxLjIzNDU2 OCIsICJmbG9hdCBmb3JtYXQgc3BlY2lmaWVyIHdpdGggc3RyaW5nIGFyZ3VtZW50IHNob3VsZCBh dHRlbXB0IGNvbnZlcnNpb24gdG8gZmxvYXQiKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3Qu ZXhwZWN0VGhhdCgiJWYiLmZvcm1hdChJbmZpbml0eSkgPT09ICJcdTIyMUUiLCAiZmxvYXQgZm9y bWF0IHNwZWNpZmllciB3aXRoIEluZmluaXR5IGFyZ3VtZW50IHNob3VsZCBzaG93IFwiXHUyMjFF XCIiKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0VGhhdCgiJWYiLmZvcm1hdChO YU4pID09PSAiTmFOIiwgImZsb2F0IGZvcm1hdCBzcGVjaWZpZXIgd2l0aCBOYU4gYXJndW1lbnQg c2hvdWxkIHNob3cgXCJOYU5cIiIpOworCisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVj dFRoYXQoIiVkIi5mb3JtYXQoMTM3LjEpID09PSAiMTM3IiwgImludGVnZXIgZm9ybWF0IHNwZWNp ZmllciB3aXRoIGZsb2F0IGFyZ3VtZW50IHNob3VsZCBjb252ZXJ0IHRvIGludGVnZXIiKTsKKyAg ICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0VGhhdCgiJWQiLmZvcm1hdCgiMTM3IikgPT09 ICIxMzciLCAiaW50ZWdlciBmb3JtYXQgc3BlY2lmaWVyIHdpdGggc3RyaW5nIGFyZ3VtZW50IHNo b3VsZCBhdHRlbXB0IGNvbnZlcnNpb24gdG8gaW50ZWdlciIpOworICAgICAgICAgICAgSW5zcGVj dG9yVGVzdC5leHBlY3RUaGF0KCIlZCIuZm9ybWF0KEluZmluaXR5KSA9PT0gIk5hTiIsICJpbnRl Z2VyIGZvcm1hdCBzcGVjaWZpZXIgd2l0aCBJbmZpbml0eSBhcmd1bWVudCBzaG91bGQgc2hvdyBc Ik5hTlwiIik7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQoIiVkIi5mb3Jt YXQoTmFOKSA9PT0gIk5hTiIsICJpbnRlZ2VyIGZvcm1hdCBzcGVjaWZpZXIgd2l0aCBOYU4gYXJn dW1lbnQgc2hvdWxkIHNob3cgXCJOYU5cIiIpOworICAgICAgICAgICAgcmV0dXJuIHRydWU7Cisg ICAgICAgIH0KKyAgICB9KTsKKworICAgIHN1aXRlLnJ1blRlc3RDYXNlc0FuZEZpbmlzaCgpOwor fQorPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBvbkxvYWQ9InJ1blRlc3QoKSI+Cis8L2JvZHk+ Cis8L2h0bWw+Cg==