70809 2011-10-25 02:58:35 -0700 Web Inspector: order console message parameters for better optional parameters handling. 2011-10-26 02:24:55 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 489943 0 pfeldman 2011-10-25 02:58:35 -0700 Patch to follow. 489945 1 112313 pfeldman 2011-10-25 03:13:11 -0700 Created attachment 112313 Patch 490688 2 112313 pfeldman 2011-10-26 02:24:46 -0700 Comment on attachment 112313 Patch Clearing flags on attachment: 112313 Committed r98456: <http://trac.webkit.org/changeset/98456> 490689 3 pfeldman 2011-10-26 02:24:55 -0700 All reviewed patches have been landed. Closing bug. 112313 2011-10-25 03:13:11 -0700 2011-10-26 02:24:46 -0700 Patch bug-70809-20111025141309.patch text/plain 15681 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTgzMjYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5NmRlNWM5NTQ0YTg0Mzk2 MWFhYTY3ZmNmYmJiOGVjYjcyM2U0M2Q3Li40Y2ViMmQ5YmM3NDAzZjQwYTQyNWU2MmYyZmI2MzAy NmY3YzBjMWQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMTAtMjUgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6 IG9yZGVyIGNvbnNvbGUgbWVzc2FnZSBwYXJhbWV0ZXJzIGZvciBiZXR0ZXIgb3B0aW9uYWwgcGFy YW1ldGVycyBoYW5kbGluZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTcwODA5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yLmpzb246CisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9Db25zb2xlTWVzc2FnZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25z b2xlTWVzc2FnZUltcGwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlSW1w bC5wcm90b3R5cGUuX2Zvcm1hdE1lc3NhZ2UpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvQ29uc29sZU1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNb2RlbC5w cm90b3R5cGUuX21lc3NhZ2VSZXBlYXRDb3VudFVwZGF0ZWQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkNvbnNvbGVNZXNzYWdlLmNyZWF0ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29s ZURpc3BhdGNoZXIucHJvdG90eXBlLm1lc3NhZ2VBZGRlZCk6CisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9Db25zb2xlVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xl Q29tbWFuZFJlc3VsdCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuY3Jl YXRlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblNlcnZlci5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5FeHRlbnNpb25TZXJ2ZXIucHJvdG90eXBlLl9vbkFkZENv bnNvbGVNZXNzYWdlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5h Z2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNwYXRjaGVyLnByb3RvdHlw ZS5fdXBkYXRlUmVzb3VyY2VXaXRoUmVzcG9uc2UpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvaW5zcGVjdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmxvZy5sb2dNZXNzYWdl KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5sb2cpOgorCiAyMDExLTEwLTI0ICBQYXZlbCBGZWxk bWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBwcmlu dCBleHBpcmVkIG1lc3NhZ2UgY291bnQgYmVmb3JlIHJlbWFpbmluZyBtZXNzYWdlcy4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbiBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgppbmRleCA5MTI1NGMxODIyY2QyMzE1M2Rj MmQ4ODgzY2FmMzQ0ZTJjMmMzMDQ2Li45OGU0ZmU5YzJlMDk3ODNjYTM5MTE3MjZkOTZkMTMzYWEz ZWY4OWQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpz b24KKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCkBAIC00MDQs OSArNDA0LDkgQEAKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ1cmwiLCAidHlwZSI6 ICJzdHJpbmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiVVJMIG9mIHRoZSBt ZXNzYWdlIG9yaWdpbi4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibGluZSIs ICJ0eXBlIjogImludGVnZXIiLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiTGlu ZSBudW1iZXIgaW4gdGhlIHJlc291cmNlIHRoYXQgZ2VuZXJhdGVkIHRoaXMgbWVzc2FnZS4iIH0s CiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicmVwZWF0Q291bnQiLCAidHlwZSI6ICJp bnRlZ2VyIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlJlcGVhdCBjb3VudCBm b3IgcmVwZWF0ZWQgbWVzc2FnZXMuIiB9LAotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjog Im5ldHdvcmtSZXF1ZXN0SWQiLCAiJHJlZiI6ICJOZXR3b3JrLlJlcXVlc3RJZCIsICJvcHRpb25h bCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJJZGVudGlmaWVyIG9mIHRoZSBuZXR3b3JrIHJlcXVl c3QgYXNzb2NpYXRlZCB3aXRoIHRoaXMgbWVzc2FnZS4iIH0sCiAgICAgICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAicGFyYW1ldGVycyIsICJ0eXBlIjogImFycmF5IiwgIml0ZW1zIjogeyAiJHJl ZiI6ICJSdW50aW1lLlJlbW90ZU9iamVjdCIgfSwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0 aW9uIjogIk1lc3NhZ2UgcGFyYW1ldGVycyBpbiBjYXNlIG9mIHRoZSBmb3JtYXR0ZWQgbWVzc2Fn ZS4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic3RhY2tUcmFjZSIsICIkcmVm IjogIlN0YWNrVHJhY2UiLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiSmF2YVNj cmlwdCBzdGFjayB0cmFjZSBmb3IgYXNzZXJ0aW9ucyBhbmQgZXJyb3IgbWVzc2FnZXMuIiB9Cisg ICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic3RhY2tUcmFjZSIsICIkcmVmIjogIlN0YWNr VHJhY2UiLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiSmF2YVNjcmlwdCBzdGFj ayB0cmFjZSBmb3IgYXNzZXJ0aW9ucyBhbmQgZXJyb3IgbWVzc2FnZXMuIiB9LAorICAgICAgICAg ICAgICAgICAgICB7ICJuYW1lIjogIm5ldHdvcmtSZXF1ZXN0SWQiLCAiJHJlZiI6ICJOZXR3b3Jr LlJlcXVlc3RJZCIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJJZGVudGlmaWVy IG9mIHRoZSBuZXR3b3JrIHJlcXVlc3QgYXNzb2NpYXRlZCB3aXRoIHRoaXMgbWVzc2FnZS4iIH0K ICAgICAgICAgICAgICAgICBdCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgewpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlTWVzc2FnZS5q cyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZU1lc3NhZ2UuanMK aW5kZXggZTY4NTU0MTM2NWIzNDRlY2M4YmY1MGQ2MDIwYTg4YmFiOWRhMTMwYi4uMjc2MjNiYzc3 OTA2ZWU3N2E3ZGNhOTQ4NTk3NmZiNGY4MTAwZmUyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlTWVzc2FnZS5qcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVNZXNzYWdlLmpzCkBAIC0zMSwyMSArMzEs MzAgQEAKIC8qKgogICogQGNvbnN0cnVjdG9yCiAgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLkNv bnNvbGVNZXNzYWdlfQorICoKKyAqIEBwYXJhbSB7c3RyaW5nfSBzb3VyY2UKKyAqIEBwYXJhbSB7 c3RyaW5nfSBsZXZlbAorICogQHBhcmFtIHtzdHJpbmd9IG1lc3NhZ2UKICAqIEBwYXJhbSB7V2Vi SW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuTGlua2lmaWVyfSBsaW5raWZpZXIK KyAqIEBwYXJhbSB7c3RyaW5nPX0gdHlwZQorICogQHBhcmFtIHtzdHJpbmc9fSB1cmwKKyAqIEBw YXJhbSB7bnVtYmVyPX0gbGluZQorICogQHBhcmFtIHtudW1iZXI9fSByZXBlYXRDb3VudAogICog QHBhcmFtIHtBcnJheS48UnVudGltZUFnZW50LlJlbW90ZU9iamVjdD49fSBwYXJhbWV0ZXJzCiAg KiBAcGFyYW0ge0NvbnNvbGVBZ2VudC5TdGFja1RyYWNlPX0gc3RhY2tUcmFjZQogICogQHBhcmFt IHtXZWJJbnNwZWN0b3IuUmVzb3VyY2U9fSByZXF1ZXN0CiAgKi8KLVdlYkluc3BlY3Rvci5Db25z b2xlTWVzc2FnZUltcGwgPSBmdW5jdGlvbihzb3VyY2UsIHR5cGUsIGxldmVsLCBsaW5lLCB1cmws IHJlcGVhdENvdW50LCBtZXNzYWdlLCBsaW5raWZpZXIsIHBhcmFtZXRlcnMsIHN0YWNrVHJhY2Us IHJlcXVlc3QpCitXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2VJbXBsID0gZnVuY3Rpb24oc291 cmNlLCBsZXZlbCwgbWVzc2FnZSwgbGlua2lmaWVyLCB0eXBlLCB1cmwsIGxpbmUsIHJlcGVhdENv dW50LCBwYXJhbWV0ZXJzLCBzdGFja1RyYWNlLCByZXF1ZXN0KQogewogICAgIFdlYkluc3BlY3Rv ci5Db25zb2xlTWVzc2FnZS5jYWxsKCk7CiAKICAgICB0aGlzLl9saW5raWZpZXIgPSBsaW5raWZp ZXI7CiAgICAgdGhpcy5zb3VyY2UgPSBzb3VyY2U7Ci0gICAgdGhpcy50eXBlID0gdHlwZTsKKyAg ICB0aGlzLnR5cGUgPSB0eXBlIHx8IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdl VHlwZS5Mb2c7CiAgICAgdGhpcy5sZXZlbCA9IGxldmVsOwotICAgIHRoaXMubGluZSA9IGxpbmU7 Ci0gICAgdGhpcy51cmwgPSB1cmw7CisgICAgdGhpcy5saW5lID0gbGluZSB8fCAtMTsKKyAgICB0 aGlzLnVybCA9IHVybCB8fCBudWxsOworICAgIHJlcGVhdENvdW50ID0gcmVwZWF0Q291bnQgfHwg MTsKICAgICB0aGlzLnJlcGVhdENvdW50ID0gcmVwZWF0Q291bnQ7CiAgICAgdGhpcy5yZXBlYXRE ZWx0YSA9IHJlcGVhdENvdW50OwogICAgIHRoaXMudG90YWxSZXBlYXRDb3VudCA9IHJlcGVhdENv dW50OwpAQCAtMTI5LDkgKzEzOCwxMSBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2VJbXBs LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICAgICAgbWVzc2FnZVRleHQuYXBwZW5kQ2hp bGQoZnJhZ21lbnQpOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0gZWxzZSB7Ci0g ICAgICAgICAgICAgICAgdmFyIGlzRXh0ZXJuYWwgPSAhV2ViSW5zcGVjdG9yLnJlc291cmNlRm9y VVJMKHRoaXMudXJsKTsKLSAgICAgICAgICAgICAgICB2YXIgYW5jaG9yID0gV2ViSW5zcGVjdG9y LmxpbmtpZnlVUkxBc05vZGUodGhpcy51cmwsIHRoaXMudXJsLCAiY29uc29sZS1tZXNzYWdlLXVy bCIsIGlzRXh0ZXJuYWwpOwotICAgICAgICAgICAgICAgIHRoaXMuX2Zvcm1hdHRlZE1lc3NhZ2Uu YXBwZW5kQ2hpbGQoYW5jaG9yKTsKKyAgICAgICAgICAgICAgICBpZiAodGhpcy51cmwpIHsKKyAg ICAgICAgICAgICAgICAgICAgdmFyIGlzRXh0ZXJuYWwgPSAhV2ViSW5zcGVjdG9yLnJlc291cmNl Rm9yVVJMKHRoaXMudXJsKTsKKyAgICAgICAgICAgICAgICAgICAgdmFyIGFuY2hvciA9IFdlYklu c3BlY3Rvci5saW5raWZ5VVJMQXNOb2RlKHRoaXMudXJsLCB0aGlzLnVybCwgImNvbnNvbGUtbWVz c2FnZS11cmwiLCBpc0V4dGVybmFsKTsKKyAgICAgICAgICAgICAgICAgICAgdGhpcy5fZm9ybWF0 dGVkTWVzc2FnZS5hcHBlbmRDaGlsZChhbmNob3IpOworICAgICAgICAgICAgICAgIH0KICAgICAg ICAgICAgICAgICBtZXNzYWdlVGV4dCA9IHRoaXMuX2Zvcm1hdChbdGhpcy5fbWVzc2FnZVRleHRd KTsKICAgICAgICAgICAgIH0KICAgICAgICAgfSBlbHNlIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZU1vZGVsLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlTW9kZWwuanMKaW5kZXggMjEzZTdlMTg5OGRh YTUwNTVmODJhYjgzZDM0MzBhYTJkN2VkZjczMC4uOTBlZjdhMGY4Y2M0MzViOGU1YWYzN2I3ZTVl NWFkMWExMTE4MGVjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Db25zb2xlTW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Db25zb2xlTW9kZWwuanMKQEAgLTEyMSw3ICsxMjEsNyBAQCBXZWJJbnNwZWN0b3IuQ29u c29sZU1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuX2luY3JlbWVudEVycm9y V2FybmluZ0NvdW50KG1zZyk7CiAgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3Rl bmVycyhXZWJJbnNwZWN0b3IuQ29uc29sZU1vZGVsLkV2ZW50cy5SZXBlYXRDb3VudFVwZGF0ZWQs IG1zZyk7CiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICB2YXIgbXNnQ29weSA9IFdlYklu c3BlY3Rvci5Db25zb2xlTWVzc2FnZS5jcmVhdGUobXNnLnNvdXJjZSwgbXNnLnR5cGUsIG1zZy5s ZXZlbCwgbXNnLmxpbmUsIG1zZy51cmwsIGNvdW50IC0gcHJldlJlcGVhdENvdW50LCBtc2cuX21l c3NhZ2VUZXh0LCBtc2cuX3BhcmFtZXRlcnMsIG1zZy5fc3RhY2tUcmFjZSwgbXNnLl9yZXF1ZXN0 KTsKKyAgICAgICAgICAgIHZhciBtc2dDb3B5ID0gV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdl LmNyZWF0ZShtc2cuc291cmNlLCBtc2cubGV2ZWwsIG1zZy5fbWVzc2FnZVRleHQsIG1zZy50eXBl LCBtc2cudXJsLCBtc2cubGluZSwgY291bnQgLSBwcmV2UmVwZWF0Q291bnQsIG1zZy5fcGFyYW1l dGVycywgbXNnLl9zdGFja1RyYWNlLCBtc2cuX3JlcXVlc3QpOwogICAgICAgICAgICAgbXNnQ29w eS50b3RhbFJlcGVhdENvdW50ID0gY291bnQ7CiAgICAgICAgICAgICB0aGlzLmFkZE1lc3NhZ2Uo bXNnQ29weSk7CiAgICAgICAgIH0KQEAgLTE2MiwyOCArMTYyLDE5IEBAIFdlYkluc3BlY3Rvci5D b25zb2xlTWVzc2FnZS5wcm90b3R5cGUgPSB7CiAKIC8qKgogICogQHBhcmFtIHtzdHJpbmd9IHNv dXJjZQotICogQHBhcmFtIHtzdHJpbmd9IHR5cGUKICAqIEBwYXJhbSB7c3RyaW5nfSBsZXZlbAot ICogQHBhcmFtIHtudW1iZXJ9IGxpbmUKLSAqIEBwYXJhbSB7c3RyaW5nfSB1cmwKLSAqIEBwYXJh bSB7bnVtYmVyfSByZXBlYXRDb3VudAogICogQHBhcmFtIHtzdHJpbmd9IG1lc3NhZ2UKKyAqIEBw YXJhbSB7c3RyaW5nPX0gdHlwZQorICogQHBhcmFtIHtzdHJpbmc9fSB1cmwKKyAqIEBwYXJhbSB7 bnVtYmVyPX0gbGluZQorICogQHBhcmFtIHtudW1iZXI9fSByZXBlYXRDb3VudAogICogQHBhcmFt IHtBcnJheS48UnVudGltZUFnZW50LlJlbW90ZU9iamVjdD49fSBwYXJhbWV0ZXJzCiAgKiBAcGFy YW0ge0NvbnNvbGVBZ2VudC5TdGFja1RyYWNlPX0gc3RhY2tUcmFjZQogICogQHBhcmFtIHtXZWJJ bnNwZWN0b3IuUmVzb3VyY2U9fSByZXF1ZXN0CiAgKgogICogQHJldHVybiB7V2ViSW5zcGVjdG9y LkNvbnNvbGVNZXNzYWdlfQogICovCi1XZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuY3JlYXRl ID0gZnVuY3Rpb24oc291cmNlLCB0eXBlLCBsZXZlbCwgbGluZSwgdXJsLCByZXBlYXRDb3VudCwg bWVzc2FnZSwgcGFyYW1ldGVycywgc3RhY2tUcmFjZSwgcmVxdWVzdCkKLXsKLX0KLQotLyoqCi0g KiBAcGFyYW0ge3N0cmluZ30gdGV4dAotICogQHBhcmFtIHtzdHJpbmd9IGxldmVsCi0gKiBAcmV0 dXJuIHtXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2V9Ci0gKi8KLVdlYkluc3BlY3Rvci5Db25z b2xlTWVzc2FnZS5jcmVhdGVUZXh0TWVzc2FnZSA9IGZ1bmN0aW9uKHRleHQsIGxldmVsKQorV2Vi SW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLmNyZWF0ZSA9IGZ1bmN0aW9uKHNvdXJjZSwgbGV2ZWws IG1lc3NhZ2UsIHR5cGUsIHVybCwgbGluZSwgcmVwZWF0Q291bnQsIHBhcmFtZXRlcnMsIHN0YWNr VHJhY2UsIHJlcXVlc3QpCiB7CiB9CiAKQEAgLTIzNiwxMiArMjI3LDEyIEBAIFdlYkluc3BlY3Rv ci5Db25zb2xlRGlzcGF0Y2hlci5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICB2YXIgY29u c29sZU1lc3NhZ2UgPSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuY3JlYXRlKAogICAgICAg ICAgICAgcGF5bG9hZC5zb3VyY2UsCi0gICAgICAgICAgICBwYXlsb2FkLnR5cGUsCiAgICAgICAg ICAgICBwYXlsb2FkLmxldmVsLAotICAgICAgICAgICAgcGF5bG9hZC5saW5lLAorICAgICAgICAg ICAgcGF5bG9hZC50ZXh0LAorICAgICAgICAgICAgcGF5bG9hZC50eXBlLAogICAgICAgICAgICAg cGF5bG9hZC51cmwsCisgICAgICAgICAgICBwYXlsb2FkLmxpbmUsCiAgICAgICAgICAgICBwYXls b2FkLnJlcGVhdENvdW50LAotICAgICAgICAgICAgcGF5bG9hZC50ZXh0LAogICAgICAgICAgICAg cGF5bG9hZC5wYXJhbWV0ZXJzLAogICAgICAgICAgICAgcGF5bG9hZC5zdGFja1RyYWNlLAogICAg ICAgICAgICAgcGF5bG9hZC5uZXR3b3JrUmVxdWVzdElkID8gV2ViSW5zcGVjdG9yLm5ldHdvcmtS ZXNvdXJjZUJ5SWQocGF5bG9hZC5uZXR3b3JrUmVxdWVzdElkKSA6IHVuZGVmaW5lZCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3Lmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcwppbmRl eCBmNGY4NDMyY2E5ODFhODk1ZDBmYTQ1NTk2ZDYyYjU3MWU0MDk4ODJhLi43NWY0OGI5ODlkMDU2 M2U5MTQxMDdjNDU0ZjEwZWY2YTIxYmVlNDNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKQEAgLTcwNCwxMiArNzA0LDEzIEBAIFdl Ykluc3BlY3Rvci5Db25zb2xlQ29tbWFuZC5wcm90b3R5cGUgPSB7CiAvKioKICAqIEBleHRlbmRz IHtXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2VJbXBsfQogICogQGNvbnN0cnVjdG9yCisgKiBA cGFyYW0ge1dlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLkxpbmtpZmllcn0g bGlua2lmaWVyCiAgKi8KIFdlYkluc3BlY3Rvci5Db25zb2xlQ29tbWFuZFJlc3VsdCA9IGZ1bmN0 aW9uKHJlc3VsdCwgd2FzVGhyb3duLCBvcmlnaW5hdGluZ0NvbW1hbmQsIGxpbmtpZmllcikKIHsK ICAgICB2YXIgbGV2ZWwgPSAod2FzVGhyb3duID8gV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdl Lk1lc3NhZ2VMZXZlbC5FcnJvciA6IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdl TGV2ZWwuTG9nKTsKICAgICB0aGlzLm9yaWdpbmF0aW5nQ29tbWFuZCA9IG9yaWdpbmF0aW5nQ29t bWFuZDsKLSAgICBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2VJbXBsLmNhbGwodGhpcywgV2Vi SW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VTb3VyY2UuSlMsIFdlYkluc3BlY3Rvci5D b25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5SZXN1bHQsIGxldmVsLCAtMSwgbnVsbCwgMSwgbnVs bCwgbGlua2lmaWVyLCBbcmVzdWx0XSk7CisgICAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdl SW1wbC5jYWxsKHRoaXMsIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlU291cmNl LkpTLCBsZXZlbCwgIiIsIGxpbmtpZmllciwgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1l c3NhZ2VUeXBlLlJlc3VsdCwgdW5kZWZpbmVkLCB1bmRlZmluZWQsIHVuZGVmaW5lZCwgW3Jlc3Vs dF0pOwogfQogCiBXZWJJbnNwZWN0b3IuQ29uc29sZUNvbW1hbmRSZXN1bHQucHJvdG90eXBlID0g ewpAQCAtNzg4LDEzICs3ODksNyBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZUdyb3VwLnByb3RvdHlw ZSA9IHsKICAqLwogV2ViSW5zcGVjdG9yLmNvbnNvbGVWaWV3ID0gbnVsbDsKIAotV2ViSW5zcGVj dG9yLkNvbnNvbGVNZXNzYWdlLmNyZWF0ZSA9IGZ1bmN0aW9uKHNvdXJjZSwgdHlwZSwgbGV2ZWws IGxpbmUsIHVybCwgcmVwZWF0Q291bnQsIG1lc3NhZ2UsIHBhcmFtZXRlcnMsIHN0YWNrVHJhY2Us IHJlcXVlc3QpCitXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuY3JlYXRlID0gZnVuY3Rpb24o c291cmNlLCBsZXZlbCwgbWVzc2FnZSwgdHlwZSwgdXJsLCBsaW5lLCByZXBlYXRDb3VudCwgcGFy YW1ldGVycywgc3RhY2tUcmFjZSwgcmVxdWVzdCkKIHsKLSAgICByZXR1cm4gbmV3IFdlYkluc3Bl Y3Rvci5Db25zb2xlTWVzc2FnZUltcGwoc291cmNlLCB0eXBlLCBsZXZlbCwgbGluZSwgdXJsLCBy ZXBlYXRDb3VudCwgbWVzc2FnZSwgV2ViSW5zcGVjdG9yLmNvbnNvbGVWaWV3Ll9saW5raWZpZXIs IHBhcmFtZXRlcnMsIHN0YWNrVHJhY2UsIHJlcXVlc3QpOwotfQotCi1XZWJJbnNwZWN0b3IuQ29u c29sZU1lc3NhZ2UuY3JlYXRlVGV4dE1lc3NhZ2UgPSBmdW5jdGlvbih0ZXh0LCBsZXZlbCkKLXsK LSAgICBsZXZlbCA9IGxldmVsIHx8IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdl TGV2ZWwuTG9nOwotICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlSW1w bChXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5Db25zb2xlQVBJLCBX ZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuTG9nLCBsZXZlbCwgMCwgbnVs bCwgMSwgbnVsbCwgV2ViSW5zcGVjdG9yLmNvbnNvbGVWaWV3Ll9saW5raWZpZXIsIFt0ZXh0XSwg bnVsbCk7CisgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2VJbXBsKHNv dXJjZSwgbGV2ZWwsIG1lc3NhZ2UsIFdlYkluc3BlY3Rvci5jb25zb2xlVmlldy5fbGlua2lmaWVy LCB0eXBlLCB1cmwsIGxpbmUsIHJlcGVhdENvdW50LCBwYXJhbWV0ZXJzLCBzdGFja1RyYWNlLCBy ZXF1ZXN0KTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvRXh0ZW5zaW9uU2VydmVyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9FeHRlbnNpb25TZXJ2ZXIuanMKaW5kZXggNTgxY2QyZjBkOWVkZjQ4MDJmNDEyODNkMDUzODE5 MDQxYzI5YWQ4OS4uNzIzZWIxYzdkZDIxOTExNWI3YjkzMWNmMDc2ZDQzYWI4MTU0NGU1MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25TZXJ2 ZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25T ZXJ2ZXIuanMKQEAgLTMzNCwxMiArMzM0LDEyIEBAIFdlYkluc3BlY3Rvci5FeHRlbnNpb25TZXJ2 ZXIucHJvdG90eXBlID0gewogCiAgICAgICAgIHZhciBjb25zb2xlTWVzc2FnZSA9IFdlYkluc3Bl Y3Rvci5Db25zb2xlTWVzc2FnZS5jcmVhdGUoCiAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuQ29u c29sZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5KUywKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5D b25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5Mb2csCiAgICAgICAgICAgICBsZXZlbCwKLSAgICAg ICAgICAgIG1lc3NhZ2UubGluZSwKKyAgICAgICAgICAgIG1lc3NhZ2UudGV4dCwKKyAgICAgICAg ICAgIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5Mb2csCiAgICAgICAg ICAgICBtZXNzYWdlLnVybCwKKyAgICAgICAgICAgIG1lc3NhZ2UubGluZSwKICAgICAgICAgICAg IDEsCi0gICAgICAgICAgICBtZXNzYWdlLnRleHQsCiAgICAgICAgICAgICBudWxsLCAvLyBwYXJh bWV0ZXJzCiAgICAgICAgICAgICBudWxsLCAvLyBzdGFja1RyYWNlCiAgICAgICAgICAgICBudWxs KTsgLy8gbmV0d29ya1JlcXVlc3RJZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMKaW5kZXggMWViYWY3MjQxYjc1YTc5OWU1ZDc4 OGUzYWRlMTA3YTlhZWNlNzJhMy4uNDU5NDRiZmZhMGFlNjkyNGUyNmYyNzUzMmI2NGI1YTY2MGMx ZTgwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3 b3JrTWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05l dHdvcmtNYW5hZ2VyLmpzCkBAIC0xMjgsMTIgKzEyOCwxMCBAQCBXZWJJbnNwZWN0b3IuTmV0d29y a0Rpc3BhdGNoZXIucHJvdG90eXBlID0gewogCiAgICAgICAgIGlmICghdGhpcy5fbWltZVR5cGVJ c0NvbnNpc3RlbnRXaXRoVHlwZShyZXNvdXJjZSkpIHsKICAgICAgICAgICAgIFdlYkluc3BlY3Rv ci5jb25zb2xlLmFkZE1lc3NhZ2UoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLmNyZWF0ZShX ZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5PdGhlciwKLSAgICAgICAg ICAgICAgICBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuTG9nLAogICAg ICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlTGV2ZWwuV2Fy bmluZywKLSAgICAgICAgICAgICAgICAtMSwKLSAgICAgICAgICAgICAgICB0aGlzLnVybCwKLSAg ICAgICAgICAgICAgICAxLAotICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5VSVN0cmluZygi UmVzb3VyY2UgaW50ZXJwcmV0ZWQgYXMgJXMgYnV0IHRyYW5zZmVycmVkIHdpdGggTUlNRSB0eXBl ICVzLiIsIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBlLnRvVUlTdHJpbmcodGhpcy50eXBlKSwg dGhpcy5taW1lVHlwZSkpKTsKKyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IlJlc291cmNlIGludGVycHJldGVkIGFzICVzIGJ1dCB0cmFuc2ZlcnJlZCB3aXRoIE1JTUUgdHlw ZSAlcy4iLCBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuVHlwZS50b1VJU3RyaW5nKHRoaXMudHlwZSks IHRoaXMubWltZVR5cGUpLAorICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5Db25zb2xlTWVz c2FnZS5NZXNzYWdlVHlwZS5Mb2csCisgICAgICAgICAgICAgICAgdGhpcy51cmwpKTsKICAgICAg ICAgfQogICAgIH0sCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvaW5zcGVjdG9yLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9p bnNwZWN0b3IuanMKaW5kZXggOTFmNzFmNzI4ZjIyODVhZWNjYTViNzQ1ZGFmNzk0MGQ2NDlhYWNj My4uZDdlNzY1MmZkODJkOWRjZjQwYWQ1YmMwYTdkZWE2YWVlZWMzMWI0OSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKQEAgLTk1OSwyNyAr OTU5LDExIEBAIFdlYkluc3BlY3Rvci5sb2cgPSBmdW5jdGlvbihtZXNzYWdlLCBtZXNzYWdlTGV2 ZWwsIHNob3dDb25zb2xlKQogICAgIC8vIGFjdHVhbGx5IGxvZyB0aGUgbWVzc2FnZQogICAgIGZ1 bmN0aW9uIGxvZ01lc3NhZ2UobWVzc2FnZSkKICAgICB7Ci0gICAgICAgIHZhciByZXBlYXRDb3Vu dCA9IDE7Ci0gICAgICAgIGlmIChtZXNzYWdlID09IFdlYkluc3BlY3Rvci5sb2cubGFzdE1lc3Nh Z2UpCi0gICAgICAgICAgICByZXBlYXRDb3VudCA9IFdlYkluc3BlY3Rvci5sb2cucmVwZWF0Q291 bnQgKyAxOwotCi0gICAgICAgIFdlYkluc3BlY3Rvci5sb2cubGFzdE1lc3NhZ2UgPSBtZXNzYWdl OwotICAgICAgICBXZWJJbnNwZWN0b3IubG9nLnJlcGVhdENvdW50ID0gcmVwZWF0Q291bnQ7Ci0K LSAgICAgICAgLy8gQ29uc29sZU1lc3NhZ2UgZXhwZWN0cyBhIHByb3h5IG9iamVjdAotICAgICAg ICBtZXNzYWdlID0gV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdC5mcm9tUHJpbWl0aXZlVmFsdWUo bWVzc2FnZSk7Ci0KICAgICAgICAgLy8gcG9zdCB0aGUgbWVzc2FnZQogICAgICAgICB2YXIgbXNn ID0gV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLmNyZWF0ZSgKICAgICAgICAgICAgIFdlYklu c3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlU291cmNlLk90aGVyLAotICAgICAgICAgICAg V2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VUeXBlLkxvZywKICAgICAgICAgICAg IG1lc3NhZ2VMZXZlbCB8fCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZUxldmVs LkRlYnVnLAotICAgICAgICAgICAgLTEsCi0gICAgICAgICAgICBudWxsLAotICAgICAgICAgICAg cmVwZWF0Q291bnQsCi0gICAgICAgICAgICBudWxsLAotICAgICAgICAgICAgW21lc3NhZ2VdLAot ICAgICAgICAgICAgbnVsbCk7CisgICAgICAgICAgICBtZXNzYWdlKTsKIAogICAgICAgICBzZWxm LmNvbnNvbGUuYWRkTWVzc2FnZShtc2cpOwogICAgICAgICBpZiAoc2hvd0NvbnNvbGUpCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5k ZXggYWZlMWM3ZWMyODA0ODI4Y2NmMDE5YzgxYjNlMzBiN2I1YzI5MDAwZi4uYzQ2MTk1YjFmODg4 YmY0NjhlMzgyYjhkYWM3OWUzZDZmZGRkODFhOCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDEx LTEwLTI1ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KKworICAgICAgICBX ZWIgSW5zcGVjdG9yOiBvcmRlciBjb25zb2xlIG1lc3NhZ2UgcGFyYW1ldGVycyBmb3IgYmV0dGVy IG9wdGlvbmFsIHBhcmFtZXRlcnMgaGFuZGxpbmcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MDgwOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2NvbnNvbGUvY29uc29sZS1wcmVzZXJ2 ZS1sb2cuaHRtbDoKKwogMjAxMS0xMC0yNSAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJv dEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjk4MzA5Lgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvY29uc29sZS1wcmVzZXJ2 ZS1sb2cuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlL2NvbnNvbGUtcHJlc2Vy dmUtbG9nLmh0bWwKaW5kZXggYjMyZTkyNmVlNTFkOTQ0Y2M0ZDc4NGQ5YzIwZjMxZGNmNDhmMTc1 Ny4uNTE0Nzk5OTNiOTk1NWZkYmJmZWE1YzFlMmZjMDA5Y2FlZmI2OTM4ZCAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvY29uc29sZS1wcmVzZXJ2ZS1sb2cuaHRtbAor KysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9jb25zb2xlLXByZXNlcnZlLWxvZy5o dG1sCkBAIC01LDcgKzUsNyBAQAogPHNjcmlwdD4KIGZ1bmN0aW9uIHRlc3QoKQogewotICAgIFdl Ykluc3BlY3Rvci5jb25zb2xlLmFkZE1lc3NhZ2UoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdl LmNyZWF0ZVRleHRNZXNzYWdlKCJQQVNTIikpOworICAgIFdlYkluc3BlY3Rvci5jb25zb2xlLmFk ZE1lc3NhZ2UoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLmNyZWF0ZShXZWJJbnNwZWN0b3Iu Q29uc29sZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5PdGhlciwgV2ViSW5zcGVjdG9yLkNvbnNvbGVN ZXNzYWdlLk1lc3NhZ2VMZXZlbCwgIlBBU1MiKSk7CiAgICAgV2ViSW5zcGVjdG9yLnNldHRpbmdz LnByZXNlcnZlQ29uc29sZUxvZy5zZXQodHJ1ZSk7CiAgICAgSW5zcGVjdG9yVGVzdC5yZWxvYWRQ YWdlKGZ1bmN0aW9uKCkgewogICAgICAgICBJbnNwZWN0b3JUZXN0LmR1bXBDb25zb2xlTWVzc2Fn ZXMoKTsK