64864 2011-07-20 05:16:52 -0700 Web Inspector: add shortcuts to load/save operations in Timeline panel 2011-07-20 08:44:12 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 loislo loislo apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 439752 0 loislo 2011-07-20 05:16:52 -0700 %subj% 439764 1 101456 loislo 2011-07-20 06:20:05 -0700 Created attachment 101456 [patch] initial version Export/import were renamed to save/load. Ctrl|Meta-S/Ctrl|Meta-O shortcuts were added for Save and Load operations. Ctrl|Meta-E shortcut toggles Record button; Ctrl|Meta-H shortcut toggles short records filter button; All the shortcuts were added to the shortcuts help screen. There was a problem with saving empty data. 439785 2 101456 yurys 2011-07-20 06:57:02 -0700 Comment on attachment 101456 [patch] initial version View in context: https://bugs.webkit.org/attachment.cgi?id=101456&action=review > Source/WebCore/inspector/front-end/KeyboardShortcut.js:138 > + return WebInspector.KeyboardShortcut._modifiersToString(key >> 8) + WebInspector.KeyboardShortcut._keyName(key & 255); Delete this? > Source/WebCore/inspector/front-end/TimelinePanel.js:236 > + section.addKey(shortcut.shortcutToString("h", modifiers.CtrlOrMeta), WebInspector.UIString("Hide/show the records that are shorter than %s", shortRecordThresholdTitle)); Meta+h will hide browser window, won't it? 439797 3 101468 loislo 2011-07-20 07:34:16 -0700 Created attachment 101468 [patch] second version Ctrl|Meta-Shift-F shortcut toggles short records filter button 439811 4 101468 yurys 2011-07-20 08:08:19 -0700 Comment on attachment 101468 [patch] second version View in context: https://bugs.webkit.org/attachment.cgi?id=101468&action=review > Source/WebCore/inspector/front-end/TimelinePanel.js:1301 > + else I'd rather put all records into the array first and then add '[' to the first record and ']' to the last one. 439824 5 loislo 2011-07-20 08:44:12 -0700 Committed r91367: <http://trac.webkit.org/changeset/91367> 101456 2011-07-20 06:20:05 -0700 2011-07-20 07:34:16 -0700 [patch] initial version patch text/plain 12471 loislo ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA4NzYwNTQwLi44OWE2OTZkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDct MjAgIElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IGFkZCBrZXlib2FyZCBzaG9ydGN1dHMgdG8gbG9hZC9zYXZlIG9wZXJhdGlv bnMgaW4gVGltZWxpbmUgcGFuZWwuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD02NDg2NAorCisgICAgICAgIEV4cG9ydC9pbXBvcnQgd2VyZSByZW5hbWVk IHRvIHNhdmUvbG9hZC4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIGluc3BlY3Rvci90aW1lbGluZS90aW1lbGluZS1sb2FkLmh0bWw6CisKIDIwMTEt MDctMjAgIEJvcmlzIFNtdXMgIDxzbXVzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5z cGVjdG9yOiBhdWRpdCBleHRlbnNpb25zIG5lZWQgYSB3YXkgdG8gbGluayBkaXJlY3RseSB0byBy ZXNvdXJjZXMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci90aW1lbGluZS90aW1l bGluZS1sb2FkLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGltZWxpbmUvdGltZWxpbmUt bG9hZC5odG1sCmluZGV4IDU3NzU1MTIuLjZkZDA0ZWIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L2luc3BlY3Rvci90aW1lbGluZS90aW1lbGluZS1sb2FkLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5lLWxvYWQuaHRtbApAQCAtNyw3ICs3LDcgQEAKIGZ1 bmN0aW9uIHRlc3QoKQogewogICAgIFdlYkluc3BlY3Rvci5zaG93UGFuZWwoInRpbWVsaW5lIik7 Ci0gICAgSW5zcGVjdG9yVGVzdC5hZGRTbmlmZmVyKFdlYkluc3BlY3Rvci5UaW1lbGluZU1vZGVs LnByb3RvdHlwZSwgIl9pbXBvcnROZXh0Q2h1bmsiLCBpbXBvcnROZXh0Q2h1bmspOworICAgIElu c3BlY3RvclRlc3QuYWRkU25pZmZlcihXZWJJbnNwZWN0b3IuVGltZWxpbmVNb2RlbC5wcm90b3R5 cGUsICJfbG9hZE5leHRDaHVuayIsIGxvYWROZXh0Q2h1bmspOwogICAgIEluc3BlY3RvckZyb250 ZW5kSG9zdC5zYXZlQXMgPSBzYXZlQXM7CiAgICAgdmFyIGRhdGEgPSBbCiAgICAgICAgIHsic3Rh cnRUaW1lIjoxMzEwNzQ5ODU0MzE2Ljg0MDgsImRhdGEiOnsiaWRlbnRpZmllciI6NDMsInVybCI6 Imh0dHA6Ly93d3cud2Via2l0Lm9yZy8iLCJyZXF1ZXN0TWV0aG9kIjoiR0VUIn0sInR5cGUiOiJS ZXNvdXJjZVNlbmRSZXF1ZXN0IiwidXNlZEhlYXBTaXplIjoxODE5OTM2LCJ0b3RhbEhlYXBTaXpl Ijo3NjI5MTIwfSwKQEAgLTIwLDExICsyMCwxMSBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAg eyJzdGFydFRpbWUiOjEzMTA3NDk4NTUxMzcuOTg5LCJkYXRhIjp7ImlkZW50aWZpZXIiOjQ5LCJ1 cmwiOiJodHRwOi8vd3d3LndlYmtpdC5vcmcvY3NzL3B1cnBsZS5jc3MiLCJyZXF1ZXN0TWV0aG9k IjoiR0VUIn0sInR5cGUiOiJSZXNvdXJjZVNlbmRSZXF1ZXN0IiwidXNlZEhlYXBTaXplIjoyMzY3 MTkyLCJ0b3RhbEhlYXBTaXplIjo3NjI5MTIwfSwKICAgICAgICAgeyJzdGFydFRpbWUiOjEzMTA3 NDk4NTUxMzguMzA4LCJkYXRhIjp7ImlkZW50aWZpZXIiOjUwLCJ1cmwiOiJodHRwOi8vd3d3Lndl YmtpdC5vcmcvY3NzL2dyYXkuY3NzIiwicmVxdWVzdE1ldGhvZCI6IkdFVCJ9LCJ0eXBlIjoiUmVz b3VyY2VTZW5kUmVxdWVzdCIsInVzZWRIZWFwU2l6ZSI6MjM2NzE5MiwidG90YWxIZWFwU2l6ZSI6 NzYyOTEyMH1dOwogCi0gICAgV2ViSW5zcGVjdG9yLnBhbmVscy50aW1lbGluZS5fbW9kZWwuX2lt cG9ydE5leHRDaHVuayhkYXRhLCAwKTsKKyAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnRpbWVsaW5l Ll9tb2RlbC5fbG9hZE5leHRDaHVuayhkYXRhLCAwKTsKIAotICAgIGZ1bmN0aW9uIGltcG9ydE5l eHRDaHVuaygpCisgICAgZnVuY3Rpb24gbG9hZE5leHRDaHVuaygpCiAgICAgewotICAgICAgICBX ZWJJbnNwZWN0b3IucGFuZWxzLnRpbWVsaW5lLl9tb2RlbC5fZXhwb3J0VG9GaWxlKCk7CisgICAg ICAgIFdlYkluc3BlY3Rvci5wYW5lbHMudGltZWxpbmUuX21vZGVsLl9zYXZlVG9GaWxlKCk7CiAg ICAgfQogCiAgICAgZnVuY3Rpb24gc2F2ZUFzKG5hbWUsIHNhdmVEYXRhKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4 IDJjNzgyN2EuLjUyMjM3NmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxMS0wNy0y MCAgSWx5YSBUaWtob25vdnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2Vi IEluc3BlY3RvcjogYWRkIGtleWJvYXJkIHNob3J0Y3V0cyB0byBsb2FkL3NhdmUgb3BlcmF0aW9u cyBpbiBUaW1lbGluZSBwYW5lbC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTY0ODY0CisKKyAgICAgICAgRXhwb3J0L2ltcG9ydCB3ZXJlIHJlbmFtZWQg dG8gc2F2ZS9sb2FkLgorICAgICAgICBDdHJsfE1ldGEtUy9DdHJsfE1ldGEtTyBzaG9ydGN1dHMg d2VyZSBhZGRlZCBmb3IgU2F2ZSBhbmQgTG9hZCBvcGVyYXRpb25zLgorICAgICAgICBDdHJsfE1l dGEtRSBzaG9ydGN1dCB0b2dnbGVzIFJlY29yZCBidXR0b247CisgICAgICAgIEN0cmx8TWV0YS1I IHNob3J0Y3V0IHRvZ2dsZXMgc2hvcnQgcmVjb3JkcyBmaWx0ZXIgYnV0dG9uOworICAgICAgICBB bGwgdGhlIHNob3J0Y3V0cyB3ZXJlIGFkZGVkIHRvIHRoZSBzaG9ydGN1dHMgaGVscCBzY3JlZW4u CisgICAgICAgIFRoZXJlIHdhcyBhIHByb2JsZW0gd2l0aCBzYXZpbmcgZW1wdHkgZGF0YS4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEVuZ2xpc2gu bHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L1RpbWVsaW5lUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5w cm90b3R5cGUuX3JlZ2lzdGVyU2hvcnRjdXRzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1l bGluZVBhbmVsLnByb3RvdHlwZS5fY3JlYXRlRmlsZVNlbGVjdG9yKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS5fY29udGV4dE1lbnUpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlLl9zYXZlVG9GaWxlKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS5fbG9hZEZyb21GaWxlKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU1vZGVsLnByb3RvdHlwZS5fbG9hZE5leHRD aHVuayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVNb2RlbC5wcm90b3R5cGUuX2xv YWRGcm9tRmlsZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVNb2RlbC5wcm90b3R5 cGUuX2xvYWRGcm9tRmlsZS5vbkVycm9yKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGlu ZU1vZGVsLnByb3RvdHlwZS5fc2F2ZVRvRmlsZSk6CisKIDIwMTEtMDctMjAgIFl1cnkgU2VtaWto YXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogZG9u J3Qgc2VuZCBDb25zb2xlLmVuYWJsZSBtZXNzYWdlcyBpbiBjYXNlIG9mIHdvcmtlcnMKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBi L1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCA3 OWQ4ZTZmYzlkYTU5Mjg0YzNlYjkyODg0YmIzM2YwZWRiYWRmZDAwLi5mNDZkZGY3YmU3YWRkOWFk ZWEyN2ViZWFiNDhhMzA3OGE1MmFiNTJmIDEwMDY0NApHSVQgYmluYXJ5IHBhdGNoCmRlbHRhIDI0 NAp6Y21kbjxnbjhXeTxfJGxpQyhCMjNGellpRVBtWT12SkdtQ2w0eFk/Q1UxUmdsPXRtUGRlSGhk akApOzV0UVlOMnkKenIhNUBJcHVrYFkjN1lkdjs9IUQxNDhjRyhXZWxsa3MqdUhsQ3dDYHNPK05v bFdBZWZUNWc7OGZgTDc5dHVWQFA1CnpDJFo7MVpMKWRhM1RLfnJ6YUd4K2BLVVd0e2lETDx1Z2lv Y3VVKmM7c21CMSowZztKOVFXPWxMYzRvRl8tfnNAdApDYlhDdioKCmRlbHRhIDIxMAp6Y21aNFlm X2N2cTxfJGxpSCRSVmdHPzc9MCFJTDRFcEAxUXVwQF5ZbXZjUC1vJEAoOS1GaG9QU1ReVEJ7czZy SkQKem8tRHNZZkxEKHA2VW9HTEExeDxXZkFyeC02PGQkT2ZBTHYmXjJTZCM3LUVXX3F0THtoQ207 UFJnQ156JTA5U2NQCkEmO1M0YwoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvS2V5Ym9hcmRTaG9ydGN1dC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvS2V5Ym9hcmRTaG9ydGN1dC5qcwppbmRleCAyYmNmM2QxLi4yZGM1YmQ3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0tleWJvYXJkU2hv cnRjdXQuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9LZXlib2Fy ZFNob3J0Y3V0LmpzCkBAIC0xMzMsNiArMTMzLDExIEBAIFdlYkluc3BlY3Rvci5LZXlib2FyZFNo b3J0Y3V0LnNob3J0Y3V0VG9TdHJpbmcgPSBmdW5jdGlvbihrZXksIG1vZGlmaWVycykKICAgICBy ZXR1cm4gV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuX21vZGlmaWVyc1RvU3RyaW5nKG1v ZGlmaWVycykgKyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5fa2V5TmFtZShrZXkpOwog fQogCitXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5zaG9ydGN1dEtleVRvU3RyaW5nID0g ZnVuY3Rpb24oa2V5KQoreworICAgIHJldHVybiBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1 dC5fbW9kaWZpZXJzVG9TdHJpbmcoa2V5ID4+IDgpICsgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hv cnRjdXQuX2tleU5hbWUoa2V5ICYgMjU1KTsKK30KKwogV2ViSW5zcGVjdG9yLktleWJvYXJkU2hv cnRjdXQuX2tleU5hbWUgPSBmdW5jdGlvbihrZXkpCiB7CiAgICAgaWYgKHR5cGVvZiBrZXkgPT09 ICJzdHJpbmciKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9UaW1lbGluZVBhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9U aW1lbGluZVBhbmVsLmpzCmluZGV4IGEyN2ZlOWYuLjg0YTEzNjEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKQEAgLTEwNCw2 ICsxMDQsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbCA9IGZ1bmN0aW9uKCkKICAgICB0 aGlzLl9jcmVhdGVGaWxlU2VsZWN0b3IoKTsKICAgICB0aGlzLl9tb2RlbCA9IG5ldyBXZWJJbnNw ZWN0b3IuVGltZWxpbmVNb2RlbCh0aGlzKTsKIAorICAgIHRoaXMuX3JlZ2lzdGVyU2hvcnRjdXRz KCk7CiAgICAgV2ViSW5zcGVjdG9yLnRpbWVsaW5lTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdl Ykluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIuRXZlbnRUeXBlcy5UaW1lbGluZUV2ZW50UmVjb3Jk ZWQsIHRoaXMuX29uVGltZWxpbmVFdmVudFJlY29yZGVkLCB0aGlzKTsKIH0KIApAQCAtMjIxLDYg KzIyMiwyNiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAg ICAgIHRoaXMucmVjb3Jkc0NvdW50ZXIuY2xhc3NOYW1lID0gInRpbWVsaW5lLXJlY29yZHMtY291 bnRlciI7CiAgICAgfSwKIAorICAgIF9yZWdpc3RlclNob3J0Y3V0czogZnVuY3Rpb24oKQorICAg IHsKKyAgICAgICAgdmFyIHNob3J0Y3V0ID0gV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQ7 CisgICAgICAgIHZhciBtb2RpZmllcnMgPSBzaG9ydGN1dC5Nb2RpZmllcnM7CisgICAgICAgIHZh ciBzZWN0aW9uID0gV2ViSW5zcGVjdG9yLnNob3J0Y3V0c1NjcmVlbi5zZWN0aW9uKFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiVGltZWxpbmUgUGFuZWwiKSk7CisKKyAgICAgICAgdGhpcy5fc2hvcnRj dXRzW3Nob3J0Y3V0Lm1ha2VLZXkoImUiLCBtb2RpZmllcnMuQ3RybE9yTWV0YSldID0gdGhpcy5f dG9nZ2xlVGltZWxpbmVCdXR0b25DbGlja2VkLmJpbmQodGhpcyk7CisgICAgICAgIHNlY3Rpb24u YWRkS2V5KHNob3J0Y3V0LnNob3J0Y3V0VG9TdHJpbmcoImUiLCBtb2RpZmllcnMuQ3RybE9yTWV0 YSksIFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3RhcnQvc3RvcCByZWNvcmRpbmciKSk7CisKKyAg ICAgICAgdmFyIHNob3J0UmVjb3JkVGhyZXNob2xkVGl0bGUgPSBOdW1iZXIuc2Vjb25kc1RvU3Ry aW5nKFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnNob3J0UmVjb3JkVGhyZXNob2xkKTsKKyAg ICAgICAgdGhpcy5fc2hvcnRjdXRzW3Nob3J0Y3V0Lm1ha2VLZXkoImgiLCBtb2RpZmllcnMuQ3Ry bE9yTWV0YSldID0gdGhpcy5fdG9nZ2xlRmlsdGVyQnV0dG9uQ2xpY2tlZC5iaW5kKHRoaXMpOwor ICAgICAgICBzZWN0aW9uLmFkZEtleShzaG9ydGN1dC5zaG9ydGN1dFRvU3RyaW5nKCJoIiwgbW9k aWZpZXJzLkN0cmxPck1ldGEpLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkhpZGUvc2hvdyB0aGUg cmVjb3JkcyB0aGF0IGFyZSBzaG9ydGVyIHRoYW4gJXMiLCBzaG9ydFJlY29yZFRocmVzaG9sZFRp dGxlKSk7CisKKyAgICAgICAgdGhpcy5fc2hvcnRjdXRzW3Nob3J0Y3V0Lm1ha2VLZXkoInMiLCBt b2RpZmllcnMuQ3RybE9yTWV0YSldID0gdGhpcy5fc2F2ZVRvRmlsZS5iaW5kKHRoaXMpOworICAg ICAgICBzZWN0aW9uLmFkZEtleShzaG9ydGN1dC5zaG9ydGN1dFRvU3RyaW5nKCJzIiwgbW9kaWZp ZXJzLkN0cmxPck1ldGEpLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNhdmUgVGltZWxpbmUgZGF0 YVx1MjAyNiIpKTsKKworICAgICAgICB0aGlzLl9zaG9ydGN1dHNbc2hvcnRjdXQubWFrZUtleSgi byIsIG1vZGlmaWVycy5DdHJsT3JNZXRhKV0gPSB0aGlzLl9maWxlU2VsZWN0b3JFbGVtZW50LmNs aWNrLmJpbmQodGhpcy5fZmlsZVNlbGVjdG9yRWxlbWVudCk7CisgICAgICAgIHNlY3Rpb24uYWRk S2V5KHNob3J0Y3V0LnNob3J0Y3V0VG9TdHJpbmcoIm8iLCBtb2RpZmllcnMuQ3RybE9yTWV0YSks IFdlYkluc3BlY3Rvci5VSVN0cmluZygiTG9hZCBUaW1lbGluZSBkYXRhXHUyMDI2IikpOworICAg IH0sCisKICAgICBfY3JlYXRlRmlsZVNlbGVjdG9yOiBmdW5jdGlvbigpCiAgICAgewogICAgICAg ICBpZiAodGhpcy5fZmlsZVNlbGVjdG9yRWxlbWVudCkKQEAgLTIyOSw3ICsyNTAsNyBAQCBXZWJJ bnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBmaWxlU2Vs ZWN0b3JFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaW5wdXQiKTsKICAgICAgICAg ZmlsZVNlbGVjdG9yRWxlbWVudC50eXBlID0gImZpbGUiOwogICAgICAgICBmaWxlU2VsZWN0b3JF bGVtZW50LnN0eWxlLm9wYWNpdHkgPSAwOwotICAgICAgICBmaWxlU2VsZWN0b3JFbGVtZW50Lm9u Y2hhbmdlID0gdGhpcy5faW1wb3J0RnJvbUZpbGUuYmluZCh0aGlzKTsKKyAgICAgICAgZmlsZVNl bGVjdG9yRWxlbWVudC5vbmNoYW5nZSA9IHRoaXMuX2xvYWRGcm9tRmlsZS5iaW5kKHRoaXMpOwog ICAgICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQoZmlsZVNlbGVjdG9yRWxlbWVudCk7CiAg ICAgICAgIHRoaXMuX2ZpbGVTZWxlY3RvckVsZW1lbnQgPSBmaWxlU2VsZWN0b3JFbGVtZW50Owog ICAgIH0sCkBAIC0yMzcsMjQgKzI1OCwyNCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5w cm90b3R5cGUgPSB7CiAgICAgX2NvbnRleHRNZW51OiBmdW5jdGlvbihldmVudCkKICAgICB7CiAg ICAgICAgIHZhciBjb250ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUoKTsK LSAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIiZF eHBvcnQgVGltZWxpbmUgZGF0YVx1MjAyNiIpLCB0aGlzLl9leHBvcnRUb0ZpbGUuYmluZCh0aGlz KSk7Ci0gICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCImSW1wb3J0IFRpbWVsaW5lIGRhdGFcdTIwMjYiKSwgdGhpcy5fZmlsZVNlbGVjdG9yRWxlbWVu dC5jbGljay5iaW5kKHRoaXMuX2ZpbGVTZWxlY3RvckVsZW1lbnQpKTsKKyAgICAgICAgY29udGV4 dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIiZTYXZlIFRpbWVsaW5lIGRh dGFcdTIwMjYiKSwgdGhpcy5fc2F2ZVRvRmlsZS5iaW5kKHRoaXMpKTsKKyAgICAgICAgY29udGV4 dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkwmb2FkIFRpbWVsaW5lIGRh dGFcdTIwMjYiKSwgdGhpcy5fZmlsZVNlbGVjdG9yRWxlbWVudC5jbGljay5iaW5kKHRoaXMuX2Zp bGVTZWxlY3RvckVsZW1lbnQpKTsKICAgICAgICAgY29udGV4dE1lbnUuc2hvdyhldmVudCk7CiAg ICAgfSwKIAotICAgIF9leHBvcnRUb0ZpbGU6IGZ1bmN0aW9uKCkKKyAgICBfc2F2ZVRvRmlsZTog ZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgdGhpcy5fbW9kZWwuX2V4cG9ydFRvRmlsZSgpOwor ICAgICAgICB0aGlzLl9tb2RlbC5fc2F2ZVRvRmlsZSgpOwogICAgIH0sCiAKLSAgICBfaW1wb3J0 RnJvbUZpbGU6IGZ1bmN0aW9uKCkKKyAgICBfbG9hZEZyb21GaWxlOiBmdW5jdGlvbigpCiAgICAg ewogICAgICAgICBpZiAodGhpcy50b2dnbGVUaW1lbGluZUJ1dHRvbi50b2dnbGVkKQogICAgICAg ICAgICAgV2ViSW5zcGVjdG9yLnRpbWVsaW5lTWFuYWdlci5zdG9wKCk7CiAKICAgICAgICAgdGhp cy5fY2xlYXJQYW5lbCgpOwogCi0gICAgICAgIHRoaXMuX21vZGVsLl9pbXBvcnRGcm9tRmlsZSh0 aGlzLl9maWxlU2VsZWN0b3JFbGVtZW50LmZpbGVzWzBdKTsKKyAgICAgICAgdGhpcy5fbW9kZWwu X2xvYWRGcm9tRmlsZSh0aGlzLl9maWxlU2VsZWN0b3JFbGVtZW50LmZpbGVzWzBdKTsKICAgICAg ICAgdGhpcy5fY3JlYXRlRmlsZVNlbGVjdG9yKCk7CiAgICAgfSwKIApAQCAtMzA0LDExICszMjUs MTMgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICBy ZXR1cm4gZXZlbnREaXZpZGVyUGFkZGluZzsKICAgICB9LAogCi0gICAgX3RpbWVsaW5lc092ZXJ2 aWV3SXRlbVNlbGVjdGVkOiBmdW5jdGlvbihldmVudCkgeworICAgIF90aW1lbGluZXNPdmVydmll d0l0ZW1TZWxlY3RlZDogZnVuY3Rpb24oZXZlbnQpCisgICAgewogICAgICAgICB0aGlzLl9vdmVy dmlld1BhbmUuc2hvd1RpbWVsaW5lcygpOwogICAgIH0sCiAKLSAgICBfbWVtb3J5T3ZlcnZpZXdJ dGVtU2VsZWN0ZWQ6IGZ1bmN0aW9uKGV2ZW50KSB7CisgICAgX21lbW9yeU92ZXJ2aWV3SXRlbVNl bGVjdGVkOiBmdW5jdGlvbihldmVudCkKKyAgICB7CiAgICAgICAgIHRoaXMuX292ZXJ2aWV3UGFu ZS5zaG93TWVtb3J5R3JhcGgodGhpcy5fcm9vdFJlY29yZC5jaGlsZHJlbik7CiAgICAgfSwKIApA QCAtMTIyOCwzNyArMTI1MSwzNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVNb2RlbC5wcm90b3R5 cGUgPSB7CiAgICAgICAgIHRoaXMuX3JlY29yZHMucHVzaChyZWNvcmQpOwogICAgIH0sCiAKLSAg ICBfaW1wb3J0TmV4dENodW5rOiBmdW5jdGlvbihkYXRhLCBpbmRleCkKKyAgICBfbG9hZE5leHRD aHVuazogZnVuY3Rpb24oZGF0YSwgaW5kZXgpCiAgICAgewogICAgICAgICBmb3IgKHZhciBpID0g MDsgaSA8IDIwICYmIGluZGV4IDwgZGF0YS5sZW5ndGg7ICsraSwgKytpbmRleCkKICAgICAgICAg ICAgIHRoaXMuX3BhbmVsLl9hZGRSZWNvcmRUb1RpbWVsaW5lKGRhdGFbaW5kZXhdKTsKIAogICAg ICAgICBpZiAoaW5kZXggIT09IGRhdGEubGVuZ3RoKQotICAgICAgICAgICAgc2V0VGltZW91dCh0 aGlzLl9pbXBvcnROZXh0Q2h1bmsuYmluZCh0aGlzLCBkYXRhLCBpbmRleCksIDApOworICAgICAg ICAgICAgc2V0VGltZW91dCh0aGlzLl9sb2FkTmV4dENodW5rLmJpbmQodGhpcywgZGF0YSwgaW5k ZXgpLCAwKTsKICAgICB9LAogCi0gICAgX2ltcG9ydEZyb21GaWxlOiBmdW5jdGlvbihmaWxlKQor ICAgIF9sb2FkRnJvbUZpbGU6IGZ1bmN0aW9uKGZpbGUpCiAgICAgewogICAgICAgICBmdW5jdGlv biBvbkxvYWQoZSkKICAgICAgICAgewogICAgICAgICAgICAgdmFyIGRhdGEgPSBKU09OLnBhcnNl KGUudGFyZ2V0LnJlc3VsdCk7CiAgICAgICAgICAgICB2YXIgdmVyc2lvbiA9IGRhdGFbMF07Ci0g ICAgICAgICAgICB0aGlzLl9pbXBvcnROZXh0Q2h1bmsoZGF0YSwgMSk7CisgICAgICAgICAgICB0 aGlzLl9sb2FkTmV4dENodW5rKGRhdGEsIDEpOwogICAgICAgICB9CiAKICAgICAgICAgZnVuY3Rp b24gb25FcnJvcihlKQogICAgICAgICB7CiAgICAgICAgICAgICBzd2l0Y2goZS50YXJnZXQuZXJy b3IuY29kZSkgewogICAgICAgICAgICAgY2FzZSBlLnRhcmdldC5lcnJvci5OT1RfRk9VTkRfRVJS OgotICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5sb2coV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCdUaW1lbGluZS5pbXBvcnRGcm9tRmlsZTogRmlsZSAiJXMiIG5vdCBmb3VuZC4nLCBmaWxlLm5h bWUpKTsKKyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IubG9nKFdlYkluc3BlY3Rvci5VSVN0 cmluZygnVGltZWxpbmUubG9hZEZyb21GaWxlOiBGaWxlICIlcyIgbm90IGZvdW5kLicsIGZpbGUu bmFtZSkpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICBjYXNlIGUudGFyZ2V0LmVy cm9yLk5PVF9SRUFEQUJMRV9FUlI6Ci0gICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmxvZyhX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoJ1RpbWVsaW5lLmltcG9ydEZyb21GaWxlOiBGaWxlICIlcyIg aXMgbm90IHJlYWRhYmxlJywgZmlsZS5uYW1lKSk7CisgICAgICAgICAgICAgICAgV2ViSW5zcGVj dG9yLmxvZyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoJ1RpbWVsaW5lLmxvYWRGcm9tRmlsZTogRmls ZSAiJXMiIGlzIG5vdCByZWFkYWJsZScsIGZpbGUubmFtZSkpOwogICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgICAgICBjYXNlIGUudGFyZ2V0LmVycm9yLkFCT1JUX0VSUjoKICAgICAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICAgICAgV2ViSW5z cGVjdG9yLmxvZyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoJ1RpbWVsaW5lLmltcG9ydEZyb21GaWxl OiBBbiBlcnJvciBvY2N1cnJlZCB3aGlsZSByZWFkaW5nIHRoZSBmaWxlICIlcyInLCBmaWxlLm5h bWUpKTsKKyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IubG9nKFdlYkluc3BlY3Rvci5VSVN0 cmluZygnVGltZWxpbmUubG9hZEZyb21GaWxlOiBBbiBlcnJvciBvY2N1cnJlZCB3aGlsZSByZWFk aW5nIHRoZSBmaWxlICIlcyInLCBmaWxlLm5hbWUpKTsKICAgICAgICAgICAgIH0KICAgICAgICAg fQogCkBAIC0xMjY4LDEyICsxMjkxLDE1IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU1vZGVsLnBy b3RvdHlwZSA9IHsKICAgICAgICAgcmVhZGVyLnJlYWRBc1RleHQoZmlsZSk7CiAgICAgfSwKIAot ICAgIF9leHBvcnRUb0ZpbGU6IGZ1bmN0aW9uKCkKKyAgICBfc2F2ZVRvRmlsZTogZnVuY3Rpb24o KQogICAgIHsKICAgICAgICAgdmFyIHJlY29yZHMgPSBbJ1snICsgSlNPTi5zdHJpbmdpZnkod2lu ZG93Lm5hdmlnYXRvci5hcHBWZXJzaW9uKV07CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwg dGhpcy5fcmVjb3Jkcy5sZW5ndGggLSAxOyArK2kpCiAgICAgICAgICAgICByZWNvcmRzLnB1c2go SlNPTi5zdHJpbmdpZnkodGhpcy5fcmVjb3Jkc1tpXSkpOwotICAgICAgICByZWNvcmRzLnB1c2go SlNPTi5zdHJpbmdpZnkodGhpcy5fcmVjb3Jkc1t0aGlzLl9yZWNvcmRzLmxlbmd0aCAtIDFdKSAr ICJdIik7CisgICAgICAgIGlmICh0aGlzLl9yZWNvcmRzLmxlbmd0aCkKKyAgICAgICAgICAgIHJl Y29yZHMucHVzaChKU09OLnN0cmluZ2lmeSh0aGlzLl9yZWNvcmRzW3RoaXMuX3JlY29yZHMubGVu Z3RoIC0gMV0pICsgIl0iKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgcmVjb3Jkc1swXSA9 IHJlY29yZHNbMF0gKyAiXSI7CiAKICAgICAgICAgdmFyIG5vdz0gbmV3IERhdGUoKTsKICAgICAg ICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0LnNhdmVBcygiVGltZWxpbmVSYXdEYXRhLSIgKyBub3cu dG9SRkMzMzM5KCkgKyAiLmpzb24iLCByZWNvcmRzLmpvaW4oIixcbiIpKTsK 101468 2011-07-20 07:34:16 -0700 2011-07-20 08:08:19 -0700 [patch] second version patch text/plain 12035 loislo ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA4NzYwNTQwLi44OWE2OTZkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDct MjAgIElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IGFkZCBrZXlib2FyZCBzaG9ydGN1dHMgdG8gbG9hZC9zYXZlIG9wZXJhdGlv bnMgaW4gVGltZWxpbmUgcGFuZWwuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD02NDg2NAorCisgICAgICAgIEV4cG9ydC9pbXBvcnQgd2VyZSByZW5hbWVk IHRvIHNhdmUvbG9hZC4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIGluc3BlY3Rvci90aW1lbGluZS90aW1lbGluZS1sb2FkLmh0bWw6CisKIDIwMTEt MDctMjAgIEJvcmlzIFNtdXMgIDxzbXVzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5z cGVjdG9yOiBhdWRpdCBleHRlbnNpb25zIG5lZWQgYSB3YXkgdG8gbGluayBkaXJlY3RseSB0byBy ZXNvdXJjZXMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci90aW1lbGluZS90aW1l bGluZS1sb2FkLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGltZWxpbmUvdGltZWxpbmUt bG9hZC5odG1sCmluZGV4IDU3NzU1MTIuLjZkZDA0ZWIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L2luc3BlY3Rvci90aW1lbGluZS90aW1lbGluZS1sb2FkLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5lLWxvYWQuaHRtbApAQCAtNyw3ICs3LDcgQEAKIGZ1 bmN0aW9uIHRlc3QoKQogewogICAgIFdlYkluc3BlY3Rvci5zaG93UGFuZWwoInRpbWVsaW5lIik7 Ci0gICAgSW5zcGVjdG9yVGVzdC5hZGRTbmlmZmVyKFdlYkluc3BlY3Rvci5UaW1lbGluZU1vZGVs LnByb3RvdHlwZSwgIl9pbXBvcnROZXh0Q2h1bmsiLCBpbXBvcnROZXh0Q2h1bmspOworICAgIElu c3BlY3RvclRlc3QuYWRkU25pZmZlcihXZWJJbnNwZWN0b3IuVGltZWxpbmVNb2RlbC5wcm90b3R5 cGUsICJfbG9hZE5leHRDaHVuayIsIGxvYWROZXh0Q2h1bmspOwogICAgIEluc3BlY3RvckZyb250 ZW5kSG9zdC5zYXZlQXMgPSBzYXZlQXM7CiAgICAgdmFyIGRhdGEgPSBbCiAgICAgICAgIHsic3Rh cnRUaW1lIjoxMzEwNzQ5ODU0MzE2Ljg0MDgsImRhdGEiOnsiaWRlbnRpZmllciI6NDMsInVybCI6 Imh0dHA6Ly93d3cud2Via2l0Lm9yZy8iLCJyZXF1ZXN0TWV0aG9kIjoiR0VUIn0sInR5cGUiOiJS ZXNvdXJjZVNlbmRSZXF1ZXN0IiwidXNlZEhlYXBTaXplIjoxODE5OTM2LCJ0b3RhbEhlYXBTaXpl Ijo3NjI5MTIwfSwKQEAgLTIwLDExICsyMCwxMSBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAg eyJzdGFydFRpbWUiOjEzMTA3NDk4NTUxMzcuOTg5LCJkYXRhIjp7ImlkZW50aWZpZXIiOjQ5LCJ1 cmwiOiJodHRwOi8vd3d3LndlYmtpdC5vcmcvY3NzL3B1cnBsZS5jc3MiLCJyZXF1ZXN0TWV0aG9k IjoiR0VUIn0sInR5cGUiOiJSZXNvdXJjZVNlbmRSZXF1ZXN0IiwidXNlZEhlYXBTaXplIjoyMzY3 MTkyLCJ0b3RhbEhlYXBTaXplIjo3NjI5MTIwfSwKICAgICAgICAgeyJzdGFydFRpbWUiOjEzMTA3 NDk4NTUxMzguMzA4LCJkYXRhIjp7ImlkZW50aWZpZXIiOjUwLCJ1cmwiOiJodHRwOi8vd3d3Lndl YmtpdC5vcmcvY3NzL2dyYXkuY3NzIiwicmVxdWVzdE1ldGhvZCI6IkdFVCJ9LCJ0eXBlIjoiUmVz b3VyY2VTZW5kUmVxdWVzdCIsInVzZWRIZWFwU2l6ZSI6MjM2NzE5MiwidG90YWxIZWFwU2l6ZSI6 NzYyOTEyMH1dOwogCi0gICAgV2ViSW5zcGVjdG9yLnBhbmVscy50aW1lbGluZS5fbW9kZWwuX2lt cG9ydE5leHRDaHVuayhkYXRhLCAwKTsKKyAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnRpbWVsaW5l Ll9tb2RlbC5fbG9hZE5leHRDaHVuayhkYXRhLCAwKTsKIAotICAgIGZ1bmN0aW9uIGltcG9ydE5l eHRDaHVuaygpCisgICAgZnVuY3Rpb24gbG9hZE5leHRDaHVuaygpCiAgICAgewotICAgICAgICBX ZWJJbnNwZWN0b3IucGFuZWxzLnRpbWVsaW5lLl9tb2RlbC5fZXhwb3J0VG9GaWxlKCk7CisgICAg ICAgIFdlYkluc3BlY3Rvci5wYW5lbHMudGltZWxpbmUuX21vZGVsLl9zYXZlVG9GaWxlKCk7CiAg ICAgfQogCiAgICAgZnVuY3Rpb24gc2F2ZUFzKG5hbWUsIHNhdmVEYXRhKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4 IDJjNzgyN2EuLmNkOTIwNTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxMS0wNy0y MCAgSWx5YSBUaWtob25vdnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2Vi IEluc3BlY3RvcjogYWRkIGtleWJvYXJkIHNob3J0Y3V0cyB0byBsb2FkL3NhdmUgb3BlcmF0aW9u cyBpbiBUaW1lbGluZSBwYW5lbC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTY0ODY0CisKKyAgICAgICAgRXhwb3J0L2ltcG9ydCB3ZXJlIHJlbmFtZWQg dG8gc2F2ZS9sb2FkLgorICAgICAgICBDdHJsfE1ldGEtUy9DdHJsfE1ldGEtTyBzaG9ydGN1dHMg d2VyZSBhZGRlZCBmb3IgU2F2ZSBhbmQgTG9hZCBvcGVyYXRpb25zLgorICAgICAgICBDdHJsfE1l dGEtRSBzaG9ydGN1dCB0b2dnbGVzIFJlY29yZCBidXR0b247CisgICAgICAgIEN0cmx8TWV0YS1T aGlmdC1GIHNob3J0Y3V0IHRvZ2dsZXMgc2hvcnQgcmVjb3JkcyBmaWx0ZXIgYnV0dG9uOworICAg ICAgICBBbGwgdGhlIHNob3J0Y3V0cyB3ZXJlIGFkZGVkIHRvIHRoZSBzaG9ydGN1dHMgaGVscCBz Y3JlZW4uCisgICAgICAgIFRoZXJlIHdhcyBhIHByb2JsZW0gd2l0aCBzYXZpbmcgZW1wdHkgZGF0 YS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEVu Z2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL1RpbWVsaW5lUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQ YW5lbC5wcm90b3R5cGUuX3JlZ2lzdGVyU2hvcnRjdXRzKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS5fY3JlYXRlRmlsZVNlbGVjdG9yKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS5fY29udGV4dE1lbnUpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlLl9zYXZlVG9GaWxlKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS5fbG9hZEZyb21G aWxlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU1vZGVsLnByb3RvdHlwZS5fbG9h ZE5leHRDaHVuayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVNb2RlbC5wcm90b3R5 cGUuX2xvYWRGcm9tRmlsZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVNb2RlbC5w cm90b3R5cGUuX2xvYWRGcm9tRmlsZS5vbkVycm9yKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5U aW1lbGluZU1vZGVsLnByb3RvdHlwZS5fc2F2ZVRvRmlsZSk6CisKIDIwMTEtMDctMjAgIFl1cnkg U2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3Rv cjogZG9uJ3Qgc2VuZCBDb25zb2xlLmVuYWJsZSBtZXNzYWdlcyBpbiBjYXNlIG9mIHdvcmtlcnMK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5n cy5qcyBiL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwpp bmRleCA3OWQ4ZTZmYzlkYTU5Mjg0YzNlYjkyODg0YmIzM2YwZWRiYWRmZDAwLi5hNDRmY2IyYzJj YTE0NWIxNDI1YTM4MGVjYzQ1MWUyYTEwMGYxYmEwIDEwMDY0NApHSVQgYmluYXJ5IHBhdGNoCmRl bHRhIDI3MQp6Y21kbjxnISRZSDxfKSpzYXs0ZitHMn1CT0dOZXBDXkc7aGhtTys4UjdLb0o/a2l+ O0opZmo/LVlSVlc9KE5yT2UKejJUJCUhO0ZeNT9veU8jYTJfaXJgVkRldVIydyV8QCM3fDwrZiFi dkF6N0Bfc15Mezs/LVNiZyp2aWU3YiR6UFdWCnpPPHVkNGdIdytJclVOMXFnYF9lYmlTMGJ1YmN4 bnY+eTxwaFgkK1lfSnRZak8zYElhK3F5ZzxLbncmNSNkfilZbwpNSnspcXMlKz9IQzBGdTYxPmlf QCUKCmRlbHRhIDIyMQp6Y21YXjJmX2N2cTxfKSpzQH5TYS1HVVBIOEZ5dTI3Rl9jV01kdVBzIyVH YUxrYCVhNzdtN3hNZjRKc2RgTXF+Mi0Kel5Can09bXZpdnlGPVFme19+MykoPGxZWkgrXkF5Zihm RmQxYDlEaWNLSyMpSnRHTXh9Q0BrVzdsZHBmMCE2SSU1CkUwQWtFZ2AyWVhfCgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzCmluZGV4 IGEyN2ZlOWYuLjNiYjU5MmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvVGltZWxpbmVQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJp Z2h0IChDKSAyMDA5IEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmln aHQgKEMpIDIwMTEgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRp c3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdp dGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBm b2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKQEAgLTEwNCw2ICsxMDQsNyBAQCBXZWJJbnNwZWN0b3Iu VGltZWxpbmVQYW5lbCA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLl9jcmVhdGVGaWxlU2VsZWN0b3Io KTsKICAgICB0aGlzLl9tb2RlbCA9IG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmVNb2RlbCh0aGlz KTsKIAorICAgIHRoaXMuX3JlZ2lzdGVyU2hvcnRjdXRzKCk7CiAgICAgV2ViSW5zcGVjdG9yLnRp bWVsaW5lTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFn ZXIuRXZlbnRUeXBlcy5UaW1lbGluZUV2ZW50UmVjb3JkZWQsIHRoaXMuX29uVGltZWxpbmVFdmVu dFJlY29yZGVkLCB0aGlzKTsKIH0KIApAQCAtMjIxLDYgKzIyMiwyNiBAQCBXZWJJbnNwZWN0b3Iu VGltZWxpbmVQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMucmVjb3Jkc0NvdW50ZXIu Y2xhc3NOYW1lID0gInRpbWVsaW5lLXJlY29yZHMtY291bnRlciI7CiAgICAgfSwKIAorICAgIF9y ZWdpc3RlclNob3J0Y3V0czogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdmFyIHNob3J0Y3V0 ID0gV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQ7CisgICAgICAgIHZhciBtb2RpZmllcnMg PSBzaG9ydGN1dC5Nb2RpZmllcnM7CisgICAgICAgIHZhciBzZWN0aW9uID0gV2ViSW5zcGVjdG9y LnNob3J0Y3V0c1NjcmVlbi5zZWN0aW9uKFdlYkluc3BlY3Rvci5VSVN0cmluZygiVGltZWxpbmUg UGFuZWwiKSk7CisKKyAgICAgICAgdGhpcy5fc2hvcnRjdXRzW3Nob3J0Y3V0Lm1ha2VLZXkoImUi LCBtb2RpZmllcnMuQ3RybE9yTWV0YSldID0gdGhpcy5fdG9nZ2xlVGltZWxpbmVCdXR0b25DbGlj a2VkLmJpbmQodGhpcyk7CisgICAgICAgIHNlY3Rpb24uYWRkS2V5KHNob3J0Y3V0LnNob3J0Y3V0 VG9TdHJpbmcoImUiLCBtb2RpZmllcnMuQ3RybE9yTWV0YSksIFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiU3RhcnQvc3RvcCByZWNvcmRpbmciKSk7CisKKyAgICAgICAgdmFyIHNob3J0UmVjb3JkVGhy ZXNob2xkVGl0bGUgPSBOdW1iZXIuc2Vjb25kc1RvU3RyaW5nKFdlYkluc3BlY3Rvci5UaW1lbGlu ZVBhbmVsLnNob3J0UmVjb3JkVGhyZXNob2xkKTsKKyAgICAgICAgdGhpcy5fc2hvcnRjdXRzW3No b3J0Y3V0Lm1ha2VLZXkoImYiLCBtb2RpZmllcnMuU2hpZnQgfCBtb2RpZmllcnMuQ3RybE9yTWV0 YSldID0gdGhpcy5fdG9nZ2xlRmlsdGVyQnV0dG9uQ2xpY2tlZC5iaW5kKHRoaXMpOworICAgICAg ICBzZWN0aW9uLmFkZEtleShzaG9ydGN1dC5zaG9ydGN1dFRvU3RyaW5nKCJmIiwgbW9kaWZpZXJz LlNoaWZ0IHwgbW9kaWZpZXJzLkN0cmxPck1ldGEpLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRv Z2dsZSBmaWx0ZXIgZm9yIHRoZSByZWNvcmRzIHRoYXQgYXJlIHNob3J0ZXIgdGhhbiAlcyIsIHNo b3J0UmVjb3JkVGhyZXNob2xkVGl0bGUpKTsKKworICAgICAgICB0aGlzLl9zaG9ydGN1dHNbc2hv cnRjdXQubWFrZUtleSgicyIsIG1vZGlmaWVycy5DdHJsT3JNZXRhKV0gPSB0aGlzLl9zYXZlVG9G aWxlLmJpbmQodGhpcyk7CisgICAgICAgIHNlY3Rpb24uYWRkS2V5KHNob3J0Y3V0LnNob3J0Y3V0 VG9TdHJpbmcoInMiLCBtb2RpZmllcnMuQ3RybE9yTWV0YSksIFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiU2F2ZSBUaW1lbGluZSBkYXRhXHUyMDI2IikpOworCisgICAgICAgIHRoaXMuX3Nob3J0Y3V0 c1tzaG9ydGN1dC5tYWtlS2V5KCJvIiwgbW9kaWZpZXJzLkN0cmxPck1ldGEpXSA9IHRoaXMuX2Zp bGVTZWxlY3RvckVsZW1lbnQuY2xpY2suYmluZCh0aGlzLl9maWxlU2VsZWN0b3JFbGVtZW50KTsK KyAgICAgICAgc2VjdGlvbi5hZGRLZXkoc2hvcnRjdXQuc2hvcnRjdXRUb1N0cmluZygibyIsIG1v ZGlmaWVycy5DdHJsT3JNZXRhKSwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJMb2FkIFRpbWVsaW5l IGRhdGFcdTIwMjYiKSk7CisgICAgfSwKKwogICAgIF9jcmVhdGVGaWxlU2VsZWN0b3I6IGZ1bmN0 aW9uKCkKICAgICB7CiAgICAgICAgIGlmICh0aGlzLl9maWxlU2VsZWN0b3JFbGVtZW50KQpAQCAt MjI5LDcgKzI1MCw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZSA9IHsK ICAgICAgICAgdmFyIGZpbGVTZWxlY3RvckVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJpbnB1dCIpOwogICAgICAgICBmaWxlU2VsZWN0b3JFbGVtZW50LnR5cGUgPSAiZmlsZSI7CiAg ICAgICAgIGZpbGVTZWxlY3RvckVsZW1lbnQuc3R5bGUub3BhY2l0eSA9IDA7Ci0gICAgICAgIGZp bGVTZWxlY3RvckVsZW1lbnQub25jaGFuZ2UgPSB0aGlzLl9pbXBvcnRGcm9tRmlsZS5iaW5kKHRo aXMpOworICAgICAgICBmaWxlU2VsZWN0b3JFbGVtZW50Lm9uY2hhbmdlID0gdGhpcy5fbG9hZEZy b21GaWxlLmJpbmQodGhpcyk7CiAgICAgICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZChmaWxl U2VsZWN0b3JFbGVtZW50KTsKICAgICAgICAgdGhpcy5fZmlsZVNlbGVjdG9yRWxlbWVudCA9IGZp bGVTZWxlY3RvckVsZW1lbnQ7CiAgICAgfSwKQEAgLTIzNywyNCArMjU4LDI0IEBAIFdlYkluc3Bl Y3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZSA9IHsKICAgICBfY29udGV4dE1lbnU6IGZ1bmN0 aW9uKGV2ZW50KQogICAgIHsKICAgICAgICAgdmFyIGNvbnRleHRNZW51ID0gbmV3IFdlYkluc3Bl Y3Rvci5Db250ZXh0TWVudSgpOwotICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYklu c3BlY3Rvci5VSVN0cmluZygiJkV4cG9ydCBUaW1lbGluZSBkYXRhXHUyMDI2IiksIHRoaXMuX2V4 cG9ydFRvRmlsZS5iaW5kKHRoaXMpKTsKLSAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIiZJbXBvcnQgVGltZWxpbmUgZGF0YVx1MjAyNiIpLCB0aGlz Ll9maWxlU2VsZWN0b3JFbGVtZW50LmNsaWNrLmJpbmQodGhpcy5fZmlsZVNlbGVjdG9yRWxlbWVu dCkpOworICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiJlNhdmUgVGltZWxpbmUgZGF0YVx1MjAyNiIpLCB0aGlzLl9zYXZlVG9GaWxlLmJpbmQodGhp cykpOworICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiTCZvYWQgVGltZWxpbmUgZGF0YVx1MjAyNiIpLCB0aGlzLl9maWxlU2VsZWN0b3JFbGVtZW50 LmNsaWNrLmJpbmQodGhpcy5fZmlsZVNlbGVjdG9yRWxlbWVudCkpOwogICAgICAgICBjb250ZXh0 TWVudS5zaG93KGV2ZW50KTsKICAgICB9LAogCi0gICAgX2V4cG9ydFRvRmlsZTogZnVuY3Rpb24o KQorICAgIF9zYXZlVG9GaWxlOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICB0aGlzLl9tb2Rl bC5fZXhwb3J0VG9GaWxlKCk7CisgICAgICAgIHRoaXMuX21vZGVsLl9zYXZlVG9GaWxlKCk7CiAg ICAgfSwKIAotICAgIF9pbXBvcnRGcm9tRmlsZTogZnVuY3Rpb24oKQorICAgIF9sb2FkRnJvbUZp bGU6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIGlmICh0aGlzLnRvZ2dsZVRpbWVsaW5lQnV0 dG9uLnRvZ2dsZWQpCiAgICAgICAgICAgICBXZWJJbnNwZWN0b3IudGltZWxpbmVNYW5hZ2VyLnN0 b3AoKTsKIAogICAgICAgICB0aGlzLl9jbGVhclBhbmVsKCk7CiAKLSAgICAgICAgdGhpcy5fbW9k ZWwuX2ltcG9ydEZyb21GaWxlKHRoaXMuX2ZpbGVTZWxlY3RvckVsZW1lbnQuZmlsZXNbMF0pOwor ICAgICAgICB0aGlzLl9tb2RlbC5fbG9hZEZyb21GaWxlKHRoaXMuX2ZpbGVTZWxlY3RvckVsZW1l bnQuZmlsZXNbMF0pOwogICAgICAgICB0aGlzLl9jcmVhdGVGaWxlU2VsZWN0b3IoKTsKICAgICB9 LAogCkBAIC0zMDQsMTEgKzMyNSwxMyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiBldmVudERpdmlkZXJQYWRkaW5nOwogICAgIH0sCiAK LSAgICBfdGltZWxpbmVzT3ZlcnZpZXdJdGVtU2VsZWN0ZWQ6IGZ1bmN0aW9uKGV2ZW50KSB7Cisg ICAgX3RpbWVsaW5lc092ZXJ2aWV3SXRlbVNlbGVjdGVkOiBmdW5jdGlvbihldmVudCkKKyAgICB7 CiAgICAgICAgIHRoaXMuX292ZXJ2aWV3UGFuZS5zaG93VGltZWxpbmVzKCk7CiAgICAgfSwKIAot ICAgIF9tZW1vcnlPdmVydmlld0l0ZW1TZWxlY3RlZDogZnVuY3Rpb24oZXZlbnQpIHsKKyAgICBf bWVtb3J5T3ZlcnZpZXdJdGVtU2VsZWN0ZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKICAgICAg ICAgdGhpcy5fb3ZlcnZpZXdQYW5lLnNob3dNZW1vcnlHcmFwaCh0aGlzLl9yb290UmVjb3JkLmNo aWxkcmVuKTsKICAgICB9LAogCkBAIC0xMjI4LDM3ICsxMjUxLDM3IEBAIFdlYkluc3BlY3Rvci5U aW1lbGluZU1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fcmVjb3Jkcy5wdXNoKHJl Y29yZCk7CiAgICAgfSwKIAotICAgIF9pbXBvcnROZXh0Q2h1bms6IGZ1bmN0aW9uKGRhdGEsIGlu ZGV4KQorICAgIF9sb2FkTmV4dENodW5rOiBmdW5jdGlvbihkYXRhLCBpbmRleCkKICAgICB7CiAg ICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgMjAgJiYgaW5kZXggPCBkYXRhLmxlbmd0aDsgKytp LCArK2luZGV4KQogICAgICAgICAgICAgdGhpcy5fcGFuZWwuX2FkZFJlY29yZFRvVGltZWxpbmUo ZGF0YVtpbmRleF0pOwogCiAgICAgICAgIGlmIChpbmRleCAhPT0gZGF0YS5sZW5ndGgpCi0gICAg ICAgICAgICBzZXRUaW1lb3V0KHRoaXMuX2ltcG9ydE5leHRDaHVuay5iaW5kKHRoaXMsIGRhdGEs IGluZGV4KSwgMCk7CisgICAgICAgICAgICBzZXRUaW1lb3V0KHRoaXMuX2xvYWROZXh0Q2h1bmsu YmluZCh0aGlzLCBkYXRhLCBpbmRleCksIDApOwogICAgIH0sCiAKLSAgICBfaW1wb3J0RnJvbUZp bGU6IGZ1bmN0aW9uKGZpbGUpCisgICAgX2xvYWRGcm9tRmlsZTogZnVuY3Rpb24oZmlsZSkKICAg ICB7CiAgICAgICAgIGZ1bmN0aW9uIG9uTG9hZChlKQogICAgICAgICB7CiAgICAgICAgICAgICB2 YXIgZGF0YSA9IEpTT04ucGFyc2UoZS50YXJnZXQucmVzdWx0KTsKICAgICAgICAgICAgIHZhciB2 ZXJzaW9uID0gZGF0YVswXTsKLSAgICAgICAgICAgIHRoaXMuX2ltcG9ydE5leHRDaHVuayhkYXRh LCAxKTsKKyAgICAgICAgICAgIHRoaXMuX2xvYWROZXh0Q2h1bmsoZGF0YSwgMSk7CiAgICAgICAg IH0KIAogICAgICAgICBmdW5jdGlvbiBvbkVycm9yKGUpCiAgICAgICAgIHsKICAgICAgICAgICAg IHN3aXRjaChlLnRhcmdldC5lcnJvci5jb2RlKSB7CiAgICAgICAgICAgICBjYXNlIGUudGFyZ2V0 LmVycm9yLk5PVF9GT1VORF9FUlI6Ci0gICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmxvZyhX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoJ1RpbWVsaW5lLmltcG9ydEZyb21GaWxlOiBGaWxlICIlcyIg bm90IGZvdW5kLicsIGZpbGUubmFtZSkpOworICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5s b2coV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCdUaW1lbGluZS5sb2FkRnJvbUZpbGU6IEZpbGUgIiVz IiBub3QgZm91bmQuJywgZmlsZS5uYW1lKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAg ICAgIGNhc2UgZS50YXJnZXQuZXJyb3IuTk9UX1JFQURBQkxFX0VSUjoKLSAgICAgICAgICAgICAg ICBXZWJJbnNwZWN0b3IubG9nKFdlYkluc3BlY3Rvci5VSVN0cmluZygnVGltZWxpbmUuaW1wb3J0 RnJvbUZpbGU6IEZpbGUgIiVzIiBpcyBub3QgcmVhZGFibGUnLCBmaWxlLm5hbWUpKTsKKyAgICAg ICAgICAgICAgICBXZWJJbnNwZWN0b3IubG9nKFdlYkluc3BlY3Rvci5VSVN0cmluZygnVGltZWxp bmUubG9hZEZyb21GaWxlOiBGaWxlICIlcyIgaXMgbm90IHJlYWRhYmxlJywgZmlsZS5uYW1lKSk7 CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIGNhc2UgZS50YXJnZXQuZXJyb3IuQUJP UlRfRVJSOgogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgZGVmYXVsdDoKLSAg ICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IubG9nKFdlYkluc3BlY3Rvci5VSVN0cmluZygnVGlt ZWxpbmUuaW1wb3J0RnJvbUZpbGU6IEFuIGVycm9yIG9jY3VycmVkIHdoaWxlIHJlYWRpbmcgdGhl IGZpbGUgIiVzIicsIGZpbGUubmFtZSkpOworICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5s b2coV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCdUaW1lbGluZS5sb2FkRnJvbUZpbGU6IEFuIGVycm9y IG9jY3VycmVkIHdoaWxlIHJlYWRpbmcgdGhlIGZpbGUgIiVzIicsIGZpbGUubmFtZSkpOwogICAg ICAgICAgICAgfQogICAgICAgICB9CiAKQEAgLTEyNjgsMTIgKzEyOTEsMTUgQEAgV2ViSW5zcGVj dG9yLlRpbWVsaW5lTW9kZWwucHJvdG90eXBlID0gewogICAgICAgICByZWFkZXIucmVhZEFzVGV4 dChmaWxlKTsKICAgICB9LAogCi0gICAgX2V4cG9ydFRvRmlsZTogZnVuY3Rpb24oKQorICAgIF9z YXZlVG9GaWxlOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB2YXIgcmVjb3JkcyA9IFsnWycg KyBKU09OLnN0cmluZ2lmeSh3aW5kb3cubmF2aWdhdG9yLmFwcFZlcnNpb24pXTsKICAgICAgICAg Zm9yICh2YXIgaSA9IDA7IGkgPCB0aGlzLl9yZWNvcmRzLmxlbmd0aCAtIDE7ICsraSkKICAgICAg ICAgICAgIHJlY29yZHMucHVzaChKU09OLnN0cmluZ2lmeSh0aGlzLl9yZWNvcmRzW2ldKSk7Ci0g ICAgICAgIHJlY29yZHMucHVzaChKU09OLnN0cmluZ2lmeSh0aGlzLl9yZWNvcmRzW3RoaXMuX3Jl Y29yZHMubGVuZ3RoIC0gMV0pICsgIl0iKTsKKyAgICAgICAgaWYgKHRoaXMuX3JlY29yZHMubGVu Z3RoKQorICAgICAgICAgICAgcmVjb3Jkcy5wdXNoKEpTT04uc3RyaW5naWZ5KHRoaXMuX3JlY29y ZHNbdGhpcy5fcmVjb3Jkcy5sZW5ndGggLSAxXSkgKyAiXSIpOworICAgICAgICBlbHNlCisgICAg ICAgICAgICByZWNvcmRzWzBdID0gcmVjb3Jkc1swXSArICJdIjsKIAogICAgICAgICB2YXIgbm93 PSBuZXcgRGF0ZSgpOwogICAgICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3Quc2F2ZUFzKCJUaW1l bGluZVJhd0RhdGEtIiArIG5vdy50b1JGQzMzMzkoKSArICIuanNvbiIsIHJlY29yZHMuam9pbigi LFxuIikpOwo=