152996 2016-01-11 16:28:49 -0800 Web Inspector: Move helper methods for getting icons/text to TimelineTabContentView 2016-01-12 16:04:42 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 mattbaker mattbaker bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1154533 0 mattbaker 2016-01-11 16:28:49 -0800 * SUMMARY Move helper methods for getting icons/text to TimelineTabContentView. Static methods in TimelineSidebarPanel can simply be moved. Code for getting icons and titles for timeline records should be broken out of TimelineRecordTreeElement, and made into helper methods. Refactoring this will simplify removing the Timelines navigation sidebar in the near future. 1154539 1 268726 mattbaker 2016-01-11 16:37:27 -0800 Created attachment 268726 [Patch] Proposed Fix 1154775 2 268726 bburg 2016-01-12 11:03:54 -0800 Comment on attachment 268726 [Patch] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=268726&action=review r=me > Source/WebInspectorUI/UserInterface/Views/TimelineRecordTreeElement.js:35 > + if (includeDetailsInMainTitle && timelineRecord.type === WebInspector.TimelineRecord.Type.Script && timelineRecord.eventType === WebInspector.ScriptTimelineRecord.EventType.TimerInstalled) { This change isn't described in the changelog. It seems to be extracted from... > Source/WebInspectorUI/UserInterface/Views/TimelineRecordTreeElement.js:-100 > - let timeoutString = Number.secondsToString(timelineRecord.details.timeout / 1000); .. here 1154920 3 268816 mattbaker 2016-01-12 15:11:23 -0800 Created attachment 268816 [Patch] Proposed Fix 1154952 4 268816 commit-queue 2016-01-12 16:04:40 -0800 Comment on attachment 268816 [Patch] Proposed Fix Clearing flags on attachment: 268816 Committed r194932: <http://trac.webkit.org/changeset/194932> 1154953 5 commit-queue 2016-01-12 16:04:42 -0800 All reviewed patches have been landed. Closing bug. 268726 2016-01-11 16:37:27 -0800 2016-01-12 15:11:21 -0800 [Patch] Proposed Fix bug-152996-20160111163656.patch text/plain 20468 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0ODcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA1 NDU2NTRmM2EyODVhMGU2ODhlMTU5ZjQ2MTJmODM1YWQ5MjZiNjBiLi4xNzU0MTgwYjcxMTkxOTMz Mzg3NjIyOTA3NGZhNDljNzI1YjdlNzVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNiBAQAorMjAxNi0wMS0xMSAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTW92ZSBoZWxwZXIgbWV0aG9kcyBmb3IgZ2V0dGlu ZyBpY29ucy90ZXh0IHRvIFRpbWVsaW5lVGFiQ29udGVudFZpZXcKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1Mjk5NgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIHByZXBhcmF0aW9uIGZvciB0aGUgVGlt ZWxpbmVzIFVJIHJlZGVzaWduLCBoZWxwZXIgbWV0aG9kcyB3aGljaCBleGlzdGVkCisgICAgICAg IGluIHRoZSBzaWRlYmFyIHBhbmVsIGFuZCB0aW1lbGluZSB0cmVlIGVsZW1lbnRzIG5lZWQgdG8g YmUgcmVsb2NhdGVkLAorICAgICAgICBzaW5jZSB0aGUgc2lkZWJhciB3b24ndCBleGlzdCBpbiB0 aGUgbmV3IFVJLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29y ZFRyZWVFbGVtZW50LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkVHJl ZUVsZW1lbnQpOgorICAgICAgICBSZW1vdmVkIGljb24vdGl0bGUgY29kZSwgcmVwbGFjZWQgd2l0 aCBjYWxscyB0byBuZXcgaGVscGVyIG1ldGhvZHMuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5wcm90b3R5cGUuX2luc3RydW1lbnRB ZGRlZCk6CisgICAgICAgIFVwZGF0ZWQgY2FsbHMgdG8gaGVscGVyIG1ldGhvZHMuCisKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lU2lkZWJhclBhbmVsLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsLnByb3RvdHlwZS5faW5zdHJ1bWVu dEFkZGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbC5kaXNw bGF5TmFtZUZvclRpbWVsaW5lKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1l bGluZVNpZGViYXJQYW5lbC5pY29uQ2xhc3NOYW1lRm9yVGltZWxpbmUpOiBEZWxldGVkLgorICAg ICAgICBNb3ZlZCB0byBUaW1lbGluZVRhYkNvbnRlbnRWaWV3LgorCisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9UaW1lbGluZVRhYkNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlRpbWVsaW5lVGFiQ29udGVudFZpZXcuZGlzcGxheU5hbWVGb3JUaW1lbGluZSk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVUYWJDb250ZW50Vmlldy5pY29uQ2xhc3NOYW1l Rm9yVGltZWxpbmUpOgorICAgICAgICBSZWxvY2F0ZWQgZnJvbSBUaW1lbGluZVNpZGViYXJQYW5l bC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVRhYkNvbnRlbnRWaWV3Lmljb25DbGFz c05hbWVGb3JSZWNvcmQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lVGFiQ29udGVu dFZpZXcuZGlzcGxheU5hbWVGb3JSZWNvcmQpOgorICAgICAgICBOZXcgaGVscGVyIG1ldGhvZHMu IFByZXZpb3VzbHkgcGFydCBvZiBUaW1lbGluZVJlY29yZFRyZWVFbGVtZW50LgorCiAyMDE2LTAx LTExICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2Vi IEluc3BlY3RvcjogTWlncmF0ZSBQYWdlIFRpbWVsaW5lIHJlY29yZGluZyB0byBTY3JpcHRQcm9m aWxlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVGltZWxpbmVSZWNvcmRUcmVlRWxlbWVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkVHJlZUVsZW1lbnQuanMKaW5kZXggNjEx NWI3OWE2ODNlY2ZlOGU4N2FmNTlkYWJhNWYyNzI2NjM1ODU4NC4uMjQ0NzJmOTBlOWQ2YTRkOGM0 ZDM5ZjYyZWVkYmNmNTY0NTQzZDhhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRUcmVlRWxlbWVudC5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZFRy ZWVFbGVtZW50LmpzCkBAIC0zMSwxMCArMzEsMTggQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVj b3JkVHJlZUVsZW1lbnQgPSBjbGFzcyBUaW1lbGluZVJlY29yZFRyZWVFbGVtZW50IGV4dGVuZHMK IAogICAgICAgICBzb3VyY2VDb2RlTG9jYXRpb24gPSBzb3VyY2VDb2RlTG9jYXRpb24gfHwgdGlt ZWxpbmVSZWNvcmQuc291cmNlQ29kZUxvY2F0aW9uIHx8IG51bGw7CiAKLSAgICAgICAgdmFyIHRp dGxlID0gIiI7Ci0gICAgICAgIHZhciBzdWJ0aXRsZSA9IG51bGw7Ci0gICAgICAgIHZhciBhbHRl cm5hdGVTdWJ0aXRsZSA9IG51bGw7CisgICAgICAgIGxldCBhbHRlcm5hdGVTdWJ0aXRsZSA9IG51 bGw7CisgICAgICAgIGlmIChpbmNsdWRlRGV0YWlsc0luTWFpblRpdGxlICYmIHRpbWVsaW5lUmVj b3JkLnR5cGUgPT09IFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLlNjcmlwdCAmJiB0 aW1lbGluZVJlY29yZC5ldmVudFR5cGUgPT09IFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVJl Y29yZC5FdmVudFR5cGUuVGltZXJJbnN0YWxsZWQpIHsKKyAgICAgICAgICAgIGxldCB0aW1lb3V0 U3RyaW5nID0gTnVtYmVyLnNlY29uZHNUb1N0cmluZyh0aW1lbGluZVJlY29yZC5kZXRhaWxzLnRp bWVvdXQgLyAxMDAwKTsKKyAgICAgICAgICAgIGFsdGVybmF0ZVN1YnRpdGxlID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgic3BhbiIpOworICAgICAgICAgICAgYWx0ZXJuYXRlU3VidGl0bGUuY2xh c3NMaXN0LmFkZCgiYWx0ZXJuYXRlLXN1YnRpdGxlIik7CisgICAgICAgICAgICBpZiAodGltZWxp bmVSZWNvcmQuZGV0YWlscy5yZXBlYXRpbmcpCisgICAgICAgICAgICAgICAgYWx0ZXJuYXRlU3Vi dGl0bGUudGV4dENvbnRlbnQgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIiVzIGludGVydmFsIiku Zm9ybWF0KHRpbWVvdXRTdHJpbmcpOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAg IGFsdGVybmF0ZVN1YnRpdGxlLnRleHRDb250ZW50ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIl cyBkZWxheSIpLmZvcm1hdCh0aW1lb3V0U3RyaW5nKTsKKyAgICAgICAgfQogCisgICAgICAgIGxl dCBzdWJ0aXRsZSA9IG51bGw7CiAgICAgICAgIGlmIChzb3VyY2VDb2RlTG9jYXRpb24pIHsKICAg ICAgICAgICAgIHN1YnRpdGxlID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOwogCkBA IC00NCw5MyArNTIsOCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRUcmVlRWxlbWVudCA9 IGNsYXNzIFRpbWVsaW5lUmVjb3JkVHJlZUVsZW1lbnQgZXh0ZW5kcwogICAgICAgICAgICAgICAg IHNvdXJjZUNvZGVMb2NhdGlvbi5wb3B1bGF0ZUxpdmVEaXNwbGF5TG9jYXRpb25TdHJpbmcoc3Vi dGl0bGUsICJ0ZXh0Q29udGVudCIsIG51bGwsIFdlYkluc3BlY3Rvci5Tb3VyY2VDb2RlTG9jYXRp b24uTmFtZVN0eWxlLk5vbmUsIFdlYkluc3BlY3Rvci5VSVN0cmluZygibGluZSAiKSk7CiAgICAg ICAgIH0KIAotICAgICAgICB2YXIgaWNvblN0eWxlQ2xhc3MgPSBudWxsOwotCi0gICAgICAgIHN3 aXRjaCAodGltZWxpbmVSZWNvcmQudHlwZSkgewotICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5U aW1lbGluZVJlY29yZC5UeXBlLkxheW91dDoKLSAgICAgICAgICAgIHRpdGxlID0gV2ViSW5zcGVj dG9yLkxheW91dFRpbWVsaW5lUmVjb3JkLmRpc3BsYXlOYW1lRm9yRXZlbnRUeXBlKHRpbWVsaW5l UmVjb3JkLmV2ZW50VHlwZSk7Ci0KLSAgICAgICAgICAgIHN3aXRjaCAodGltZWxpbmVSZWNvcmQu ZXZlbnRUeXBlKSB7Ci0gICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGlu ZVJlY29yZC5FdmVudFR5cGUuSW52YWxpZGF0ZVN0eWxlczoKLSAgICAgICAgICAgIGNhc2UgV2Vi SW5zcGVjdG9yLkxheW91dFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5SZWNhbGN1bGF0ZVN0eWxl czoKLSAgICAgICAgICAgICAgICBpY29uU3R5bGVDbGFzcyA9IFdlYkluc3BlY3Rvci5UaW1lbGlu ZVJlY29yZFRyZWVFbGVtZW50LlN0eWxlUmVjb3JkSWNvblN0eWxlQ2xhc3M7Ci0gICAgICAgICAg ICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGlu ZVJlY29yZC5FdmVudFR5cGUuSW52YWxpZGF0ZUxheW91dDoKLSAgICAgICAgICAgIGNhc2UgV2Vi SW5zcGVjdG9yLkxheW91dFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5Gb3JjZWRMYXlvdXQ6Ci0g ICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGluZVJlY29yZC5FdmVudFR5 cGUuTGF5b3V0OgotICAgICAgICAgICAgICAgIGljb25TdHlsZUNsYXNzID0gV2ViSW5zcGVjdG9y LlRpbWVsaW5lUmVjb3JkVHJlZUVsZW1lbnQuTGF5b3V0UmVjb3JkSWNvblN0eWxlQ2xhc3M7Ci0g ICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5MYXlv dXRUaW1lbGluZVJlY29yZC5FdmVudFR5cGUuUGFpbnQ6Ci0gICAgICAgICAgICAgICAgaWNvblN0 eWxlQ2xhc3MgPSBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRUcmVlRWxlbWVudC5QYWludFJl Y29yZEljb25TdHlsZUNsYXNzOwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAg Y2FzZSBXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVSZWNvcmQuRXZlbnRUeXBlLkNvbXBvc2l0 ZToKLSAgICAgICAgICAgICAgICBpY29uU3R5bGVDbGFzcyA9IFdlYkluc3BlY3Rvci5UaW1lbGlu ZVJlY29yZFRyZWVFbGVtZW50LkNvbXBvc2l0ZVJlY29yZEljb25TdHlsZUNsYXNzOwotICAgICAg ICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAgICAgICBj b25zb2xlLmVycm9yKCJVbmtub3duIExheW91dFRpbWVsaW5lUmVjb3JkIGV2ZW50VHlwZTogIiAr IHRpbWVsaW5lUmVjb3JkLmV2ZW50VHlwZSwgdGltZWxpbmVSZWNvcmQpOwotICAgICAgICAgICAg fQotCi0gICAgICAgICAgICBicmVhazsKLQotICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1l bGluZVJlY29yZC5UeXBlLlNjcmlwdDoKLSAgICAgICAgICAgIHRpdGxlID0gV2ViSW5zcGVjdG9y LlNjcmlwdFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5kaXNwbGF5TmFtZSh0aW1lbGluZVJlY29y ZC5ldmVudFR5cGUsIHRpbWVsaW5lUmVjb3JkLmRldGFpbHMsIGluY2x1ZGVEZXRhaWxzSW5NYWlu VGl0bGUpOwotCi0gICAgICAgICAgICBzd2l0Y2ggKHRpbWVsaW5lUmVjb3JkLmV2ZW50VHlwZSkg ewotICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVSZWNvcmQuRXZl bnRUeXBlLkFQSVNjcmlwdEV2YWx1YXRlZDoKLSAgICAgICAgICAgICAgICBpY29uU3R5bGVDbGFz cyA9IFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZFRyZWVFbGVtZW50LkFQSVJlY29yZEljb25T dHlsZUNsYXNzOwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgY2FzZSBXZWJJ bnNwZWN0b3IuU2NyaXB0VGltZWxpbmVSZWNvcmQuRXZlbnRUeXBlLlNjcmlwdEV2YWx1YXRlZDoK LSAgICAgICAgICAgICAgICBpY29uU3R5bGVDbGFzcyA9IFdlYkluc3BlY3Rvci5UaW1lbGluZVJl Y29yZFRyZWVFbGVtZW50LkV2YWx1YXRlZFJlY29yZEljb25TdHlsZUNsYXNzOwotICAgICAgICAg ICAgICAgIGJyZWFrOwotICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxp bmVSZWNvcmQuRXZlbnRUeXBlLk1pY3JvdGFza0Rpc3BhdGNoZWQ6Ci0gICAgICAgICAgICBjYXNl IFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVJlY29yZC5FdmVudFR5cGUuRXZlbnREaXNwYXRj aGVkOgotICAgICAgICAgICAgICAgIGljb25TdHlsZUNsYXNzID0gV2ViSW5zcGVjdG9yLlRpbWVs aW5lUmVjb3JkVHJlZUVsZW1lbnQuRXZlbnRSZWNvcmRJY29uU3R5bGVDbGFzczsKLSAgICAgICAg ICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVs aW5lUmVjb3JkLkV2ZW50VHlwZS5Qcm9iZVNhbXBsZVJlY29yZGVkOgotICAgICAgICAgICAgICAg IGljb25TdHlsZUNsYXNzID0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkVHJlZUVsZW1lbnQu UHJvYmVSZWNvcmRJY29uU3R5bGVDbGFzczsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAg ICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5D b25zb2xlUHJvZmlsZVJlY29yZGVkOgotICAgICAgICAgICAgICAgIGljb25TdHlsZUNsYXNzID0g V2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkVHJlZUVsZW1lbnQuQ29uc29sZVByb2ZpbGVJY29u U3R5bGVDbGFzczsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGNhc2UgV2Vi SW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5HYXJiYWdlQ29sbGVjdGVk OgotICAgICAgICAgICAgICAgIGljb25TdHlsZUNsYXNzID0gV2ViSW5zcGVjdG9yLlRpbWVsaW5l UmVjb3JkVHJlZUVsZW1lbnQuR2FyYmFnZUNvbGxlY3Rpb25JY29uU3R5bGVDbGFzczsKLSAgICAg ICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlNjcmlwdFRp bWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5UaW1lckluc3RhbGxlZDoKLSAgICAgICAgICAgICAgICBp ZiAoaW5jbHVkZURldGFpbHNJbk1haW5UaXRsZSkgewotICAgICAgICAgICAgICAgICAgICBsZXQg dGltZW91dFN0cmluZyA9ICBOdW1iZXIuc2Vjb25kc1RvU3RyaW5nKHRpbWVsaW5lUmVjb3JkLmRl dGFpbHMudGltZW91dCAvIDEwMDApOwotICAgICAgICAgICAgICAgICAgICBhbHRlcm5hdGVTdWJ0 aXRsZSA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKLSAgICAgICAgICAgICAgICAg ICAgYWx0ZXJuYXRlU3VidGl0bGUuY2xhc3NMaXN0LmFkZCgiYWx0ZXJuYXRlLXN1YnRpdGxlIik7 Ci0gICAgICAgICAgICAgICAgICAgIGlmICh0aW1lbGluZVJlY29yZC5kZXRhaWxzLnJlcGVhdGlu ZykKLSAgICAgICAgICAgICAgICAgICAgICAgIGFsdGVybmF0ZVN1YnRpdGxlLnRleHRDb250ZW50 ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIlcyBpbnRlcnZhbCIpLmZvcm1hdCh0aW1lb3V0U3Ry aW5nKTsKLSAgICAgICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgICAgICAgICAg YWx0ZXJuYXRlU3VidGl0bGUudGV4dENvbnRlbnQgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIiVz IGRlbGF5IikuZm9ybWF0KHRpbWVvdXRTdHJpbmcpOwotICAgICAgICAgICAgICAgIH0KLQotICAg ICAgICAgICAgICAgIGljb25TdHlsZUNsYXNzID0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3Jk VHJlZUVsZW1lbnQuVGltZXJSZWNvcmRJY29uU3R5bGVDbGFzczsKLSAgICAgICAgICAgICAgICBi cmVhazsKLSAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVjb3Jk LkV2ZW50VHlwZS5UaW1lckZpcmVkOgotICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuU2Ny aXB0VGltZWxpbmVSZWNvcmQuRXZlbnRUeXBlLlRpbWVyUmVtb3ZlZDoKLSAgICAgICAgICAgICAg ICBpY29uU3R5bGVDbGFzcyA9IFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZFRyZWVFbGVtZW50 LlRpbWVyUmVjb3JkSWNvblN0eWxlQ2xhc3M7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAg ICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVJlY29yZC5FdmVudFR5cGUu QW5pbWF0aW9uRnJhbWVGaXJlZDoKLSAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlNjcmlw dFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5BbmltYXRpb25GcmFtZVJlcXVlc3RlZDoKLSAgICAg ICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5B bmltYXRpb25GcmFtZUNhbmNlbGVkOgotICAgICAgICAgICAgICAgIGljb25TdHlsZUNsYXNzID0g V2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkVHJlZUVsZW1lbnQuQW5pbWF0aW9uUmVjb3JkSWNv blN0eWxlQ2xhc3M7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBkZWZhdWx0 OgotICAgICAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoIlVua25vd24gU2NyaXB0VGltZWxpbmVS ZWNvcmQgZXZlbnRUeXBlOiAiICsgdGltZWxpbmVSZWNvcmQuZXZlbnRUeXBlLCB0aW1lbGluZVJl Y29yZCk7Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIGJyZWFrOwotCi0gICAgICAgIGNh c2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUuUmVuZGVyaW5nRnJhbWU6Ci0gICAg ICAgICAgICB0aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiRnJhbWUgJWQiKS5mb3JtYXQo dGltZWxpbmVSZWNvcmQuZnJhbWVOdW1iZXIpOwotICAgICAgICAgICAgaWNvblN0eWxlQ2xhc3Mg PSBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRUcmVlRWxlbWVudC5SZW5kZXJpbmdGcmFtZVJl Y29yZEljb25TdHlsZUNsYXNzOwotICAgICAgICAgICAgYnJlYWs7Ci0KLSAgICAgICAgZGVmYXVs dDoKLSAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoIlVua25vd24gVGltZWxpbmVSZWNvcmQgdHlw ZTogIiArIHRpbWVsaW5lUmVjb3JkLnR5cGUsIHRpbWVsaW5lUmVjb3JkKTsKLSAgICAgICAgfQor ICAgICAgICBsZXQgaWNvblN0eWxlQ2xhc3MgPSBXZWJJbnNwZWN0b3IuVGltZWxpbmVUYWJDb250 ZW50Vmlldy5pY29uQ2xhc3NOYW1lRm9yUmVjb3JkKHRpbWVsaW5lUmVjb3JkKTsKKyAgICAgICAg bGV0IHRpdGxlID0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lVGFiQ29udGVudFZpZXcuZGlzcGxheU5h bWVGb3JSZWNvcmQodGltZWxpbmVSZWNvcmQpOwogCiAgICAgICAgIHN1cGVyKFtpY29uU3R5bGVD bGFzc10sIHRpdGxlLCBzdWJ0aXRsZSwgcmVwcmVzZW50ZWRPYmplY3QgfHwgdGltZWxpbmVSZWNv cmQsIGZhbHNlKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZp ZXcuanMKaW5kZXggODI4ODM0NjVkODdiYmVhZTUyNDk3NTY4YjhmMzg3YmE3ZTZlMjkwMC4uMjEy NDFlY2JiMWM3Nzc1M2JhY2FhZmRiZDY2M2ViNTg5YjMxNTkzOSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRpbmdDb250 ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LmpzCkBAIC01ODYsOCArNTg2LDggQEAgV2Vi SW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcgPSBjbGFzcyBUaW1lbGluZVJl Y29yZGluZ0NvbnRlbnRWaWV3IGUKICAgICAgICAgaWYgKHRpbWVsaW5lLnR5cGUgPT09IFdlYklu c3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLlJlbmRlcmluZ0ZyYW1lKQogICAgICAgICAgICAg dGhpcy5fcmVuZGVyaW5nRnJhbWVUaW1lbGluZSA9IHRpbWVsaW5lOwogCi0gICAgICAgIGxldCBk aXNwbGF5TmFtZSA9IFdlYkluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbC5kaXNwbGF5TmFt ZUZvclRpbWVsaW5lKHRpbWVsaW5lKTsKLSAgICAgICAgbGV0IGljb25DbGFzc05hbWUgPSBXZWJJ bnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwuaWNvbkNsYXNzTmFtZUZvclRpbWVsaW5lKHRp bWVsaW5lKTsKKyAgICAgICAgbGV0IGRpc3BsYXlOYW1lID0gV2ViSW5zcGVjdG9yLlRpbWVsaW5l VGFiQ29udGVudFZpZXcuZGlzcGxheU5hbWVGb3JUaW1lbGluZSh0aW1lbGluZSk7CisgICAgICAg IGxldCBpY29uQ2xhc3NOYW1lID0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lVGFiQ29udGVudFZpZXcu aWNvbkNsYXNzTmFtZUZvclRpbWVsaW5lKHRpbWVsaW5lKTsKICAgICAgICAgbGV0IHBhdGhDb21w b25lbnQgPSBuZXcgV2ViSW5zcGVjdG9yLkhpZXJhcmNoaWNhbFBhdGhDb21wb25lbnQoZGlzcGxh eU5hbWUsIGljb25DbGFzc05hbWUsIHRpbWVsaW5lKTsKICAgICAgICAgcGF0aENvbXBvbmVudC5h ZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5IaWVyYXJjaGljYWxQYXRoQ29tcG9uZW50LkV2 ZW50LlNpYmxpbmdXYXNTZWxlY3RlZCwgdGhpcy5fcGF0aENvbXBvbmVudFNlbGVjdGVkLCB0aGlz KTsKICAgICAgICAgdGhpcy5fcGF0aENvbXBvbmVudE1hcC5zZXQodGltZWxpbmUsIHBhdGhDb21w b25lbnQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvVGltZWxpbmVTaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQYW5lbC5qcwppbmRleCA4YWMxMjMxZWE0 MTUwMmIxZWZmMjY2NTc3YjM3ODM0NzY0MzQ5NTkxLi5iMjc2NGVhNDBmZGNhOGYwNDMxNDQwMjM3 NzE0YTVmMTA1YWRhZTA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQYW5lbC5qcwpAQCAt MTgyLDQwICsxODIsNiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwgPSBjbGFz cyBUaW1lbGluZVNpZGViYXJQYW5lbCBleHRlbmRzIFdlYkluc3BlYwogICAgICAgICB0aGlzLl90 b2dnbGVOZXdSZWNvcmRpbmdTaG9ydGN1dC5kaXNhYmxlZCA9IHRydWU7CiAgICAgfQogCi0gICAg Ly8gU3RhdGljCi0KLSAgICBzdGF0aWMgZGlzcGxheU5hbWVGb3JUaW1lbGluZSh0aW1lbGluZSkK LSAgICB7Ci0gICAgICAgIHN3aXRjaCAodGltZWxpbmUudHlwZSkgewotICAgICAgICBjYXNlIFdl Ykluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLk5ldHdvcms6Ci0gICAgICAgICAgICByZXR1 cm4gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJOZXR3b3JrIFJlcXVlc3RzIik7Ci0gICAgICAgIGNh c2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUuTGF5b3V0OgotICAgICAgICAgICAg cmV0dXJuIFdlYkluc3BlY3Rvci5VSVN0cmluZygiTGF5b3V0ICYgUmVuZGVyaW5nIik7Ci0gICAg ICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUuU2NyaXB0OgotICAgICAg ICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5VSVN0cmluZygiSmF2YVNjcmlwdCAmIEV2ZW50cyIp OwotICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLlJlbmRlcmlu Z0ZyYW1lOgotICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVuZGVy aW5nIEZyYW1lcyIpOwotICAgICAgICB9Ci0KLSAgICAgICAgY29uc29sZS5lcnJvcigiVW5rbm93 biBUaW1lbGluZSB0eXBlOiIsIHRpbWVsaW5lLnR5cGUpOwotICAgIH0KLQotICAgIHN0YXRpYyBp Y29uQ2xhc3NOYW1lRm9yVGltZWxpbmUodGltZWxpbmUpCi0gICAgewotICAgICAgICBzd2l0Y2gg KHRpbWVsaW5lLnR5cGUpIHsKLSAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNv cmQuVHlwZS5OZXR3b3JrOgotICAgICAgICAgICAgcmV0dXJuICJuZXR3b3JrLWljb24iOwotICAg ICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLkxheW91dDoKLSAgICAg ICAgICAgIHJldHVybiAiY29sb3JzLWljb24iOwotICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5U aW1lbGluZVJlY29yZC5UeXBlLlNjcmlwdDoKLSAgICAgICAgICAgIHJldHVybiAic2NyaXB0LWlj b24iOwotICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLlJlbmRl cmluZ0ZyYW1lOgotICAgICAgICAgICAgcmV0dXJuICJyZW5kZXJpbmctZnJhbWUtaWNvbiI7Ci0g ICAgICAgIH0KLQotICAgICAgICBjb25zb2xlLmVycm9yKCJVbmtub3duIFRpbWVsaW5lIHR5cGU6 IiwgdGltZWxpbmUudHlwZSk7Ci0gICAgfQotCiAgICAgLy8gUHVibGljCiAKICAgICBzaG93bigp CkBAIC03ODEsOCArNzQ3LDggQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsID0g Y2xhc3MgVGltZWxpbmVTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXZWJJbnNwZWMKICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIGxldCBkaXNwbGF5TmFtZSA9IFdlYkluc3Bl Y3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbC5kaXNwbGF5TmFtZUZvclRpbWVsaW5lKHRpbWVsaW5l KTsKLSAgICAgICAgbGV0IGljb25DbGFzc05hbWUgPSBXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRl YmFyUGFuZWwuaWNvbkNsYXNzTmFtZUZvclRpbWVsaW5lKHRpbWVsaW5lKTsKKyAgICAgICAgbGV0 IGRpc3BsYXlOYW1lID0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lVGFiQ29udGVudFZpZXcuZGlzcGxh eU5hbWVGb3JUaW1lbGluZSh0aW1lbGluZSk7CisgICAgICAgIGxldCBpY29uQ2xhc3NOYW1lID0g V2ViSW5zcGVjdG9yLlRpbWVsaW5lVGFiQ29udGVudFZpZXcuaWNvbkNsYXNzTmFtZUZvclRpbWVs aW5lKHRpbWVsaW5lKTsKICAgICAgICAgbGV0IHRpbWVsaW5lVHJlZUVsZW1lbnQgPSBuZXcgV2Vi SW5zcGVjdG9yLkdlbmVyYWxUcmVlRWxlbWVudChbaWNvbkNsYXNzTmFtZSwgV2ViSW5zcGVjdG9y LlRpbWVsaW5lU2lkZWJhclBhbmVsLkxhcmdlSWNvblN0eWxlQ2xhc3NdLCBkaXNwbGF5TmFtZSwg bnVsbCwgdGltZWxpbmUpOwogICAgICAgICBsZXQgdG9vbHRpcCA9IFdlYkluc3BlY3Rvci5VSVN0 cmluZygiQ2xvc2UgJXMgdGltZWxpbmUgdmlldyIpLmZvcm1hdChkaXNwbGF5TmFtZSk7CiAgICAg ICAgIGxldCBidXR0b24gPSBuZXcgV2ViSW5zcGVjdG9yLlRyZWVFbGVtZW50U3RhdHVzQnV0dG9u KHVzZVNWR1N5bWJvbCgiSW1hZ2VzL0Nsb3NlTGFyZ2Uuc3ZnIiwgImNsb3NlLWJ1dHRvbiIsIHRv b2x0aXApKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1RpbWVsaW5lVGFiQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVRhYkNvbnRlbnRWaWV3LmpzCmluZGV4IGJjNjI3 OGRlNGQ5OTZiYWQ0MDdjMTI1NjE2N2IzODI1NTEyYjdhNWQuLjJhZWY0NTRmNmE1N2I0NzVhNmZm ZTIzZjBlZjE5MzY5NzM3ZjJmNjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVUYWJDb250ZW50Vmll dy5qcwpAQCAtMzQsNiArMzQsOCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVUYWJDb250ZW50Vmll dyA9IGNsYXNzIFRpbWVsaW5lVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJbgogICAgICAgICBz dXBlcihpZGVudGlmaWVyIHx8ICJ0aW1lbGluZSIsICJ0aW1lbGluZSIsIHRhYkJhckl0ZW0sIFdl Ykluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbCwgZGV0YWlsc1NpZGViYXJQYW5lbHMpOwog ICAgIH0KIAorICAgIC8vIFN0YXRpYworCiAgICAgc3RhdGljIHRhYkluZm8oKQogICAgIHsKICAg ICAgICAgcmV0dXJuIHsKQEAgLTQ3LDYgKzQ5LDEyMiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVU YWJDb250ZW50VmlldyA9IGNsYXNzIFRpbWVsaW5lVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJ bgogICAgICAgICByZXR1cm4gISF3aW5kb3cuVGltZWxpbmVBZ2VudCB8fCAhIXdpbmRvdy5TY3Jp cHRQcm9maWxlckFnZW50OwogICAgIH0KIAorICAgIHN0YXRpYyBkaXNwbGF5TmFtZUZvclRpbWVs aW5lKHRpbWVsaW5lKQorICAgIHsKKyAgICAgICAgc3dpdGNoICh0aW1lbGluZS50eXBlKSB7Cisg ICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUuTmV0d29yazoKKyAg ICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk5ldHdvcmsgUmVxdWVzdHMi KTsKKyAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmQuVHlwZS5MYXlvdXQ6 CisgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJMYXlvdXQgJiBSZW5k ZXJpbmciKTsKKyAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmQuVHlwZS5T Y3JpcHQ6CisgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJKYXZhU2Ny aXB0ICYgRXZlbnRzIik7CisgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3Jk LlR5cGUuUmVuZGVyaW5nRnJhbWU6CisgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJSZW5kZXJpbmcgRnJhbWVzIik7CisgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAg ICBjb25zb2xlLmVycm9yKCJVbmtub3duIFRpbWVsaW5lIHR5cGU6IiwgdGltZWxpbmUudHlwZSk7 CisgICAgICAgIH0KKworICAgICAgICByZXR1cm4gbnVsbDsKKyAgICB9CisKKyAgICBzdGF0aWMg aWNvbkNsYXNzTmFtZUZvclRpbWVsaW5lKHRpbWVsaW5lKQorICAgIHsKKyAgICAgICAgc3dpdGNo ICh0aW1lbGluZS50eXBlKSB7CisgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVj b3JkLlR5cGUuTmV0d29yazoKKyAgICAgICAgICAgIHJldHVybiAibmV0d29yay1pY29uIjsKKyAg ICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmQuVHlwZS5MYXlvdXQ6CisgICAg ICAgICAgICByZXR1cm4gImNvbG9ycy1pY29uIjsKKyAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3Iu VGltZWxpbmVSZWNvcmQuVHlwZS5TY3JpcHQ6CisgICAgICAgICAgICByZXR1cm4gInNjcmlwdC1p Y29uIjsKKyAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmQuVHlwZS5SZW5k ZXJpbmdGcmFtZToKKyAgICAgICAgICAgIHJldHVybiAicmVuZGVyaW5nLWZyYW1lLWljb24iOwor ICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgY29uc29sZS5lcnJvcigiVW5rbm93biBUaW1l bGluZSB0eXBlOiIsIHRpbWVsaW5lLnR5cGUpOworICAgICAgICB9CisKKyAgICAgICAgcmV0dXJu IG51bGw7CisgICAgfQorCisgICAgc3RhdGljIGljb25DbGFzc05hbWVGb3JSZWNvcmQodGltZWxp bmVSZWNvcmQpCisgICAgeworICAgICAgICBzd2l0Y2ggKHRpbWVsaW5lUmVjb3JkLnR5cGUpIHsK KyAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmQuVHlwZS5MYXlvdXQ6Cisg ICAgICAgICAgICBzd2l0Y2ggKHRpbWVsaW5lUmVjb3JkLmV2ZW50VHlwZSkgeworICAgICAgICAg ICAgY2FzZSBXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVSZWNvcmQuRXZlbnRUeXBlLkludmFs aWRhdGVTdHlsZXM6CisgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGlu ZVJlY29yZC5FdmVudFR5cGUuUmVjYWxjdWxhdGVTdHlsZXM6CisgICAgICAgICAgICAgICAgcmV0 dXJuIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZFRyZWVFbGVtZW50LlN0eWxlUmVjb3JkSWNv blN0eWxlQ2xhc3M7CisgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGlu ZVJlY29yZC5FdmVudFR5cGUuSW52YWxpZGF0ZUxheW91dDoKKyAgICAgICAgICAgIGNhc2UgV2Vi SW5zcGVjdG9yLkxheW91dFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5Gb3JjZWRMYXlvdXQ6Cisg ICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGluZVJlY29yZC5FdmVudFR5 cGUuTGF5b3V0OgorICAgICAgICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuVGltZWxpbmVS ZWNvcmRUcmVlRWxlbWVudC5MYXlvdXRSZWNvcmRJY29uU3R5bGVDbGFzczsKKyAgICAgICAgICAg IGNhc2UgV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5QYWludDoK KyAgICAgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkVHJlZUVs ZW1lbnQuUGFpbnRSZWNvcmRJY29uU3R5bGVDbGFzczsKKyAgICAgICAgICAgIGNhc2UgV2ViSW5z cGVjdG9yLkxheW91dFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5Db21wb3NpdGU6CisgICAgICAg ICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZFRyZWVFbGVtZW50LkNv bXBvc2l0ZVJlY29yZEljb25TdHlsZUNsYXNzOworICAgICAgICAgICAgZGVmYXVsdDoKKyAgICAg ICAgICAgICAgICBjb25zb2xlLmVycm9yKCJVbmtub3duIExheW91dFRpbWVsaW5lUmVjb3JkIGV2 ZW50VHlwZTogIiArIHRpbWVsaW5lUmVjb3JkLmV2ZW50VHlwZSwgdGltZWxpbmVSZWNvcmQpOwor ICAgICAgICAgICAgfQorCisgICAgICAgICAgICBicmVhazsKKworICAgICAgICBjYXNlIFdlYklu c3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLlNjcmlwdDoKKyAgICAgICAgICAgIHN3aXRjaCAo dGltZWxpbmVSZWNvcmQuZXZlbnRUeXBlKSB7CisgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rv ci5TY3JpcHRUaW1lbGluZVJlY29yZC5FdmVudFR5cGUuQVBJU2NyaXB0RXZhbHVhdGVkOgorICAg ICAgICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRUcmVlRWxlbWVu dC5BUElSZWNvcmRJY29uU3R5bGVDbGFzczsKKyAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9y LlNjcmlwdFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5TY3JpcHRFdmFsdWF0ZWQ6CisgICAgICAg ICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZFRyZWVFbGVtZW50LkV2 YWx1YXRlZFJlY29yZEljb25TdHlsZUNsYXNzOworICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0 b3IuU2NyaXB0VGltZWxpbmVSZWNvcmQuRXZlbnRUeXBlLk1pY3JvdGFza0Rpc3BhdGNoZWQ6Cisg ICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVJlY29yZC5FdmVudFR5 cGUuRXZlbnREaXNwYXRjaGVkOgorICAgICAgICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3Iu VGltZWxpbmVSZWNvcmRUcmVlRWxlbWVudC5FdmVudFJlY29yZEljb25TdHlsZUNsYXNzOworICAg ICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVSZWNvcmQuRXZlbnRUeXBl LlByb2JlU2FtcGxlUmVjb3JkZWQ6CisgICAgICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rv ci5UaW1lbGluZVJlY29yZFRyZWVFbGVtZW50LlByb2JlUmVjb3JkSWNvblN0eWxlQ2xhc3M7Cisg ICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVJlY29yZC5FdmVudFR5 cGUuQ29uc29sZVByb2ZpbGVSZWNvcmRlZDoKKyAgICAgICAgICAgICAgICByZXR1cm4gV2ViSW5z cGVjdG9yLlRpbWVsaW5lUmVjb3JkVHJlZUVsZW1lbnQuQ29uc29sZVByb2ZpbGVJY29uU3R5bGVD bGFzczsKKyAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVjb3Jk LkV2ZW50VHlwZS5HYXJiYWdlQ29sbGVjdGVkOgorICAgICAgICAgICAgICAgIHJldHVybiBXZWJJ bnNwZWN0b3IuVGltZWxpbmVSZWNvcmRUcmVlRWxlbWVudC5HYXJiYWdlQ29sbGVjdGlvbkljb25T dHlsZUNsYXNzOworICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVS ZWNvcmQuRXZlbnRUeXBlLlRpbWVySW5zdGFsbGVkOgorICAgICAgICAgICAgICAgIHJldHVybiBX ZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRUcmVlRWxlbWVudC5UaW1lclJlY29yZEljb25TdHls ZUNsYXNzOworICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVSZWNv cmQuRXZlbnRUeXBlLlRpbWVyRmlyZWQ6CisgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5T Y3JpcHRUaW1lbGluZVJlY29yZC5FdmVudFR5cGUuVGltZXJSZW1vdmVkOgorICAgICAgICAgICAg ICAgIHJldHVybiBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRUcmVlRWxlbWVudC5UaW1lclJl Y29yZEljb25TdHlsZUNsYXNzOworICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuU2NyaXB0 VGltZWxpbmVSZWNvcmQuRXZlbnRUeXBlLkFuaW1hdGlvbkZyYW1lRmlyZWQ6CisgICAgICAgICAg ICBjYXNlIFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVJlY29yZC5FdmVudFR5cGUuQW5pbWF0 aW9uRnJhbWVSZXF1ZXN0ZWQ6CisgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5TY3JpcHRU aW1lbGluZVJlY29yZC5FdmVudFR5cGUuQW5pbWF0aW9uRnJhbWVDYW5jZWxlZDoKKyAgICAgICAg ICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkVHJlZUVsZW1lbnQuQW5p bWF0aW9uUmVjb3JkSWNvblN0eWxlQ2xhc3M7CisgICAgICAgICAgICBkZWZhdWx0OgorICAgICAg ICAgICAgICAgIGNvbnNvbGUuZXJyb3IoIlVua25vd24gU2NyaXB0VGltZWxpbmVSZWNvcmQgZXZl bnRUeXBlOiAiICsgdGltZWxpbmVSZWNvcmQuZXZlbnRUeXBlLCB0aW1lbGluZVJlY29yZCk7Cisg ICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgIGNhc2UgV2ViSW5z cGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUuUmVuZGVyaW5nRnJhbWU6CisgICAgICAgICAgICBy ZXR1cm4gV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkVHJlZUVsZW1lbnQuUmVuZGVyaW5nRnJh bWVSZWNvcmRJY29uU3R5bGVDbGFzczsKKworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAg Y29uc29sZS5lcnJvcigiVW5rbm93biBUaW1lbGluZVJlY29yZCB0eXBlOiAiICsgdGltZWxpbmVS ZWNvcmQudHlwZSwgdGltZWxpbmVSZWNvcmQpOworICAgICAgICB9CisKKyAgICAgICAgcmV0dXJu IG51bGw7CisgICAgfQorCisgICAgc3RhdGljIGRpc3BsYXlOYW1lRm9yUmVjb3JkKHRpbWVsaW5l UmVjb3JkLCBpbmNsdWRlRGV0YWlsc0luTWFpblRpdGxlKQorICAgIHsKKyAgICAgICAgc3dpdGNo ICh0aW1lbGluZVJlY29yZC50eXBlKSB7CisgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVs aW5lUmVjb3JkLlR5cGUuTmV0d29yazoKKyAgICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3Iu ZGlzcGxheU5hbWVGb3JVUkwodGltZWxpbmVSZWNvcmQucmVzb3VyY2UudXJsLCB0aW1lbGluZVJl Y29yZC5yZXNvdXJjZS51cmxDb21wb25lbnRzKTsKKyAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3Iu VGltZWxpbmVSZWNvcmQuVHlwZS5MYXlvdXQ6CisgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVj dG9yLkxheW91dFRpbWVsaW5lUmVjb3JkLmRpc3BsYXlOYW1lRm9yRXZlbnRUeXBlKHRpbWVsaW5l UmVjb3JkLmV2ZW50VHlwZSk7CisgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVj b3JkLlR5cGUuU2NyaXB0OgorICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5TY3JpcHRU aW1lbGluZVJlY29yZC5FdmVudFR5cGUuZGlzcGxheU5hbWUodGltZWxpbmVSZWNvcmQuZXZlbnRU eXBlLCB0aW1lbGluZVJlY29yZC5kZXRhaWxzLCBpbmNsdWRlRGV0YWlsc0luTWFpblRpdGxlKTsK KyAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmQuVHlwZS5SZW5kZXJpbmdG cmFtZToKKyAgICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkZyYW1lICVk IikuZm9ybWF0KHRpbWVsaW5lUmVjb3JkLmZyYW1lTnVtYmVyKTsKKyAgICAgICAgZGVmYXVsdDoK KyAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoIlVua25vd24gVGltZWxpbmVSZWNvcmQgdHlwZTog IiArIHRpbWVsaW5lUmVjb3JkLnR5cGUsIHRpbWVsaW5lUmVjb3JkKTsKKyAgICAgICAgfQorCisg ICAgICAgIHJldHVybiBudWxsOworICAgIH0KKwogICAgIC8vIFB1YmxpYwogCiAgICAgZ2V0IHR5 cGUoKQo= 268816 2016-01-12 15:11:23 -0800 2016-01-12 16:04:40 -0800 [Patch] Proposed Fix bug-152996-20160112151052.patch text/plain 20605 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0OTI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBm ODM5NDE1ZGVjY2ZkYTJlZGE3NmU3NmQ1ZmY2ZWNlYTQxYjdkMzhmLi42MjliOTJmMGM1ZGMzMjdl YjkxOGNkN2YzZDMwNjQyMTgzZGFhMWU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzOCBAQAorMjAxNi0wMS0xMiAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTW92ZSBoZWxwZXIgbWV0aG9kcyBmb3IgZ2V0dGlu ZyBpY29ucy90ZXh0IHRvIFRpbWVsaW5lVGFiQ29udGVudFZpZXcKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1Mjk5NgorCisgICAgICAgIFJldmlld2Vk IGJ5IEJyaWFuIEJ1cmcuCisKKyAgICAgICAgSW4gcHJlcGFyYXRpb24gZm9yIHRoZSBUaW1lbGlu ZXMgVUkgcmVkZXNpZ24sIGhlbHBlciBtZXRob2RzIHdoaWNoIGV4aXN0ZWQKKyAgICAgICAgaW4g dGhlIHNpZGViYXIgcGFuZWwgYW5kIHRpbWVsaW5lIHRyZWUgZWxlbWVudHMgbmVlZCB0byBiZSBy ZWxvY2F0ZWQsCisgICAgICAgIHNpbmNlIHRoZSBzaWRlYmFyIHdvbid0IGV4aXN0IGluIHRoZSBu ZXcgVUkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkVHJl ZUVsZW1lbnQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRUcmVlRWxl bWVudCk6CisgICAgICAgIFJlbW92ZWQgaWNvbi90aXRsZSBjb2RlLCByZXBsYWNlZCB3aXRoIGNh bGxzIHRvIG5ldyBoZWxwZXIgbWV0aG9kcy4KKyAgICAgICAgQ29kZSB0byBjcmVhdGUgdGhlIGFs dGVybmF0ZSBzdWJ0aXRsZSB3YXMgYnJva2VuIG91dCBmb3JtIHRoZSByZXN0CisgICAgICAgIG9m IHRoZSBpY29uL3RpdGxlIGNvZGUsIGFuZCBrZXB0IGluIHRoZSBjb25zdHJ1Y3Rvci4KKworICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LnBy b3RvdHlwZS5faW5zdHJ1bWVudEFkZGVkKToKKyAgICAgICAgVXBkYXRlZCBjYWxscyB0byBoZWxw ZXIgbWV0aG9kcy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVTaWRl YmFyUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwu cHJvdG90eXBlLl9pbnN0cnVtZW50QWRkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVs aW5lU2lkZWJhclBhbmVsLmRpc3BsYXlOYW1lRm9yVGltZWxpbmUpOiBEZWxldGVkLgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsLmljb25DbGFzc05hbWVGb3JUaW1l bGluZSk6IERlbGV0ZWQuCisgICAgICAgIE1vdmVkIHRvIFRpbWVsaW5lVGFiQ29udGVudFZpZXcu CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lVGFiQ29udGVudFZpZXcu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVUYWJDb250ZW50Vmlldy5kaXNwbGF5 TmFtZUZvclRpbWVsaW5lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVRhYkNvbnRl bnRWaWV3Lmljb25DbGFzc05hbWVGb3JUaW1lbGluZSk6CisgICAgICAgIFJlbG9jYXRlZCBmcm9t IFRpbWVsaW5lU2lkZWJhclBhbmVsLgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lVGFi Q29udGVudFZpZXcuaWNvbkNsYXNzTmFtZUZvclJlY29yZCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuVGltZWxpbmVUYWJDb250ZW50Vmlldy5kaXNwbGF5TmFtZUZvclJlY29yZCk6CisgICAgICAg IE5ldyBoZWxwZXIgbWV0aG9kcy4gUHJldmlvdXNseSBwYXJ0IG9mIFRpbWVsaW5lUmVjb3JkVHJl ZUVsZW1lbnQuCisKIDIwMTYtMDEtMTIgIEJyaWFuIEJ1cmcgIDxiYnVyZ0BhcHBsZS5jb20+CiAK ICAgICAgICAgV2ViIEluc3BlY3RvcjogZml4IHNvbWUgY29tbW9uIG1pc3NwZWxsaW5ncyBpbiBs b2NhbGl6ZWQgc3RyaW5ncwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRUcmVlRWxlbWVudC5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkVHJlZUVsZW1lbnQu anMKaW5kZXggNjExNWI3OWE2ODNlY2ZlOGU4N2FmNTlkYWJhNWYyNzI2NjM1ODU4NC4uMjQ0NzJm OTBlOWQ2YTRkOGM0ZDM5ZjYyZWVkYmNmNTY0NTQzZDhhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRUcmVlRWxlbWVu dC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1l bGluZVJlY29yZFRyZWVFbGVtZW50LmpzCkBAIC0zMSwxMCArMzEsMTggQEAgV2ViSW5zcGVjdG9y LlRpbWVsaW5lUmVjb3JkVHJlZUVsZW1lbnQgPSBjbGFzcyBUaW1lbGluZVJlY29yZFRyZWVFbGVt ZW50IGV4dGVuZHMKIAogICAgICAgICBzb3VyY2VDb2RlTG9jYXRpb24gPSBzb3VyY2VDb2RlTG9j YXRpb24gfHwgdGltZWxpbmVSZWNvcmQuc291cmNlQ29kZUxvY2F0aW9uIHx8IG51bGw7CiAKLSAg ICAgICAgdmFyIHRpdGxlID0gIiI7Ci0gICAgICAgIHZhciBzdWJ0aXRsZSA9IG51bGw7Ci0gICAg ICAgIHZhciBhbHRlcm5hdGVTdWJ0aXRsZSA9IG51bGw7CisgICAgICAgIGxldCBhbHRlcm5hdGVT dWJ0aXRsZSA9IG51bGw7CisgICAgICAgIGlmIChpbmNsdWRlRGV0YWlsc0luTWFpblRpdGxlICYm IHRpbWVsaW5lUmVjb3JkLnR5cGUgPT09IFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBl LlNjcmlwdCAmJiB0aW1lbGluZVJlY29yZC5ldmVudFR5cGUgPT09IFdlYkluc3BlY3Rvci5TY3Jp cHRUaW1lbGluZVJlY29yZC5FdmVudFR5cGUuVGltZXJJbnN0YWxsZWQpIHsKKyAgICAgICAgICAg IGxldCB0aW1lb3V0U3RyaW5nID0gTnVtYmVyLnNlY29uZHNUb1N0cmluZyh0aW1lbGluZVJlY29y ZC5kZXRhaWxzLnRpbWVvdXQgLyAxMDAwKTsKKyAgICAgICAgICAgIGFsdGVybmF0ZVN1YnRpdGxl ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOworICAgICAgICAgICAgYWx0ZXJuYXRl U3VidGl0bGUuY2xhc3NMaXN0LmFkZCgiYWx0ZXJuYXRlLXN1YnRpdGxlIik7CisgICAgICAgICAg ICBpZiAodGltZWxpbmVSZWNvcmQuZGV0YWlscy5yZXBlYXRpbmcpCisgICAgICAgICAgICAgICAg YWx0ZXJuYXRlU3VidGl0bGUudGV4dENvbnRlbnQgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIiVz IGludGVydmFsIikuZm9ybWF0KHRpbWVvdXRTdHJpbmcpOworICAgICAgICAgICAgZWxzZQorICAg ICAgICAgICAgICAgIGFsdGVybmF0ZVN1YnRpdGxlLnRleHRDb250ZW50ID0gV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCIlcyBkZWxheSIpLmZvcm1hdCh0aW1lb3V0U3RyaW5nKTsKKyAgICAgICAgfQog CisgICAgICAgIGxldCBzdWJ0aXRsZSA9IG51bGw7CiAgICAgICAgIGlmIChzb3VyY2VDb2RlTG9j YXRpb24pIHsKICAgICAgICAgICAgIHN1YnRpdGxlID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgi c3BhbiIpOwogCkBAIC00NCw5MyArNTIsOCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRU cmVlRWxlbWVudCA9IGNsYXNzIFRpbWVsaW5lUmVjb3JkVHJlZUVsZW1lbnQgZXh0ZW5kcwogICAg ICAgICAgICAgICAgIHNvdXJjZUNvZGVMb2NhdGlvbi5wb3B1bGF0ZUxpdmVEaXNwbGF5TG9jYXRp b25TdHJpbmcoc3VidGl0bGUsICJ0ZXh0Q29udGVudCIsIG51bGwsIFdlYkluc3BlY3Rvci5Tb3Vy Y2VDb2RlTG9jYXRpb24uTmFtZVN0eWxlLk5vbmUsIFdlYkluc3BlY3Rvci5VSVN0cmluZygibGlu ZSAiKSk7CiAgICAgICAgIH0KIAotICAgICAgICB2YXIgaWNvblN0eWxlQ2xhc3MgPSBudWxsOwot Ci0gICAgICAgIHN3aXRjaCAodGltZWxpbmVSZWNvcmQudHlwZSkgewotICAgICAgICBjYXNlIFdl Ykluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLkxheW91dDoKLSAgICAgICAgICAgIHRpdGxl ID0gV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5lUmVjb3JkLmRpc3BsYXlOYW1lRm9yRXZlbnRU eXBlKHRpbWVsaW5lUmVjb3JkLmV2ZW50VHlwZSk7Ci0KLSAgICAgICAgICAgIHN3aXRjaCAodGlt ZWxpbmVSZWNvcmQuZXZlbnRUeXBlKSB7Ci0gICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5M YXlvdXRUaW1lbGluZVJlY29yZC5FdmVudFR5cGUuSW52YWxpZGF0ZVN0eWxlczoKLSAgICAgICAg ICAgIGNhc2UgV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5SZWNh bGN1bGF0ZVN0eWxlczoKLSAgICAgICAgICAgICAgICBpY29uU3R5bGVDbGFzcyA9IFdlYkluc3Bl Y3Rvci5UaW1lbGluZVJlY29yZFRyZWVFbGVtZW50LlN0eWxlUmVjb3JkSWNvblN0eWxlQ2xhc3M7 Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5M YXlvdXRUaW1lbGluZVJlY29yZC5FdmVudFR5cGUuSW52YWxpZGF0ZUxheW91dDoKLSAgICAgICAg ICAgIGNhc2UgV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5Gb3Jj ZWRMYXlvdXQ6Ci0gICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGluZVJl Y29yZC5FdmVudFR5cGUuTGF5b3V0OgotICAgICAgICAgICAgICAgIGljb25TdHlsZUNsYXNzID0g V2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkVHJlZUVsZW1lbnQuTGF5b3V0UmVjb3JkSWNvblN0 eWxlQ2xhc3M7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIFdlYklu c3BlY3Rvci5MYXlvdXRUaW1lbGluZVJlY29yZC5FdmVudFR5cGUuUGFpbnQ6Ci0gICAgICAgICAg ICAgICAgaWNvblN0eWxlQ2xhc3MgPSBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRUcmVlRWxl bWVudC5QYWludFJlY29yZEljb25TdHlsZUNsYXNzOwotICAgICAgICAgICAgICAgIGJyZWFrOwot ICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVSZWNvcmQuRXZlbnRU eXBlLkNvbXBvc2l0ZToKLSAgICAgICAgICAgICAgICBpY29uU3R5bGVDbGFzcyA9IFdlYkluc3Bl Y3Rvci5UaW1lbGluZVJlY29yZFRyZWVFbGVtZW50LkNvbXBvc2l0ZVJlY29yZEljb25TdHlsZUNs YXNzOwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgZGVmYXVsdDoKLSAgICAg ICAgICAgICAgICBjb25zb2xlLmVycm9yKCJVbmtub3duIExheW91dFRpbWVsaW5lUmVjb3JkIGV2 ZW50VHlwZTogIiArIHRpbWVsaW5lUmVjb3JkLmV2ZW50VHlwZSwgdGltZWxpbmVSZWNvcmQpOwot ICAgICAgICAgICAgfQotCi0gICAgICAgICAgICBicmVhazsKLQotICAgICAgICBjYXNlIFdlYklu c3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLlNjcmlwdDoKLSAgICAgICAgICAgIHRpdGxlID0g V2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5kaXNwbGF5TmFtZSh0 aW1lbGluZVJlY29yZC5ldmVudFR5cGUsIHRpbWVsaW5lUmVjb3JkLmRldGFpbHMsIGluY2x1ZGVE ZXRhaWxzSW5NYWluVGl0bGUpOwotCi0gICAgICAgICAgICBzd2l0Y2ggKHRpbWVsaW5lUmVjb3Jk LmV2ZW50VHlwZSkgewotICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxp bmVSZWNvcmQuRXZlbnRUeXBlLkFQSVNjcmlwdEV2YWx1YXRlZDoKLSAgICAgICAgICAgICAgICBp Y29uU3R5bGVDbGFzcyA9IFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZFRyZWVFbGVtZW50LkFQ SVJlY29yZEljb25TdHlsZUNsYXNzOwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAg ICAgY2FzZSBXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVSZWNvcmQuRXZlbnRUeXBlLlNjcmlw dEV2YWx1YXRlZDoKLSAgICAgICAgICAgICAgICBpY29uU3R5bGVDbGFzcyA9IFdlYkluc3BlY3Rv ci5UaW1lbGluZVJlY29yZFRyZWVFbGVtZW50LkV2YWx1YXRlZFJlY29yZEljb25TdHlsZUNsYXNz OwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3Iu U2NyaXB0VGltZWxpbmVSZWNvcmQuRXZlbnRUeXBlLk1pY3JvdGFza0Rpc3BhdGNoZWQ6Ci0gICAg ICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVJlY29yZC5FdmVudFR5cGUu RXZlbnREaXNwYXRjaGVkOgotICAgICAgICAgICAgICAgIGljb25TdHlsZUNsYXNzID0gV2ViSW5z cGVjdG9yLlRpbWVsaW5lUmVjb3JkVHJlZUVsZW1lbnQuRXZlbnRSZWNvcmRJY29uU3R5bGVDbGFz czsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9y LlNjcmlwdFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5Qcm9iZVNhbXBsZVJlY29yZGVkOgotICAg ICAgICAgICAgICAgIGljb25TdHlsZUNsYXNzID0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3Jk VHJlZUVsZW1lbnQuUHJvYmVSZWNvcmRJY29uU3R5bGVDbGFzczsKLSAgICAgICAgICAgICAgICBi cmVhazsKLSAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVjb3Jk LkV2ZW50VHlwZS5Db25zb2xlUHJvZmlsZVJlY29yZGVkOgotICAgICAgICAgICAgICAgIGljb25T dHlsZUNsYXNzID0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkVHJlZUVsZW1lbnQuQ29uc29s ZVByb2ZpbGVJY29uU3R5bGVDbGFzczsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAg ICAgIGNhc2UgV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5HYXJi YWdlQ29sbGVjdGVkOgotICAgICAgICAgICAgICAgIGljb25TdHlsZUNsYXNzID0gV2ViSW5zcGVj dG9yLlRpbWVsaW5lUmVjb3JkVHJlZUVsZW1lbnQuR2FyYmFnZUNvbGxlY3Rpb25JY29uU3R5bGVD bGFzczsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVj dG9yLlNjcmlwdFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5UaW1lckluc3RhbGxlZDoKLSAgICAg ICAgICAgICAgICBpZiAoaW5jbHVkZURldGFpbHNJbk1haW5UaXRsZSkgewotICAgICAgICAgICAg ICAgICAgICBsZXQgdGltZW91dFN0cmluZyA9ICBOdW1iZXIuc2Vjb25kc1RvU3RyaW5nKHRpbWVs aW5lUmVjb3JkLmRldGFpbHMudGltZW91dCAvIDEwMDApOwotICAgICAgICAgICAgICAgICAgICBh bHRlcm5hdGVTdWJ0aXRsZSA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKLSAgICAg ICAgICAgICAgICAgICAgYWx0ZXJuYXRlU3VidGl0bGUuY2xhc3NMaXN0LmFkZCgiYWx0ZXJuYXRl LXN1YnRpdGxlIik7Ci0gICAgICAgICAgICAgICAgICAgIGlmICh0aW1lbGluZVJlY29yZC5kZXRh aWxzLnJlcGVhdGluZykKLSAgICAgICAgICAgICAgICAgICAgICAgIGFsdGVybmF0ZVN1YnRpdGxl LnRleHRDb250ZW50ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIlcyBpbnRlcnZhbCIpLmZvcm1h dCh0aW1lb3V0U3RyaW5nKTsKLSAgICAgICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAg ICAgICAgICAgICAgYWx0ZXJuYXRlU3VidGl0bGUudGV4dENvbnRlbnQgPSBXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIiVzIGRlbGF5IikuZm9ybWF0KHRpbWVvdXRTdHJpbmcpOwotICAgICAgICAgICAg ICAgIH0KLQotICAgICAgICAgICAgICAgIGljb25TdHlsZUNsYXNzID0gV2ViSW5zcGVjdG9yLlRp bWVsaW5lUmVjb3JkVHJlZUVsZW1lbnQuVGltZXJSZWNvcmRJY29uU3R5bGVDbGFzczsKLSAgICAg ICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlNjcmlwdFRp bWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5UaW1lckZpcmVkOgotICAgICAgICAgICAgY2FzZSBXZWJJ bnNwZWN0b3IuU2NyaXB0VGltZWxpbmVSZWNvcmQuRXZlbnRUeXBlLlRpbWVyUmVtb3ZlZDoKLSAg ICAgICAgICAgICAgICBpY29uU3R5bGVDbGFzcyA9IFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29y ZFRyZWVFbGVtZW50LlRpbWVyUmVjb3JkSWNvblN0eWxlQ2xhc3M7Ci0gICAgICAgICAgICAgICAg YnJlYWs7Ci0gICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVJlY29y ZC5FdmVudFR5cGUuQW5pbWF0aW9uRnJhbWVGaXJlZDoKLSAgICAgICAgICAgIGNhc2UgV2ViSW5z cGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5BbmltYXRpb25GcmFtZVJlcXVl c3RlZDoKLSAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVjb3Jk LkV2ZW50VHlwZS5BbmltYXRpb25GcmFtZUNhbmNlbGVkOgotICAgICAgICAgICAgICAgIGljb25T dHlsZUNsYXNzID0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkVHJlZUVsZW1lbnQuQW5pbWF0 aW9uUmVjb3JkSWNvblN0eWxlQ2xhc3M7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAg ICAgICBkZWZhdWx0OgotICAgICAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoIlVua25vd24gU2Ny aXB0VGltZWxpbmVSZWNvcmQgZXZlbnRUeXBlOiAiICsgdGltZWxpbmVSZWNvcmQuZXZlbnRUeXBl LCB0aW1lbGluZVJlY29yZCk7Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIGJyZWFrOwot Ci0gICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUuUmVuZGVyaW5n RnJhbWU6Ci0gICAgICAgICAgICB0aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiRnJhbWUg JWQiKS5mb3JtYXQodGltZWxpbmVSZWNvcmQuZnJhbWVOdW1iZXIpOwotICAgICAgICAgICAgaWNv blN0eWxlQ2xhc3MgPSBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRUcmVlRWxlbWVudC5SZW5k ZXJpbmdGcmFtZVJlY29yZEljb25TdHlsZUNsYXNzOwotICAgICAgICAgICAgYnJlYWs7Ci0KLSAg ICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoIlVua25vd24gVGltZWxp bmVSZWNvcmQgdHlwZTogIiArIHRpbWVsaW5lUmVjb3JkLnR5cGUsIHRpbWVsaW5lUmVjb3JkKTsK LSAgICAgICAgfQorICAgICAgICBsZXQgaWNvblN0eWxlQ2xhc3MgPSBXZWJJbnNwZWN0b3IuVGlt ZWxpbmVUYWJDb250ZW50Vmlldy5pY29uQ2xhc3NOYW1lRm9yUmVjb3JkKHRpbWVsaW5lUmVjb3Jk KTsKKyAgICAgICAgbGV0IHRpdGxlID0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lVGFiQ29udGVudFZp ZXcuZGlzcGxheU5hbWVGb3JSZWNvcmQodGltZWxpbmVSZWNvcmQpOwogCiAgICAgICAgIHN1cGVy KFtpY29uU3R5bGVDbGFzc10sIHRpdGxlLCBzdWJ0aXRsZSwgcmVwcmVzZW50ZWRPYmplY3QgfHwg dGltZWxpbmVSZWNvcmQsIGZhbHNlKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3Jk aW5nQ29udGVudFZpZXcuanMKaW5kZXggODI4ODM0NjVkODdiYmVhZTUyNDk3NTY4YjhmMzg3YmE3 ZTZlMjkwMC4uMjEyNDFlY2JiMWM3Nzc1M2JhY2FhZmRiZDY2M2ViNTg5YjMxNTkzOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVS ZWNvcmRpbmdDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LmpzCkBAIC01ODYsOCAr NTg2LDggQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcgPSBjbGFz cyBUaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3IGUKICAgICAgICAgaWYgKHRpbWVsaW5lLnR5 cGUgPT09IFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLlJlbmRlcmluZ0ZyYW1lKQog ICAgICAgICAgICAgdGhpcy5fcmVuZGVyaW5nRnJhbWVUaW1lbGluZSA9IHRpbWVsaW5lOwogCi0g ICAgICAgIGxldCBkaXNwbGF5TmFtZSA9IFdlYkluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5l bC5kaXNwbGF5TmFtZUZvclRpbWVsaW5lKHRpbWVsaW5lKTsKLSAgICAgICAgbGV0IGljb25DbGFz c05hbWUgPSBXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwuaWNvbkNsYXNzTmFtZUZv clRpbWVsaW5lKHRpbWVsaW5lKTsKKyAgICAgICAgbGV0IGRpc3BsYXlOYW1lID0gV2ViSW5zcGVj dG9yLlRpbWVsaW5lVGFiQ29udGVudFZpZXcuZGlzcGxheU5hbWVGb3JUaW1lbGluZSh0aW1lbGlu ZSk7CisgICAgICAgIGxldCBpY29uQ2xhc3NOYW1lID0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lVGFi Q29udGVudFZpZXcuaWNvbkNsYXNzTmFtZUZvclRpbWVsaW5lKHRpbWVsaW5lKTsKICAgICAgICAg bGV0IHBhdGhDb21wb25lbnQgPSBuZXcgV2ViSW5zcGVjdG9yLkhpZXJhcmNoaWNhbFBhdGhDb21w b25lbnQoZGlzcGxheU5hbWUsIGljb25DbGFzc05hbWUsIHRpbWVsaW5lKTsKICAgICAgICAgcGF0 aENvbXBvbmVudC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5IaWVyYXJjaGljYWxQYXRo Q29tcG9uZW50LkV2ZW50LlNpYmxpbmdXYXNTZWxlY3RlZCwgdGhpcy5fcGF0aENvbXBvbmVudFNl bGVjdGVkLCB0aGlzKTsKICAgICAgICAgdGhpcy5fcGF0aENvbXBvbmVudE1hcC5zZXQodGltZWxp bmUsIHBhdGhDb21wb25lbnQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVTaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQYW5lbC5qcwppbmRl eCA3MTU5OTNkZWU5YTQwZjgwOTcyNzc3NTFhMjM1MWEwYTkyZmU2ZDFmLi4xYmYzZDdjMzQ0ZDgz ZDZlYjIzMmRhNWM5YTkyYjcwMDdiYTY1MGM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQYW5lbC5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQ YW5lbC5qcwpAQCAtMTgyLDQwICsxODIsNiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFy UGFuZWwgPSBjbGFzcyBUaW1lbGluZVNpZGViYXJQYW5lbCBleHRlbmRzIFdlYkluc3BlYwogICAg ICAgICB0aGlzLl90b2dnbGVOZXdSZWNvcmRpbmdTaG9ydGN1dC5kaXNhYmxlZCA9IHRydWU7CiAg ICAgfQogCi0gICAgLy8gU3RhdGljCi0KLSAgICBzdGF0aWMgZGlzcGxheU5hbWVGb3JUaW1lbGlu ZSh0aW1lbGluZSkKLSAgICB7Ci0gICAgICAgIHN3aXRjaCAodGltZWxpbmUudHlwZSkgewotICAg ICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLk5ldHdvcms6Ci0gICAg ICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJOZXR3b3JrIFJlcXVlc3RzIik7 Ci0gICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUuTGF5b3V0Ogot ICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5VSVN0cmluZygiTGF5b3V0ICYgUmVuZGVy aW5nIik7Ci0gICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUuU2Ny aXB0OgotICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5VSVN0cmluZygiSmF2YVNjcmlw dCAmIEV2ZW50cyIpOwotICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5U eXBlLlJlbmRlcmluZ0ZyYW1lOgotICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5VSVN0 cmluZygiUmVuZGVyaW5nIEZyYW1lcyIpOwotICAgICAgICB9Ci0KLSAgICAgICAgY29uc29sZS5l cnJvcigiVW5rbm93biBUaW1lbGluZSB0eXBlOiIsIHRpbWVsaW5lLnR5cGUpOwotICAgIH0KLQot ICAgIHN0YXRpYyBpY29uQ2xhc3NOYW1lRm9yVGltZWxpbmUodGltZWxpbmUpCi0gICAgewotICAg ICAgICBzd2l0Y2ggKHRpbWVsaW5lLnR5cGUpIHsKLSAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3Iu VGltZWxpbmVSZWNvcmQuVHlwZS5OZXR3b3JrOgotICAgICAgICAgICAgcmV0dXJuICJuZXR3b3Jr LWljb24iOwotICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLkxh eW91dDoKLSAgICAgICAgICAgIHJldHVybiAiY29sb3JzLWljb24iOwotICAgICAgICBjYXNlIFdl Ykluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLlNjcmlwdDoKLSAgICAgICAgICAgIHJldHVy biAic2NyaXB0LWljb24iOwotICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29y ZC5UeXBlLlJlbmRlcmluZ0ZyYW1lOgotICAgICAgICAgICAgcmV0dXJuICJyZW5kZXJpbmctZnJh bWUtaWNvbiI7Ci0gICAgICAgIH0KLQotICAgICAgICBjb25zb2xlLmVycm9yKCJVbmtub3duIFRp bWVsaW5lIHR5cGU6IiwgdGltZWxpbmUudHlwZSk7Ci0gICAgfQotCiAgICAgLy8gUHVibGljCiAK ICAgICBnZXQgbWluaW11bVdpZHRoKCkKQEAgLTc4OCw4ICs3NTQsOCBAQCBXZWJJbnNwZWN0b3Iu VGltZWxpbmVTaWRlYmFyUGFuZWwgPSBjbGFzcyBUaW1lbGluZVNpZGViYXJQYW5lbCBleHRlbmRz IFdlYkluc3BlYwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgbGV0 IGRpc3BsYXlOYW1lID0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsLmRpc3BsYXlO YW1lRm9yVGltZWxpbmUodGltZWxpbmUpOwotICAgICAgICBsZXQgaWNvbkNsYXNzTmFtZSA9IFdl Ykluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbC5pY29uQ2xhc3NOYW1lRm9yVGltZWxpbmUo dGltZWxpbmUpOworICAgICAgICBsZXQgZGlzcGxheU5hbWUgPSBXZWJJbnNwZWN0b3IuVGltZWxp bmVUYWJDb250ZW50Vmlldy5kaXNwbGF5TmFtZUZvclRpbWVsaW5lKHRpbWVsaW5lKTsKKyAgICAg ICAgbGV0IGljb25DbGFzc05hbWUgPSBXZWJJbnNwZWN0b3IuVGltZWxpbmVUYWJDb250ZW50Vmll dy5pY29uQ2xhc3NOYW1lRm9yVGltZWxpbmUodGltZWxpbmUpOwogICAgICAgICBsZXQgdGltZWxp bmVUcmVlRWxlbWVudCA9IG5ldyBXZWJJbnNwZWN0b3IuR2VuZXJhbFRyZWVFbGVtZW50KFtpY29u Q2xhc3NOYW1lLCBXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwuTGFyZ2VJY29uU3R5 bGVDbGFzc10sIGRpc3BsYXlOYW1lLCBudWxsLCB0aW1lbGluZSk7CiAgICAgICAgIGxldCB0b29s dGlwID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDbG9zZSAlcyB0aW1lbGluZSB2aWV3IikuZm9y bWF0KGRpc3BsYXlOYW1lKTsKICAgICAgICAgbGV0IGJ1dHRvbiA9IG5ldyBXZWJJbnNwZWN0b3Iu VHJlZUVsZW1lbnRTdGF0dXNCdXR0b24odXNlU1ZHU3ltYm9sKCJJbWFnZXMvQ2xvc2VMYXJnZS5z dmciLCAiY2xvc2UtYnV0dG9uIiwgdG9vbHRpcCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVUYWJDb250ZW50Vmlldy5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lVGFiQ29u dGVudFZpZXcuanMKaW5kZXggYmM2Mjc4ZGU0ZDk5NmJhZDQwN2MxMjU2MTY3YjM4MjU1MTJiN2E1 ZC4uMmFlZjQ1NGY2YTU3YjQ3NWE2ZmZlMjNmMGVmMTkzNjk3MzdmMmY2NyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVUYWJDb250 ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9UaW1lbGluZVRhYkNvbnRlbnRWaWV3LmpzCkBAIC0zNCw2ICszNCw4IEBAIFdlYkluc3BlY3Rv ci5UaW1lbGluZVRhYkNvbnRlbnRWaWV3ID0gY2xhc3MgVGltZWxpbmVUYWJDb250ZW50VmlldyBl eHRlbmRzIFdlYkluCiAgICAgICAgIHN1cGVyKGlkZW50aWZpZXIgfHwgInRpbWVsaW5lIiwgInRp bWVsaW5lIiwgdGFiQmFySXRlbSwgV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsLCBk ZXRhaWxzU2lkZWJhclBhbmVscyk7CiAgICAgfQogCisgICAgLy8gU3RhdGljCisKICAgICBzdGF0 aWMgdGFiSW5mbygpCiAgICAgewogICAgICAgICByZXR1cm4gewpAQCAtNDcsNiArNDksMTIyIEBA IFdlYkluc3BlY3Rvci5UaW1lbGluZVRhYkNvbnRlbnRWaWV3ID0gY2xhc3MgVGltZWxpbmVUYWJD b250ZW50VmlldyBleHRlbmRzIFdlYkluCiAgICAgICAgIHJldHVybiAhIXdpbmRvdy5UaW1lbGlu ZUFnZW50IHx8ICEhd2luZG93LlNjcmlwdFByb2ZpbGVyQWdlbnQ7CiAgICAgfQogCisgICAgc3Rh dGljIGRpc3BsYXlOYW1lRm9yVGltZWxpbmUodGltZWxpbmUpCisgICAgeworICAgICAgICBzd2l0 Y2ggKHRpbWVsaW5lLnR5cGUpIHsKKyAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVS ZWNvcmQuVHlwZS5OZXR3b3JrOgorICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5VSVN0 cmluZygiTmV0d29yayBSZXF1ZXN0cyIpOworICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1l bGluZVJlY29yZC5UeXBlLkxheW91dDoKKyAgICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIkxheW91dCAmIFJlbmRlcmluZyIpOworICAgICAgICBjYXNlIFdlYkluc3BlY3Rv ci5UaW1lbGluZVJlY29yZC5UeXBlLlNjcmlwdDoKKyAgICAgICAgICAgIHJldHVybiBXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoIkphdmFTY3JpcHQgJiBFdmVudHMiKTsKKyAgICAgICAgY2FzZSBXZWJJ bnNwZWN0b3IuVGltZWxpbmVSZWNvcmQuVHlwZS5SZW5kZXJpbmdGcmFtZToKKyAgICAgICAgICAg IHJldHVybiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJlbmRlcmluZyBGcmFtZXMiKTsKKyAgICAg ICAgZGVmYXVsdDoKKyAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoIlVua25vd24gVGltZWxpbmUg dHlwZToiLCB0aW1lbGluZS50eXBlKTsKKyAgICAgICAgfQorCisgICAgICAgIHJldHVybiBudWxs OworICAgIH0KKworICAgIHN0YXRpYyBpY29uQ2xhc3NOYW1lRm9yVGltZWxpbmUodGltZWxpbmUp CisgICAgeworICAgICAgICBzd2l0Y2ggKHRpbWVsaW5lLnR5cGUpIHsKKyAgICAgICAgY2FzZSBX ZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmQuVHlwZS5OZXR3b3JrOgorICAgICAgICAgICAgcmV0 dXJuICJuZXR3b3JrLWljb24iOworICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZVJl Y29yZC5UeXBlLkxheW91dDoKKyAgICAgICAgICAgIHJldHVybiAiY29sb3JzLWljb24iOworICAg ICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLlNjcmlwdDoKKyAgICAg ICAgICAgIHJldHVybiAic2NyaXB0LWljb24iOworICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5U aW1lbGluZVJlY29yZC5UeXBlLlJlbmRlcmluZ0ZyYW1lOgorICAgICAgICAgICAgcmV0dXJuICJy ZW5kZXJpbmctZnJhbWUtaWNvbiI7CisgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICBjb25z b2xlLmVycm9yKCJVbmtub3duIFRpbWVsaW5lIHR5cGU6IiwgdGltZWxpbmUudHlwZSk7CisgICAg ICAgIH0KKworICAgICAgICByZXR1cm4gbnVsbDsKKyAgICB9CisKKyAgICBzdGF0aWMgaWNvbkNs YXNzTmFtZUZvclJlY29yZCh0aW1lbGluZVJlY29yZCkKKyAgICB7CisgICAgICAgIHN3aXRjaCAo dGltZWxpbmVSZWNvcmQudHlwZSkgeworICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGlu ZVJlY29yZC5UeXBlLkxheW91dDoKKyAgICAgICAgICAgIHN3aXRjaCAodGltZWxpbmVSZWNvcmQu ZXZlbnRUeXBlKSB7CisgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGlu ZVJlY29yZC5FdmVudFR5cGUuSW52YWxpZGF0ZVN0eWxlczoKKyAgICAgICAgICAgIGNhc2UgV2Vi SW5zcGVjdG9yLkxheW91dFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5SZWNhbGN1bGF0ZVN0eWxl czoKKyAgICAgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkVHJl ZUVsZW1lbnQuU3R5bGVSZWNvcmRJY29uU3R5bGVDbGFzczsKKyAgICAgICAgICAgIGNhc2UgV2Vi SW5zcGVjdG9yLkxheW91dFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5JbnZhbGlkYXRlTGF5b3V0 OgorICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVSZWNvcmQuRXZl bnRUeXBlLkZvcmNlZExheW91dDoKKyAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLkxheW91 dFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5MYXlvdXQ6CisgICAgICAgICAgICAgICAgcmV0dXJu IFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZFRyZWVFbGVtZW50LkxheW91dFJlY29yZEljb25T dHlsZUNsYXNzOworICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVS ZWNvcmQuRXZlbnRUeXBlLlBhaW50OgorICAgICAgICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0 b3IuVGltZWxpbmVSZWNvcmRUcmVlRWxlbWVudC5QYWludFJlY29yZEljb25TdHlsZUNsYXNzOwor ICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVSZWNvcmQuRXZlbnRU eXBlLkNvbXBvc2l0ZToKKyAgICAgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlRpbWVs aW5lUmVjb3JkVHJlZUVsZW1lbnQuQ29tcG9zaXRlUmVjb3JkSWNvblN0eWxlQ2xhc3M7CisgICAg ICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoIlVua25vd24g TGF5b3V0VGltZWxpbmVSZWNvcmQgZXZlbnRUeXBlOiAiICsgdGltZWxpbmVSZWNvcmQuZXZlbnRU eXBlLCB0aW1lbGluZVJlY29yZCk7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGJyZWFr OworCisgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUuU2NyaXB0 OgorICAgICAgICAgICAgc3dpdGNoICh0aW1lbGluZVJlY29yZC5ldmVudFR5cGUpIHsKKyAgICAg ICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5B UElTY3JpcHRFdmFsdWF0ZWQ6CisgICAgICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5U aW1lbGluZVJlY29yZFRyZWVFbGVtZW50LkFQSVJlY29yZEljb25TdHlsZUNsYXNzOworICAgICAg ICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVSZWNvcmQuRXZlbnRUeXBlLlNj cmlwdEV2YWx1YXRlZDoKKyAgICAgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlRpbWVs aW5lUmVjb3JkVHJlZUVsZW1lbnQuRXZhbHVhdGVkUmVjb3JkSWNvblN0eWxlQ2xhc3M7CisgICAg ICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVJlY29yZC5FdmVudFR5cGUu TWljcm90YXNrRGlzcGF0Y2hlZDoKKyAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlNjcmlw dFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5FdmVudERpc3BhdGNoZWQ6CisgICAgICAgICAgICAg ICAgcmV0dXJuIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZFRyZWVFbGVtZW50LkV2ZW50UmVj b3JkSWNvblN0eWxlQ2xhc3M7CisgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5TY3JpcHRU aW1lbGluZVJlY29yZC5FdmVudFR5cGUuUHJvYmVTYW1wbGVSZWNvcmRlZDoKKyAgICAgICAgICAg ICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkVHJlZUVsZW1lbnQuUHJvYmVS ZWNvcmRJY29uU3R5bGVDbGFzczsKKyAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlNjcmlw dFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5Db25zb2xlUHJvZmlsZVJlY29yZGVkOgorICAgICAg ICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRUcmVlRWxlbWVudC5D b25zb2xlUHJvZmlsZUljb25TdHlsZUNsYXNzOworICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0 b3IuU2NyaXB0VGltZWxpbmVSZWNvcmQuRXZlbnRUeXBlLkdhcmJhZ2VDb2xsZWN0ZWQ6CisgICAg ICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZFRyZWVFbGVtZW50 LkdhcmJhZ2VDb2xsZWN0aW9uSWNvblN0eWxlQ2xhc3M7CisgICAgICAgICAgICBjYXNlIFdlYklu c3BlY3Rvci5TY3JpcHRUaW1lbGluZVJlY29yZC5FdmVudFR5cGUuVGltZXJJbnN0YWxsZWQ6Cisg ICAgICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZFRyZWVFbGVt ZW50LlRpbWVyUmVjb3JkSWNvblN0eWxlQ2xhc3M7CisgICAgICAgICAgICBjYXNlIFdlYkluc3Bl Y3Rvci5TY3JpcHRUaW1lbGluZVJlY29yZC5FdmVudFR5cGUuVGltZXJGaXJlZDoKKyAgICAgICAg ICAgIGNhc2UgV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5UaW1l clJlbW92ZWQ6CisgICAgICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5UaW1lbGluZVJl Y29yZFRyZWVFbGVtZW50LlRpbWVyUmVjb3JkSWNvblN0eWxlQ2xhc3M7CisgICAgICAgICAgICBj YXNlIFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVJlY29yZC5FdmVudFR5cGUuQW5pbWF0aW9u RnJhbWVGaXJlZDoKKyAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5l UmVjb3JkLkV2ZW50VHlwZS5BbmltYXRpb25GcmFtZVJlcXVlc3RlZDoKKyAgICAgICAgICAgIGNh c2UgV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5BbmltYXRpb25G cmFtZUNhbmNlbGVkOgorICAgICAgICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuVGltZWxp bmVSZWNvcmRUcmVlRWxlbWVudC5BbmltYXRpb25SZWNvcmRJY29uU3R5bGVDbGFzczsKKyAgICAg ICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICAgICAgY29uc29sZS5lcnJvcigiVW5rbm93biBT Y3JpcHRUaW1lbGluZVJlY29yZCBldmVudFR5cGU6ICIgKyB0aW1lbGluZVJlY29yZC5ldmVudFR5 cGUsIHRpbWVsaW5lUmVjb3JkKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgYnJlYWs7 CisKKyAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmQuVHlwZS5SZW5kZXJp bmdGcmFtZToKKyAgICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRU cmVlRWxlbWVudC5SZW5kZXJpbmdGcmFtZVJlY29yZEljb25TdHlsZUNsYXNzOworCisgICAgICAg IGRlZmF1bHQ6CisgICAgICAgICAgICBjb25zb2xlLmVycm9yKCJVbmtub3duIFRpbWVsaW5lUmVj b3JkIHR5cGU6ICIgKyB0aW1lbGluZVJlY29yZC50eXBlLCB0aW1lbGluZVJlY29yZCk7CisgICAg ICAgIH0KKworICAgICAgICByZXR1cm4gbnVsbDsKKyAgICB9CisKKyAgICBzdGF0aWMgZGlzcGxh eU5hbWVGb3JSZWNvcmQodGltZWxpbmVSZWNvcmQsIGluY2x1ZGVEZXRhaWxzSW5NYWluVGl0bGUp CisgICAgeworICAgICAgICBzd2l0Y2ggKHRpbWVsaW5lUmVjb3JkLnR5cGUpIHsKKyAgICAgICAg Y2FzZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmQuVHlwZS5OZXR3b3JrOgorICAgICAgICAg ICAgcmV0dXJuIFdlYkluc3BlY3Rvci5kaXNwbGF5TmFtZUZvclVSTCh0aW1lbGluZVJlY29yZC5y ZXNvdXJjZS51cmwsIHRpbWVsaW5lUmVjb3JkLnJlc291cmNlLnVybENvbXBvbmVudHMpOworICAg ICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLkxheW91dDoKKyAgICAg ICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVSZWNvcmQuZGlzcGxheU5h bWVGb3JFdmVudFR5cGUodGltZWxpbmVSZWNvcmQuZXZlbnRUeXBlKTsKKyAgICAgICAgY2FzZSBX ZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmQuVHlwZS5TY3JpcHQ6CisgICAgICAgICAgICByZXR1 cm4gV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5kaXNwbGF5TmFt ZSh0aW1lbGluZVJlY29yZC5ldmVudFR5cGUsIHRpbWVsaW5lUmVjb3JkLmRldGFpbHMsIGluY2x1 ZGVEZXRhaWxzSW5NYWluVGl0bGUpOworICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGlu ZVJlY29yZC5UeXBlLlJlbmRlcmluZ0ZyYW1lOgorICAgICAgICAgICAgcmV0dXJuIFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiRnJhbWUgJWQiKS5mb3JtYXQodGltZWxpbmVSZWNvcmQuZnJhbWVOdW1i ZXIpOworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgY29uc29sZS5lcnJvcigiVW5rbm93 biBUaW1lbGluZVJlY29yZCB0eXBlOiAiICsgdGltZWxpbmVSZWNvcmQudHlwZSwgdGltZWxpbmVS ZWNvcmQpOworICAgICAgICB9CisKKyAgICAgICAgcmV0dXJuIG51bGw7CisgICAgfQorCiAgICAg Ly8gUHVibGljCiAKICAgICBnZXQgdHlwZSgpCg==