159320 2016-06-30 15:48:55 -0700 Web Inspector: Uncaught Exception reporter should include the currently dispatching protocol event or request/response if applicable 2016-07-06 13:23:23 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 bburg bburg bburg joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1206909 0 bburg 2016-06-30 15:48:55 -0700 Sometimes this extra info enough to narrow down the problem a lot, and doesn't require all callers of WebInspector.reportInternalError to figure out the current event/response. 1206910 1 webkit-bug-importer 2016-06-30 15:49:20 -0700 <rdar://problem/27117754> 1206912 2 282483 bburg 2016-06-30 15:51:37 -0700 Created attachment 282483 Pre-filled bug report with request/response dump 1206918 3 282486 bburg 2016-06-30 16:01:44 -0700 Created attachment 282486 Proposed Fix 1206921 4 282486 timothy 2016-06-30 16:06:10 -0700 Comment on attachment 282486 Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=282486&action=review > Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js:216 > + let responseData = {command, request:messageObject, callback}; Missing space after colon. > Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js:237 > + let responseData = {command, request:messageObject}; Missing space after colon. 1206934 5 282486 joepeck 2016-06-30 16:44:44 -0700 Comment on attachment 282486 Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=282486&action=review > Source/WebInspectorUI/UserInterface/Debug/UncaughtExceptionReporter.js:192 > + return string.length > 500 ? string.substr(0, 500) + "..." : string; Actual ellipsis? =) > Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js:50 > + } Style: semicolon. > Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js:184 > + get currentDispatchState() { return this._currentDispatchState; } Style: Move this up with the other accessors. 1208368 6 bburg 2016-07-06 13:23:23 -0700 Committed r202875: <http://trac.webkit.org/changeset/202875> 282483 2016-06-30 15:51:37 -0700 2016-06-30 15:51:37 -0700 Pre-filled bug report with request/response dump prefilled.txt text/plain 1704 bburg LS0tLS0tLQpJbnNwZWN0ZWQgVVJMOiAgICAgICAgaHR0cDovL3d3dy5tc25iYy5jb20vCkxvYWRp bmcgY29tcGxldGVkOiAgICB0cnVlCkZyb250ZW5kIFVzZXIgQWdlbnQ6ICBNb3ppbGxhLzUuMCAo TWFjaW50b3NoOyBJbnRlbCBNYWMgT1MgWCAxMF8xMV82KSBBcHBsZVdlYktpdC82MDIuMS40MCsg KEtIVE1MLCBsaWtlIEdlY2tvKQpEaXNwYXRjaCBTb3VyY2U6ICAgICAgUHJvdG9jb2wgQ29tbWFu ZCBSZXNwb25zZQoKUHJvdG9jb2wgQ29tbWFuZCBSZXNwb25zZToKeyJlcnJvciI6eyJjb2RlIjot MzIwMDAsIm1lc3NhZ2UiOiJFeGVjdXRpb24gY29udGV4dCB3aXRoIGdpdmVuIGlkIG5vdCBmb3Vu ZC4iLCJkYXRhIjpbeyJjb2RlIjotMzIwMDAsIm1lc3NhZ2UiOiJFeGVjdXRpb24gY29udGV4dCB3 aXRoIGdpdmVuIGlkIG5vdCBmb3VuZC4ifV19LCJpZCI6Mjg2fQoKUHJvdG9jb2wgQ29tbWFuZCBS ZXF1ZXN0Ogp7ImlkIjoyODYsIm1ldGhvZCI6IlJ1bnRpbWUuZXZhbHVhdGUiLCJwYXJhbXMiOnsi ZXhwcmVzc2lvbiI6IlxuLy8jIHNvdXJjZVVSTD1fX1dlYkluc3BlY3RvckludGVybmFsX19cbmRv Y3VtZW50Iiwib2JqZWN0R3JvdXAiOiIiLCJpbmNsdWRlQ29tbWFuZExpbmVBUEkiOmZhbHNlLCJk b05vdFBhdXNlT25FeGNlcHRpb25zQW5kTXV0ZUNvbnNvbGUiOnRydWUsImNvbnRleHRJZCI6MjQs InJldHVybkJ5VmFsdWUiOmZhbHNlLCJnZW5lcmF0ZVByZXZpZXciOmZhbHNlfX0KClVuY2F1Z2h0 IEV4Y2VwdGlvbnM6CiAtIG51bGwgaXMgbm90IGFuIG9iamVjdCAoZXZhbHVhdGluZyAncm9vdE5v ZGUuaWQnKSAoYXQgRE9NVHJlZS5qczoxMzE6NzIpCiAgICA/IEAgRE9NVHJlZS5qczoxMzE6NzIK ICAgIGRpc3BhdGNoQ2FsbGJhY2tzIEAgRE9NVHJlZS5qczoyMDU6NTIKICAgIHJvb3RPYmplY3RB dmFpbGFibGUgQCBET01UcmVlLmpzOjE1NTozOQogICAgcm9vdE9iamVjdEF2YWlsYWJsZSBAIFtu YXRpdmUgY29kZV0KICAgIF9kaXNwYXRjaFJlc3BvbnNlVG9DYWxsYmFjayBAIEluc3BlY3RvckJh Y2tlbmQuanM6MzEzOjI3CiAgICBfZGlzcGF0Y2hSZXNwb25zZSBAIEluc3BlY3RvckJhY2tlbmQu anM6MjgzOjQ1CiAgICBkaXNwYXRjaCBAIEluc3BlY3RvckJhY2tlbmQuanM6MTU3OjM1CiAgICBk aXNwYXRjaE5leHRRdWV1ZWRNZXNzYWdlRnJvbUJhY2tlbmQgQCBNZXNzYWdlRGlzcGF0Y2hlci5q czo0MjozNAoKQWRkaXRpb25hbCBEZXRhaWxzOgogICAgY2F1c2UgLS0+IEFuIHVuY2F1Z2h0IGV4 Y2VwdGlvbiB3YXMgdGhyb3duIHdoaWxlIGRpc3BhdGNoaW5nIHJlc3BvbnNlIGNhbGxiYWNrIGZv ciBjb21tYW5kIFJ1bnRpbWUuZXZhbHVhdGUuCi0tLS0tLS0KCiogU1RFUFMgVE8gUkVQUk9EVUNF CjEuIFdoYXQgd2VyZSB5b3UgZG9pbmc/IEluY2x1ZGUgc2V0dXAgb3Igb3RoZXIgcHJlcGFyYXRp b25zIHRvIHJlcHJvZHVjZSB0aGUgZXhjZXB0aW9uLgoyLiBJbmNsdWRlIGV4cGxpY2l0LCBhY2N1 cmF0ZSwgYW5kIG1pbmltYWwgc3RlcHMgdGFrZW4uIERvIG5vdCBpbmNsdWRlIGV4dHJhbmVvdXMg b3IgaXJyZWxldmFudCBzdGVwcy4KCiogTk9URVMKRG9jdW1lbnQgYW55IGFkZGl0aW9uYWwgaW5m b3JtYXRpb24gdGhhdCBtaWdodCBiZSB1c2VmdWwgaW4gcmVzb2x2aW5nIHRoZSBwcm9ibGVtLCBz dWNoIGFzIHNjcmVlbiBzaG90cyBvciBvdGhlciBpbmNsdWRlZCBhdHRhY2htZW50cy4K 282486 2016-06-30 16:01:44 -0700 2016-06-30 16:06:10 -0700 Proposed Fix bug-159320-20160630160122.patch text/plain 10971 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyNzEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA2 NzAzMTc1MDY3Nzk0ZWNiZTU2ODUwNGFiMDNjMWU2YjVjZDY0N2E2Li5jYzI4ZGE0NTNkYWZkM2Yw M2MzYmVjMTRjMjcyNTdkZGU3MWRmNDYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNSBAQAorMjAxNi0wNi0zMCAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBVbmNhdWdodCBFeGNlcHRpb24gcmVwb3J0ZXIgc2hvdWxk IGluY2x1ZGUgdGhlIGN1cnJlbnRseSBkaXNwYXRjaGluZyBwcm90b2NvbCBldmVudCBvciByZXF1 ZXN0L3Jlc3BvbnNlIGlmIGFwcGxpY2FibGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE1OTMyMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjcxMTc3 NTQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgS2Vl cCB0cmFjayBvZiB0aGUgY3VycmVudGx5IGRpc3BhdGNoZWQgcHJvdG9jb2wgcmVzcG9uc2Ugb3Ig cHJvdG9jb2wgZXZlbnQgYW5kIG1ha2UKKyAgICAgICAgdGhlbSBhdmFpbGFibGUgdG8gdGhlIHVu Y2F1Z2h0IGV4Y2VwdGlvbiByZXBvcnRlci4gSWYgYW4gaW50ZXJuYWwgZXhjZXB0aW9uIGlzIHJl cG9ydGVkCisgICAgICAgIHdoaWxlIGRpc3BhdGNoaW5nIGFuIGV2ZW50IG9yIHJlc3BvbnNlLCBk dW1wIHRoZSBwcm90b2NvbCBtZXNzYWdlKHMpIGludG8gdGhlIHByZS1maWxsZWQKKyAgICAgICAg YnVnIHJlcG9ydC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvRGVidWcvVW5jYXVnaHRFeGNl cHRpb25SZXBvcnRlci5qczoKKyAgICAgICAgKHN0cmluZ2lmeUFuZFRydW5jYXRlT2JqZWN0KTog QWRkZWQuCisgICAgICAgIFJlYXJyYW5nZSB0aGUgY29kZSB0aGF0IGdlbmVyYXRlcyB0aGUgcHJl LWZpbGxlZCByZXBvcnQgc28gaXQncyBlYXNpZXIgdG8gYWRkIG9wdGlvbmFsIHNlY3Rpb25zLgor CisgICAgICAgICogVXNlckludGVyZmFjZS9Qcm90b2NvbC9JbnNwZWN0b3JCYWNrZW5kLmpzOgor ICAgICAgICAoSW5zcGVjdG9yQmFja2VuZENsYXNzKToKKyAgICAgICAgKEluc3BlY3RvckJhY2tl bmRDbGFzcy5wcm90b3R5cGUuZ2V0IGN1cnJlbnREaXNwYXRjaFN0YXRlKTogRXhwb3NlIHRoZSBk aXNwYXRjaGluZyBzdGF0ZS4KKyAgICAgICAgKEluc3BlY3RvckJhY2tlbmRDbGFzcy5wcm90b3R5 cGUuX3NlbmRDb21tYW5kVG9CYWNrZW5kV2l0aENhbGxiYWNrKToKKyAgICAgICAgKEluc3BlY3Rv ckJhY2tlbmRDbGFzcy5wcm90b3R5cGUuX3NlbmRDb21tYW5kVG9CYWNrZW5kRXhwZWN0aW5nUHJv bWlzZSk6CisgICAgICAgIFN0b3JlIHRoZSBvcmlnaW5hdGluZyBjb21tYW5kIHJlcXVlc3Qgd2l0 aCB0aGUgcGVuZGluZ1Jlc3BvbnNlIGRhdGEgc28gdGhhdCB3ZSBjYW4gZXhhbWluZQorICAgICAg ICB0aGUgb3JpZ2luYXRpbmcgcmVxdWVzdCBpZiB0aGUgcmVzcG9uc2UgY2F1c2VzIGFuIGVycm9y LiBUaGlzIHdpbGwgY2F1c2UgcmVxdWVzdCBtZXNzYWdlIG9iamVjdHMKKyAgICAgICAgdG8gYmUg Z2FyYmFnZS1jb2xsZWN0ZWQgYWZ0ZXIgdGhlaXIgcmVzcG9uc2VzIGFyZSBkaXNwYXRjaGVkIHJh dGhlciB0aGFuIHdoZW4gdGhlIHJlcXVlc3QgaXMgc2VudC4KKyAgICAgICAgQnV0LCBJIGRvbid0 IGZvcnNlZSB0aGlzIGJlaW5nIGEgcGVyZm9ybWFuY2UgcHJvYmxlbSBzaW5jZSB3ZSBzaG91bGQg YWx3YXlzIGdldCBhIGNvbW1hbmQgcmVzcG9uc2UKKyAgICAgICAgYW5kIHBlbmRpbmcgY29tbWFu ZCByZXNwb25zZXMgZG8gbm90IHR5cGljYWxseSBhY2N1bXVsYXRlIGV4Y2VwdCB3aGVuIHRoZSBp bnNwZWN0b3IgZmlyc3QgbG9hZHMuCisKKyAgICAgICAgKEluc3BlY3RvckJhY2tlbmRDbGFzcy5w cm90b3R5cGUuX2Rpc3BhdGNoUmVzcG9uc2UpOiBTYXZlIHRoZSByZXNwb25zZSBiZWluZyBkaXNw YXRjaGVkLgorICAgICAgICAoSW5zcGVjdG9yQmFja2VuZENsYXNzLnByb3RvdHlwZS5fZGlzcGF0 Y2hSZXNwb25zZVRvQ2FsbGJhY2spOiBTaW1wbGlmeSBleGNlcHRpb24gcmVwb3J0aW5nLgorICAg ICAgICAoSW5zcGVjdG9yQmFja2VuZENsYXNzLnByb3RvdHlwZS5fZGlzcGF0Y2hFdmVudCk6IFNh dmUgdGhlIGV2ZW50IGJlaW5nIGRpc3BhdGNoZWQuCisKIDIwMTYtMDYtMzAgIE5pa2l0YSBWYXNp bHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogQWRk ICJzcHJpbmciIHRvIHRyYW5zaXRpb24tdGltaW5nLWZ1bmN0aW9uIHZhbHVlIGF1dG9jb21wbGV0 aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9EZWJ1 Zy9VbmNhdWdodEV4Y2VwdGlvblJlcG9ydGVyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvRGVidWcvVW5jYXVnaHRFeGNlcHRpb25SZXBvcnRlci5qcwppbmRleCBhZGVi ZWJmMDA0ZmQ1NGMxZDllZjQ5YTE1MmQ1YWZiNjRmZThhNDgxLi4wYTNjNmY0NTliMjFiOTQzYjZi MGY4MzgxYmQxYjRjYzViYTk5YTQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9EZWJ1Zy9VbmNhdWdodEV4Y2VwdGlvblJlcG9ydGVyLmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0RlYnVnL1VuY2F1Z2h0RXhjZXB0aW9u UmVwb3J0ZXIuanMKQEAgLTE4MSwxNiArMTgxLDQ2IEBAIGZ1bmN0aW9uIGNyZWF0ZUVycm9yU2hl ZXQoKSB7CiAgICAgICAgIGluc3BlY3RlZFBhZ2VVUkwgPSBXZWJJbnNwZWN0b3IuZnJhbWVSZXNv dXJjZU1hbmFnZXIubWFpbkZyYW1lLnVybDsKICAgICB9IGNhdGNoIChlKSB7IH0KIAorICAgIGxl dCB0b3BMZXZlbEl0ZW1zID0gWworICAgICAgICBgSW5zcGVjdGVkIFVSTDogICAgICAgICR7aW5z cGVjdGVkUGFnZVVSTCB8fCAiKHVua25vd24pIn1gLAorICAgICAgICBgTG9hZGluZyBjb21wbGV0 ZWQ6ICAgICR7ISFsb2FkQ29tcGxldGVkfWAsCisgICAgICAgIGBGcm9udGVuZCBVc2VyIEFnZW50 OiAgJHt3aW5kb3cubmF2aWdhdG9yLnVzZXJBZ2VudH1gLAorICAgIF07CisKKyAgICBmdW5jdGlv biBzdHJpbmdpZnlBbmRUcnVuY2F0ZU9iamVjdChvYmplY3QpIHsKKyAgICAgICAgbGV0IHN0cmlu ZyA9IEpTT04uc3RyaW5naWZ5KG9iamVjdCk7CisgICAgICAgIHJldHVybiBzdHJpbmcubGVuZ3Ro ID4gNTAwID8gc3RyaW5nLnN1YnN0cigwLCA1MDApICsgIi4uLiIgOiBzdHJpbmc7CisgICAgfQor CisgICAgaWYgKEluc3BlY3RvckJhY2tlbmQgJiYgSW5zcGVjdG9yQmFja2VuZC5jdXJyZW50RGlz cGF0Y2hTdGF0ZSkgeworICAgICAgICBsZXQgc3RhdGUgPSBJbnNwZWN0b3JCYWNrZW5kLmN1cnJl bnREaXNwYXRjaFN0YXRlOworICAgICAgICBpZiAoc3RhdGUuZXZlbnQpIHsKKyAgICAgICAgICAg IHRvcExldmVsSXRlbXMucHVzaCgiRGlzcGF0Y2ggU291cmNlOiAgICAgIFByb3RvY29sIEV2ZW50 Iik7CisgICAgICAgICAgICB0b3BMZXZlbEl0ZW1zLnB1c2goIiIpOworICAgICAgICAgICAgdG9w TGV2ZWxJdGVtcy5wdXNoKCJQcm90b2NvbCBFdmVudDoiKTsKKyAgICAgICAgICAgIHRvcExldmVs SXRlbXMucHVzaChzdHJpbmdpZnlBbmRUcnVuY2F0ZU9iamVjdChzdGF0ZS5ldmVudCkpOworICAg ICAgICB9CisgICAgICAgIGlmIChzdGF0ZS5yZXNwb25zZSkgeworICAgICAgICAgICAgdG9wTGV2 ZWxJdGVtcy5wdXNoKCJEaXNwYXRjaCBTb3VyY2U6ICAgICAgUHJvdG9jb2wgQ29tbWFuZCBSZXNw b25zZSIpOworICAgICAgICAgICAgdG9wTGV2ZWxJdGVtcy5wdXNoKCIiKTsKKyAgICAgICAgICAg IHRvcExldmVsSXRlbXMucHVzaCgiUHJvdG9jb2wgQ29tbWFuZCBSZXNwb25zZToiKTsKKyAgICAg ICAgICAgIHRvcExldmVsSXRlbXMucHVzaChzdHJpbmdpZnlBbmRUcnVuY2F0ZU9iamVjdChzdGF0 ZS5yZXNwb25zZSkpOworICAgICAgICB9CisgICAgICAgIGlmIChzdGF0ZS5yZXF1ZXN0KSB7Cisg ICAgICAgICAgICB0b3BMZXZlbEl0ZW1zLnB1c2goIiIpOworICAgICAgICAgICAgdG9wTGV2ZWxJ dGVtcy5wdXNoKCJQcm90b2NvbCBDb21tYW5kIFJlcXVlc3Q6Iik7CisgICAgICAgICAgICB0b3BM ZXZlbEl0ZW1zLnB1c2goc3RyaW5naWZ5QW5kVHJ1bmNhdGVPYmplY3Qoc3RhdGUucmVxdWVzdCkp OworICAgICAgICB9CisgICAgfQorCiAgICAgbGV0IGZvcm1hdHRlZEVycm9yRGV0YWlscyA9IHdp bmRvdy5fX3VuY2F1Z2h0RXhjZXB0aW9ucy5tYXAoKGVudHJ5KSA9PiBmb3JtYXR0ZWRFbnRyeShl bnRyeSkpOwogICAgIGxldCBkZXRhaWxzRm9yQnVnUmVwb3J0ID0gZm9ybWF0dGVkRXJyb3JEZXRh aWxzLm1hcCgobGluZSkgPT4gYCAtICR7bGluZX1gKS5qb2luKCJcbiIpOwotICAgIGxldCBlbmNv ZGVkQnVnRGVzY3JpcHRpb24gPSBlbmNvZGVVUklDb21wb25lbnQoYC0tLS0tLS0KLUF1dG8tZ2Vu ZXJhdGVkIGRldGFpbHM6CisgICAgdG9wTGV2ZWxJdGVtcy5wdXNoKCIiKTsKKyAgICB0b3BMZXZl bEl0ZW1zLnB1c2goIlVuY2F1Z2h0IEV4Y2VwdGlvbnM6Iik7CisgICAgdG9wTGV2ZWxJdGVtcy5w dXNoKGRldGFpbHNGb3JCdWdSZXBvcnQpOwogCi1JbnNwZWN0ZWQgVVJMOiAgICAgICAgJHtpbnNw ZWN0ZWRQYWdlVVJMIHx8ICIodW5rbm93bikifQotTG9hZGluZyBjb21wbGV0ZWQ6ICAgICR7ISFs b2FkQ29tcGxldGVkfQotRnJvbnRlbmQgVXNlciBBZ2VudDogICR7d2luZG93Lm5hdmlnYXRvci51 c2VyQWdlbnR9Ci1VbmNhdWdodCBleGNlcHRpb25zOgotJHtkZXRhaWxzRm9yQnVnUmVwb3J0fQor ICAgIGxldCBlbmNvZGVkQnVnRGVzY3JpcHRpb24gPSBlbmNvZGVVUklDb21wb25lbnQoYC0tLS0t LS0KKyR7dG9wTGV2ZWxJdGVtcy5qb2luKCJcbiIpfQogLS0tLS0tLQogCiAqIFNURVBTIFRPIFJF UFJPRFVDRQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv UHJvdG9jb2wvSW5zcGVjdG9yQmFja2VuZC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1Byb3RvY29sL0luc3BlY3RvckJhY2tlbmQuanMKaW5kZXggZTNlMWE0OGUyMmEx M2Q3ZDAyYTY0MTc0Y2MwYzg5ZmU2MzdiYWRjMC4uZWEzYTczZjZiNjNlYTVlYTk3ZDlhOWQzYTc5 MDAwNTE5MTZkNzFjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvUHJvdG9jb2wvSW5zcGVjdG9yQmFja2VuZC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9JbnNwZWN0b3JCYWNrZW5kLmpzCkBAIC00Myw2 ICs0MywxMiBAQCBJbnNwZWN0b3JCYWNrZW5kQ2xhc3MgPSBjbGFzcyBJbnNwZWN0b3JCYWNrZW5k Q2xhc3MKICAgICAgICAgdGhpcy5fZGVmYXVsdFRyYWNlciA9IG5ldyBXZWJJbnNwZWN0b3IuTG9n Z2luZ1Byb3RvY29sVHJhY2VyOwogICAgICAgICB0aGlzLl9hY3RpdmVUcmFjZXJzID0gW3RoaXMu X2RlZmF1bHRUcmFjZXJdOwogCisgICAgICAgIHRoaXMuX2N1cnJlbnREaXNwYXRjaFN0YXRlID0g eworICAgICAgICAgICAgZXZlbnQ6IG51bGwsCisgICAgICAgICAgICByZXF1ZXN0OiBudWxsLAor ICAgICAgICAgICAgcmVzcG9uc2U6IG51bGwsCisgICAgICAgIH0KKwogICAgICAgICB0aGlzLl9k dW1wSW5zcGVjdG9yVGltZVN0YXRzID0gZmFsc2U7CiAKICAgICAgICAgbGV0IHNldHRpbmcgPSBX ZWJJbnNwZWN0b3IuYXV0b0xvZ1Byb3RvY29sTWVzc2FnZXNTZXR0aW5nID0gbmV3IFdlYkluc3Bl Y3Rvci5TZXR0aW5nKCJhdXRvLWNvbGxlY3QtcHJvdG9jb2wtbWVzc2FnZXMiLCBmYWxzZSk7CkBA IC0xNzUsNiArMTgxLDggQEAgSW5zcGVjdG9yQmFja2VuZENsYXNzID0gY2xhc3MgSW5zcGVjdG9y QmFja2VuZENsYXNzCiAgICAgICAgIHJldHVybiBudWxsOwogICAgIH0KIAorICAgIGdldCBjdXJy ZW50RGlzcGF0Y2hTdGF0ZSgpIHsgcmV0dXJuIHRoaXMuX2N1cnJlbnREaXNwYXRjaFN0YXRlOyB9 CisKICAgICAvLyBQcml2YXRlCiAKICAgICBfc3RhcnRPclN0b3BBdXRvbWF0aWNUcmFjaW5nKCkK QEAgLTIwNSw3ICsyMTMsNyBAQCBJbnNwZWN0b3JCYWNrZW5kQ2xhc3MgPSBjbGFzcyBJbnNwZWN0 b3JCYWNrZW5kQ2xhc3MKICAgICAgICAgaWYgKCFpc0VtcHR5T2JqZWN0KHBhcmFtZXRlcnMpKQog ICAgICAgICAgICAgbWVzc2FnZU9iamVjdFsicGFyYW1zIl0gPSBwYXJhbWV0ZXJzOwogCi0gICAg ICAgIGxldCByZXNwb25zZURhdGEgPSB7Y29tbWFuZCwgY2FsbGJhY2t9OworICAgICAgICBsZXQg cmVzcG9uc2VEYXRhID0ge2NvbW1hbmQsIHJlcXVlc3Q6bWVzc2FnZU9iamVjdCwgY2FsbGJhY2t9 OwogCiAgICAgICAgIGlmICh0aGlzLmFjdGl2ZVRyYWNlcikKICAgICAgICAgICAgIHJlc3BvbnNl RGF0YS5zZW5kUmVxdWVzdFRpbWVzdGFtcCA9IHRpbWVzdGFtcCgpOwpAQCAtMjI2LDcgKzIzNCw3 IEBAIEluc3BlY3RvckJhY2tlbmRDbGFzcyA9IGNsYXNzIEluc3BlY3RvckJhY2tlbmRDbGFzcwog ICAgICAgICBpZiAoIWlzRW1wdHlPYmplY3QocGFyYW1ldGVycykpCiAgICAgICAgICAgICBtZXNz YWdlT2JqZWN0WyJwYXJhbXMiXSA9IHBhcmFtZXRlcnM7CiAKLSAgICAgICAgbGV0IHJlc3BvbnNl RGF0YSA9IHtjb21tYW5kfTsKKyAgICAgICAgbGV0IHJlc3BvbnNlRGF0YSA9IHtjb21tYW5kLCBy ZXF1ZXN0Om1lc3NhZ2VPYmplY3R9OwogCiAgICAgICAgIGlmICh0aGlzLmFjdGl2ZVRyYWNlcikK ICAgICAgICAgICAgIHJlc3BvbnNlRGF0YS5zZW5kUmVxdWVzdFRpbWVzdGFtcCA9IHRpbWVzdGFt cCgpOwpAQCAtMjYyLDE5ICsyNzAsMjUgQEAgSW5zcGVjdG9yQmFja2VuZENsYXNzID0gY2xhc3Mg SW5zcGVjdG9yQmFja2VuZENsYXNzCiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMuX3BlbmRp bmdSZXNwb25zZXMuaGFzKHNlcXVlbmNlSWQpLCBzZXF1ZW5jZUlkLCB0aGlzLl9wZW5kaW5nUmVz cG9uc2VzKTsKIAogICAgICAgICBsZXQgcmVzcG9uc2VEYXRhID0gdGhpcy5fcGVuZGluZ1Jlc3Bv bnNlcy50YWtlKHNlcXVlbmNlSWQpIHx8IHt9OwotICAgICAgICBsZXQge2NvbW1hbmQsIGNhbGxi YWNrLCBwcm9taXNlfSA9IHJlc3BvbnNlRGF0YTsKKyAgICAgICAgbGV0IHtyZXF1ZXN0LCBjb21t YW5kLCBjYWxsYmFjaywgcHJvbWlzZX0gPSByZXNwb25zZURhdGE7CiAKICAgICAgICAgbGV0IHBy b2Nlc3NpbmdTdGFydFRpbWVzdGFtcCA9IHRpbWVzdGFtcCgpOwogICAgICAgICBmb3IgKGxldCB0 cmFjZXIgb2YgdGhpcy5hY3RpdmVUcmFjZXJzKQogICAgICAgICAgICAgdHJhY2VyLmxvZ1dpbGxI YW5kbGVSZXNwb25zZShtZXNzYWdlT2JqZWN0KTsKIAorICAgICAgICB0aGlzLl9jdXJyZW50RGlz cGF0Y2hTdGF0ZS5yZXF1ZXN0ID0gcmVxdWVzdDsKKyAgICAgICAgdGhpcy5fY3VycmVudERpc3Bh dGNoU3RhdGUucmVzcG9uc2UgPSBtZXNzYWdlT2JqZWN0OworCiAgICAgICAgIGlmICh0eXBlb2Yg Y2FsbGJhY2sgPT09ICJmdW5jdGlvbiIpCi0gICAgICAgICAgICB0aGlzLl9kaXNwYXRjaFJlc3Bv bnNlVG9DYWxsYmFjayhjb21tYW5kLCBtZXNzYWdlT2JqZWN0LCBjYWxsYmFjayk7CisgICAgICAg ICAgICB0aGlzLl9kaXNwYXRjaFJlc3BvbnNlVG9DYWxsYmFjayhjb21tYW5kLCByZXF1ZXN0LCBt ZXNzYWdlT2JqZWN0LCBjYWxsYmFjayk7CiAgICAgICAgIGVsc2UgaWYgKHR5cGVvZiBwcm9taXNl ID09PSAib2JqZWN0IikKICAgICAgICAgICAgIHRoaXMuX2Rpc3BhdGNoUmVzcG9uc2VUb1Byb21p c2UoY29tbWFuZCwgbWVzc2FnZU9iamVjdCwgcHJvbWlzZSk7CiAgICAgICAgIGVsc2UKICAgICAg ICAgICAgIGNvbnNvbGUuZXJyb3IoIlJlY2VpdmVkIGEgY29tbWFuZCByZXNwb25zZSB3aXRob3V0 IGEgY29ycmVzcG9uZGluZyBjYWxsYmFjayBvciBwcm9taXNlLiIsIG1lc3NhZ2VPYmplY3QsIGNv bW1hbmQpOwogCisgICAgICAgIHRoaXMuX2N1cnJlbnREaXNwYXRjaFN0YXRlLnJlcXVlc3QgPSBu dWxsOworICAgICAgICB0aGlzLl9jdXJyZW50RGlzcGF0Y2hTdGF0ZS5yZXNwb25zZSA9IG51bGw7 CisKICAgICAgICAgbGV0IHByb2Nlc3NpbmdUaW1lID0gKHRpbWVzdGFtcCgpIC0gcHJvY2Vzc2lu Z1N0YXJ0VGltZXN0YW1wKS50b0ZpeGVkKDMpOwogICAgICAgICBsZXQgcm91bmRUcmlwVGltZSA9 IChwcm9jZXNzaW5nU3RhcnRUaW1lc3RhbXAgLSByZXNwb25zZURhdGEuc2VuZFJlcXVlc3RUaW1l c3RhbXApLnRvRml4ZWQoMyk7CiAKQEAgLTI4NSwyMyArMjk5LDIwIEBAIEluc3BlY3RvckJhY2tl bmRDbGFzcyA9IGNsYXNzIEluc3BlY3RvckJhY2tlbmRDbGFzcwogICAgICAgICAgICAgdGhpcy5f Zmx1c2hQZW5kaW5nU2NyaXB0cygpOwogICAgIH0KIAotICAgIF9kaXNwYXRjaFJlc3BvbnNlVG9D YWxsYmFjayhjb21tYW5kLCBtZXNzYWdlT2JqZWN0LCBjYWxsYmFjaykKKyAgICBfZGlzcGF0Y2hS ZXNwb25zZVRvQ2FsbGJhY2soY29tbWFuZCwgcmVxdWVzdE9iamVjdCwgcmVzcG9uc2VPYmplY3Qs IGNhbGxiYWNrKQogICAgIHsKICAgICAgICAgbGV0IGNhbGxiYWNrQXJndW1lbnRzID0gW107Ci0g ICAgICAgIGNhbGxiYWNrQXJndW1lbnRzLnB1c2gobWVzc2FnZU9iamVjdFsiZXJyb3IiXSA/IG1l c3NhZ2VPYmplY3RbImVycm9yIl0ubWVzc2FnZSA6IG51bGwpOworICAgICAgICBjYWxsYmFja0Fy Z3VtZW50cy5wdXNoKHJlc3BvbnNlT2JqZWN0WyJlcnJvciJdID8gcmVzcG9uc2VPYmplY3RbImVy cm9yIl0ubWVzc2FnZSA6IG51bGwpOwogCi0gICAgICAgIGlmIChtZXNzYWdlT2JqZWN0WyJyZXN1 bHQiXSkgewotICAgICAgICAgICAgZm9yICh2YXIgcGFyYW1ldGVyTmFtZSBvZiBjb21tYW5kLnJl cGx5U2lnbmF0dXJlKQotICAgICAgICAgICAgICAgIGNhbGxiYWNrQXJndW1lbnRzLnB1c2gobWVz c2FnZU9iamVjdFsicmVzdWx0Il1bcGFyYW1ldGVyTmFtZV0pOworICAgICAgICBpZiAocmVzcG9u c2VPYmplY3RbInJlc3VsdCJdKSB7CisgICAgICAgICAgICBmb3IgKGxldCBwYXJhbWV0ZXJOYW1l IG9mIGNvbW1hbmQucmVwbHlTaWduYXR1cmUpCisgICAgICAgICAgICAgICAgY2FsbGJhY2tBcmd1 bWVudHMucHVzaChyZXNwb25zZU9iamVjdFsicmVzdWx0Il1bcGFyYW1ldGVyTmFtZV0pOwogICAg ICAgICB9CiAKICAgICAgICAgdHJ5IHsKICAgICAgICAgICAgIGNhbGxiYWNrLmFwcGx5KG51bGws IGNhbGxiYWNrQXJndW1lbnRzKTsKICAgICAgICAgfSBjYXRjaCAoZSkgewotICAgICAgICAgICAg V2ViSW5zcGVjdG9yLnJlcG9ydEludGVybmFsRXJyb3IoZSwgewotICAgICAgICAgICAgICAgICJj YXVzZSI6IGBBbiB1bmNhdWdodCBleGNlcHRpb24gd2FzIHRocm93biB3aGlsZSBkaXNwYXRjaGlu ZyByZXNwb25zZSBjYWxsYmFjayBmb3IgY29tbWFuZCAke2NvbW1hbmQucXVhbGlmaWVkTmFtZX0u YCwKLSAgICAgICAgICAgICAgICAicHJvdG9jb2wtbWVzc2FnZSI6IEpTT04uc3RyaW5naWZ5KG1l c3NhZ2VPYmplY3QpLAotICAgICAgICAgICAgfSk7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3Iu cmVwb3J0SW50ZXJuYWxFcnJvcihlLCB7ImNhdXNlIjogYEFuIHVuY2F1Z2h0IGV4Y2VwdGlvbiB3 YXMgdGhyb3duIHdoaWxlIGRpc3BhdGNoaW5nIHJlc3BvbnNlIGNhbGxiYWNrIGZvciBjb21tYW5k ICR7Y29tbWFuZC5xdWFsaWZpZWROYW1lfS5gfSk7CiAgICAgICAgIH0KICAgICB9CiAKQEAgLTM0 MywxOCArMzU0LDE5IEBAIEluc3BlY3RvckJhY2tlbmRDbGFzcyA9IGNsYXNzIEluc3BlY3RvckJh Y2tlbmRDbGFzcwogICAgICAgICBmb3IgKGxldCB0cmFjZXIgb2YgdGhpcy5hY3RpdmVUcmFjZXJz KQogICAgICAgICAgICAgdHJhY2VyLmxvZ1dpbGxIYW5kbGVFdmVudChtZXNzYWdlT2JqZWN0KTsK IAorICAgICAgICB0aGlzLl9jdXJyZW50RGlzcGF0Y2hTdGF0ZS5ldmVudCA9IG1lc3NhZ2VPYmpl Y3Q7CisKICAgICAgICAgdHJ5IHsKICAgICAgICAgICAgIGFnZW50LmRpc3BhdGNoRXZlbnQoZXZl bnROYW1lLCBldmVudEFyZ3VtZW50cyk7CiAgICAgICAgIH0gY2F0Y2ggKGUpIHsKICAgICAgICAg ICAgIGZvciAobGV0IHRyYWNlciBvZiB0aGlzLmFjdGl2ZVRyYWNlcnMpCiAgICAgICAgICAgICAg ICAgdHJhY2VyLmxvZ0Zyb250ZW5kRXhjZXB0aW9uKG1lc3NhZ2VPYmplY3QsIGUpOwogCi0gICAg ICAgICAgICBXZWJJbnNwZWN0b3IucmVwb3J0SW50ZXJuYWxFcnJvcihlLCB7Ci0gICAgICAgICAg ICAgICAgImNhdXNlIjogYEFuIHVuY2F1Z2h0IGV4Y2VwdGlvbiB3YXMgdGhyb3duIHdoaWxlIGhh bmRsaW5nIGV2ZW50OiAke3F1YWxpZmllZE5hbWV9YCwKLSAgICAgICAgICAgICAgICAicHJvdG9j b2wtbWVzc2FnZSI6IEpTT04uc3RyaW5naWZ5KG1lc3NhZ2VPYmplY3QpLAotICAgICAgICAgICAg fSk7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IucmVwb3J0SW50ZXJuYWxFcnJvcihlLCB7ImNh dXNlIjogYEFuIHVuY2F1Z2h0IGV4Y2VwdGlvbiB3YXMgdGhyb3duIHdoaWxlIGhhbmRsaW5nIGV2 ZW50OiAke3F1YWxpZmllZE5hbWV9YH0pOwogICAgICAgICB9CiAKKyAgICAgICAgdGhpcy5fY3Vy cmVudERpc3BhdGNoU3RhdGUuZXZlbnQgPSBudWxsOworCiAgICAgICAgIGxldCBwcm9jZXNzaW5n RHVyYXRpb24gPSAodGltZXN0YW1wKCkgLSBwcm9jZXNzaW5nU3RhcnRUaW1lc3RhbXApLnRvRml4 ZWQoMyk7CiAgICAgICAgIGZvciAobGV0IHRyYWNlciBvZiB0aGlzLmFjdGl2ZVRyYWNlcnMpCiAg ICAgICAgICAgICB0cmFjZXIubG9nRGlkSGFuZGxlRXZlbnQobWVzc2FnZU9iamVjdCwge2Rpc3Bh dGNoOiBwcm9jZXNzaW5nRHVyYXRpb259KTsK