156965 2016-04-24 17:54:35 -0700 Web Inspector: Can't sort by name/source code location columns in Timeline data grids 2016-04-24 20:08:59 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 mattbaker mattbaker bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1186806 0 mattbaker 2016-04-24 17:54:35 -0700 * SUMMARY Can't sort by name/source code location columns in Timeline data grids. In the network and script (details) data grids, these columns contain document fragments and can't be sorted. For "location" to work, TimelineDataGrid's sort comparer just needs a special case for SourceCodeLocation values. For the name column which can contain main title and subtitle text, add a delegate to TimelineDataGrid so that view's can override the sort comparer per-column, as needed. 1186807 1 webkit-bug-importer 2016-04-24 17:54:57 -0700 <rdar://problem/25898716> 1186812 2 277207 mattbaker 2016-04-24 18:05:08 -0700 Created attachment 277207 [Patch] Proposed Fix 1186818 3 277207 timothy 2016-04-24 18:39:25 -0700 Comment on attachment 277207 [Patch] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=277207&action=review > Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js:-304 > - let currentDataGridNode = this.children[0]; The children array here was not the DOM, it is DataGridNodes. You should revert this. 1186821 4 277211 mattbaker 2016-04-24 19:01:45 -0700 Created attachment 277211 [Patch] Proposed Fix 1186829 5 277211 commit-queue 2016-04-24 20:08:55 -0700 Comment on attachment 277211 [Patch] Proposed Fix Clearing flags on attachment: 277211 Committed r199974: <http://trac.webkit.org/changeset/199974> 1186830 6 commit-queue 2016-04-24 20:08:59 -0700 All reviewed patches have been landed. Closing bug. 277207 2016-04-24 18:05:08 -0700 2016-04-24 19:01:41 -0700 [Patch] Proposed Fix bug-156965-20160424180535.patch text/plain 12091 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5OTcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBj YjQyMjFjMDg5NWY5MGM2YThmNjFkYTRhYjhhYmQxY2NmMTE4ZTcxLi5jZTE2M2RkODQ0MjM2Mjgx OWUxOTAyN2QzNGRlODQzOGI5ZmJlZjBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSw0NSBAQAogMjAxNi0wNC0yNCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQ2FuJ3Qgc29ydCBieSBuYW1lL3NvdXJjZSBjb2Rl IGxvY2F0aW9uIGNvbHVtbnMgaW4gVGltZWxpbmUgZGF0YSBncmlkcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU2OTY1CisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS8yNTg5ODcxNj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBBZGQgc3VwcG9ydCBmb3Igc29ydGluZyBTb3VyY2VDb2RlTG9jYXRpb24gb2Jq ZWN0cyB0byBUaW1lbGluZURhdGFHcmlkLAorICAgICAgICBhbmQgaW5jbHVkZSBhIGdyaWQgZGVs ZWdhdGUgc28gdGhhdCB2aWV3cyBjYW4gZXh0ZW5kIHNvcnRpbmcgbG9naWMgZm9yCisgICAgICAg IG90aGVyIGRvY3VtZW50IGZyYWdtZW50IGNvbHVtbnMuCisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL05ldHdvcmtUaW1lbGluZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu TmV0d29ya1RpbWVsaW5lVmlldyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya1RpbWVs aW5lVmlldy5wcm90b3R5cGUuZGF0YUdyaWRTb3J0Q29tcGFyYXRvcik6CisgICAgICAgIFNvcnQg Im5hbWUiIGNvbHVtbiBieSBkaXNwbGF5IG5hbWUgZmlyc3QsIHRoZW4gcmVzb3VyY2UgVVJMLgor CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHREZXRhaWxzVGltZWxpbmVWaWV3 LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdERldGFpbHNUaW1lbGluZVZpZXcpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdERldGFpbHNUaW1lbGluZVZpZXcucHJvdG90eXBl LmRhdGFHcmlkU29ydENvbXBhcmF0b3IpOgorICAgICAgICBTb3J0ICJuYW1lIiBjb2x1bW4gYnkg ZGlzcGxheSBuYW1lIGZpcnN0LCB0aGVuIHN1YnRpdGxlLgorCisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9TY3JpcHRUaW1lbGluZURhdGFHcmlkTm9kZS5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5TY3JpcHRUaW1lbGluZURhdGFHcmlkTm9kZS5wcm90b3R5cGUuZ2V0IHN1YnRpdGxl KToKKyAgICAgICAgTWFrZSBzdWJ0aXRsZSBhY2Nlc3NpYmxlIGV4dGVybmFsbHkgZm9yIHNvcnRp bmcuCisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVEYXRhR3JpZE5vZGUucHJv dG90eXBlLl9jcmVhdGVOYW1lQ2VsbERvY3VtZW50RnJhZ21lbnQpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlNjcmlwdFRpbWVsaW5lRGF0YUdyaWROb2RlKToKKworICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvVGltZWxpbmVEYXRhR3JpZC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5U aW1lbGluZURhdGFHcmlkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlk LnByb3RvdHlwZS5nZXQgc29ydERlbGVnYXRlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1l bGluZURhdGFHcmlkLnByb3RvdHlwZS5zZXQgc29ydERlbGVnYXRlKToKKyAgICAgICAgRmlyZSBh IFNvcnRDaGFuZ2VkIGV2ZW50IGlmIHRoZSBkZWxlZ2F0ZSBjaGFuZ2VkIGFuZCB0aGUgZ3JpZCBp cyBzb3J0ZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVEYXRhR3JpZC5wcm90b3R5 cGUuX3NvcnQpOgorICAgICAgICBPcGVyYXRlIG9uIHZpcnR1YWwgcm93cywgaW5zdGVhZCBvZiBq dXN0IHJvd3MgaW4gdGhlIERPTS4gSWYgYSBzb3J0CisgICAgICAgIGRlbGVnYXRlIGV4aXN0cywg YW5kIGl0IHJldHVybnMgYSBudW1lcmljIHZhbHVlLCBza2lwIHRoZSBkZWZhdWx0IGNvbXBhcmUu CisKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkLnByb3RvdHlwZS5fc29y dENvbXBhcmF0b3IpOgorICAgICAgICBBZGQgc3VwcG9ydCBmb3Igc29ydGluZyBTb3VyY2VDb2Rl TG9jYXRpb24gY29sdW1ucy4KKworMjAxNi0wNC0yNCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBh cHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogRXJyb3Igd2hlbiBzZWxlY3Rpbmcg YSBiYXIgaW4gdGhlIEZyYW1lcyB0aW1lbGluZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU2OTYwCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yNTg5 Nzk1NT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL05ldHdvcmtUaW1lbGluZVZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9OZXR3b3JrVGltZWxpbmVWaWV3LmpzCmluZGV4IDdjNjFiM2M1MWFjMzVm MGZiOTNkZGFmNTgyODhmYjI4YjQxMTJiOWUuLmRlMmZlYzkwZmY2MGUxNzE1OWY5MTM3ZjA2MjFm ZTBhZDZlOTI5ZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL05ldHdvcmtUaW1lbGluZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RpbWVsaW5lVmlldy5qcwpAQCAtOTAsNiAr OTAsNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1RpbWVsaW5lVmlldyA9IGNsYXNzIE5ldHdvcmtU aW1lbGluZVZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0bwogICAgICAgICB0aGlzLl9kYXRhR3JpZCA9 IG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmVEYXRhR3JpZChjb2x1bW5zKTsKICAgICAgICAgdGhp cy5fZGF0YUdyaWQuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGltZWxpbmVEYXRhR3Jp ZC5FdmVudC5GaWx0ZXJzRGlkQ2hhbmdlLCB0aGlzLl9kYXRhR3JpZEZpbHRlcnNEaWRDaGFuZ2Us IHRoaXMpOwogICAgICAgICB0aGlzLl9kYXRhR3JpZC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3Bl Y3Rvci5EYXRhR3JpZC5FdmVudC5TZWxlY3RlZE5vZGVDaGFuZ2VkLCB0aGlzLl9kYXRhR3JpZE5v ZGVTZWxlY3RlZCwgdGhpcyk7CisgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnREZWxlZ2F0ZSA9 IHRoaXM7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRDb2x1bW5JZGVudGlmaWVyU2V0dGlu ZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZygibmV0d29yay10aW1lbGluZS12aWV3LXNvcnQi LCAicmVxdWVzdFNlbnQiKTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydE9yZGVyU2V0dGlu ZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZygibmV0d29yay10aW1lbGluZS12aWV3LXNvcnQt b3JkZXIiLCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkFzY2VuZGluZyk7CiAKQEAg LTE1Miw2ICsxNTMsMjIgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtUaW1lbGluZVZpZXcgPSBjbGFz cyBOZXR3b3JrVGltZWxpbmVWaWV3IGV4dGVuZHMgV2ViSW5zcGVjdG8KICAgICAgICAgdGhpcy5f cGVuZGluZ1JlY29yZHMgPSBbXTsKICAgICB9CiAKKyAgICAvLyBUaW1lbGluZURhdGFHcmlkIHNv cnQgZGVsZWdhdGUKKworICAgIGRhdGFHcmlkU29ydENvbXBhcmF0b3Ioc29ydENvbHVtbklkZW50 aWZpZXIsIHNvcnREaXJlY3Rpb24sIG5vZGUxLCBub2RlMikKKyAgICB7CisgICAgICAgIGlmIChz b3J0Q29sdW1uSWRlbnRpZmllciA9PT0gIm5hbWUiKSB7CisgICAgICAgICAgICBsZXQgZGlzcGxh eU5hbWUxID0gbm9kZTEuZGlzcGxheU5hbWUoKTsKKyAgICAgICAgICAgIGxldCBkaXNwbGF5TmFt ZTIgPSBub2RlMi5kaXNwbGF5TmFtZSgpOworICAgICAgICAgICAgaWYgKGRpc3BsYXlOYW1lMSAh PT0gZGlzcGxheU5hbWUyKQorICAgICAgICAgICAgICAgIHJldHVybiBkaXNwbGF5TmFtZTEubG9j YWxlQ29tcGFyZShkaXNwbGF5TmFtZTIpICogc29ydERpcmVjdGlvbjsKKworICAgICAgICAgICAg cmV0dXJuIG5vZGUxLnJlc291cmNlLnVybC5sb2NhbGVDb21wYXJlKG5vZGUyLnJlc291cmNlLnVy bCkgKiBzb3J0RGlyZWN0aW9uOworICAgICAgICB9CisKKyAgICAgICAgcmV0dXJuIG51bGw7Cisg ICAgfQorCiAgICAgLy8gUHJvdGVjdGVkCiAKICAgICBjYW5TaG93Q29udGVudFZpZXdGb3JUcmVl RWxlbWVudCh0cmVlRWxlbWVudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdERldGFpbHNUaW1lbGluZVZpZXcuanMgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHREZXRhaWxzVGltZWxpbmVW aWV3LmpzCmluZGV4IGUwMTA2Y2QxNjU0MTM4MWZhMGY5ZGMzNWU0MzA1ODBiNDk3ZWVhMGEuLmMz OGE1YjJlNzY2NjBjZTU1ZjQyZTZhZTM4Njc3NDBlMTRmYmQ2MDMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdERldGFpbHNUaW1lbGlu ZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv U2NyaXB0RGV0YWlsc1RpbWVsaW5lVmlldy5qcwpAQCAtNzQsNiArNzQsNyBAQCBXZWJJbnNwZWN0 b3IuU2NyaXB0RGV0YWlsc1RpbWVsaW5lVmlldyA9IGNsYXNzIFNjcmlwdERldGFpbHNUaW1lbGlu ZVZpZXcgZXh0ZW5kcwogICAgICAgICB0aGlzLl9kYXRhR3JpZCA9IG5ldyBXZWJJbnNwZWN0b3Iu U2NyaXB0VGltZWxpbmVEYXRhR3JpZChjb2x1bW5zKTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQu YWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGltZWxpbmVEYXRhR3JpZC5FdmVudC5GaWx0 ZXJzRGlkQ2hhbmdlLCB0aGlzLl9kYXRhR3JpZEZpbHRlcnNEaWRDaGFuZ2UsIHRoaXMpOwogICAg ICAgICB0aGlzLl9kYXRhR3JpZC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EYXRhR3Jp ZC5FdmVudC5TZWxlY3RlZE5vZGVDaGFuZ2VkLCB0aGlzLl9kYXRhR3JpZE5vZGVTZWxlY3RlZCwg dGhpcyk7CisgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnREZWxlZ2F0ZSA9IHRoaXM7CiAgICAg ICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRDb2x1bW5JZGVudGlmaWVyU2V0dGluZyA9IG5ldyBXZWJJ bnNwZWN0b3IuU2V0dGluZygic2NyaXB0LXRpbWVsaW5lLXZpZXctc29ydCIsICJzdGFydFRpbWUi KTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydE9yZGVyU2V0dGluZyA9IG5ldyBXZWJJbnNw ZWN0b3IuU2V0dGluZygic2NyaXB0LXRpbWVsaW5lLXZpZXctc29ydC1vcmRlciIsIFdlYkluc3Bl Y3Rvci5EYXRhR3JpZC5Tb3J0T3JkZXIuQXNjZW5kaW5nKTsKIApAQCAtMTQ1LDYgKzE0NiwyMiBA QCBXZWJJbnNwZWN0b3IuU2NyaXB0RGV0YWlsc1RpbWVsaW5lVmlldyA9IGNsYXNzIFNjcmlwdERl dGFpbHNUaW1lbGluZVZpZXcgZXh0ZW5kcwogICAgICAgICB0aGlzLl9wZW5kaW5nUmVjb3JkcyA9 IFtdOwogICAgIH0KIAorICAgIC8vIFRpbWVsaW5lRGF0YUdyaWQgc29ydCBkZWxlZ2F0ZQorCisg ICAgZGF0YUdyaWRTb3J0Q29tcGFyYXRvcihzb3J0Q29sdW1uSWRlbnRpZmllciwgc29ydERpcmVj dGlvbiwgbm9kZTEsIG5vZGUyKQorICAgIHsKKyAgICAgICAgaWYgKHNvcnRDb2x1bW5JZGVudGlm aWVyID09PSAibmFtZSIpIHsKKyAgICAgICAgICAgIGxldCBkaXNwbGF5TmFtZTEgPSBub2RlMS5k aXNwbGF5TmFtZSgpOworICAgICAgICAgICAgbGV0IGRpc3BsYXlOYW1lMiA9IG5vZGUyLmRpc3Bs YXlOYW1lKCk7CisgICAgICAgICAgICBpZiAoZGlzcGxheU5hbWUxICE9PSBkaXNwbGF5TmFtZTIp CisgICAgICAgICAgICAgICAgcmV0dXJuIGRpc3BsYXlOYW1lMS5sb2NhbGVDb21wYXJlKGRpc3Bs YXlOYW1lMikgKiBzb3J0RGlyZWN0aW9uOworCisgICAgICAgICAgICByZXR1cm4gbm9kZTEuc3Vi dGl0bGUubG9jYWxlQ29tcGFyZShub2RlMi5zdWJ0aXRsZSkgKiBzb3J0RGlyZWN0aW9uOworICAg ICAgICB9CisKKyAgICAgICAgcmV0dXJuIG51bGw7CisgICAgfQorCiAgICAgLy8gUHJvdGVjdGVk CiAKICAgICBkYXRhR3JpZE5vZGVQYXRoQ29tcG9uZW50U2VsZWN0ZWQoZXZlbnQpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHRUaW1l bGluZURhdGFHcmlkTm9kZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1NjcmlwdFRpbWVsaW5lRGF0YUdyaWROb2RlLmpzCmluZGV4IDFjMTAwMzc0Yjk0YWUx YWQ3ZDhkZGFiN2U3OWJjMTVjN2E0YzBiNTYuLjNmYjQ4NGViNWJiMmE0YjVlNGI2NDBiMDc3NDFi NDkzODE1MGM3ZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1NjcmlwdFRpbWVsaW5lRGF0YUdyaWROb2RlLmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRpbWVsaW5lRGF0YUdyaWROb2Rl LmpzCkBAIC04Nyw2ICs4NywyNCBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVEYXRhR3Jp ZE5vZGUgPSBjbGFzcyBTY3JpcHRUaW1lbGluZURhdGFHcmlkTm9kZSBleHRlbgogICAgICAgICBy ZXR1cm4gdGhpcy5fY2FjaGVkRGF0YTsKICAgICB9CiAKKyAgICBnZXQgc3VidGl0bGUoKQorICAg IHsKKyAgICAgICAgaWYgKHRoaXMuX3N1YnRpdGxlICE9PSB1bmRlZmluZWQpCisgICAgICAgICAg ICByZXR1cm4gdGhpcy5fc3VidGl0bGU7CisKKyAgICAgICAgdGhpcy5fc3VidGl0bGUgPSAiIjsK KworICAgICAgICBpZiAodGhpcy5fcmVjb3JkLmV2ZW50VHlwZSA9PT0gV2ViSW5zcGVjdG9yLlNj cmlwdFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5UaW1lckluc3RhbGxlZCkgeworICAgICAgICAg ICAgbGV0IHRpbWVvdXRTdHJpbmcgPSBOdW1iZXIuc2Vjb25kc1RvU3RyaW5nKHRoaXMuX3JlY29y ZC5kZXRhaWxzLnRpbWVvdXQgLyAxMDAwKTsKKyAgICAgICAgICAgIGlmICh0aGlzLl9yZWNvcmQu ZGV0YWlscy5yZXBlYXRpbmcpCisgICAgICAgICAgICAgICAgdGhpcy5fc3VidGl0bGUgPSBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIiVzIGludGVydmFsIikuZm9ybWF0KHRpbWVvdXRTdHJpbmcpOwor ICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIHRoaXMuX3N1YnRpdGxlID0gV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCIlcyBkZWxheSIpLmZvcm1hdCh0aW1lb3V0U3RyaW5nKTsKKyAgICAg ICAgfQorCisgICAgICAgIHJldHVybiB0aGlzLl9zdWJ0aXRsZTsKKyAgICB9CisKICAgICB1cGRh dGVSYW5nZVRpbWVzKHN0YXJ0VGltZSwgZW5kVGltZSkKICAgICB7CiAgICAgICAgIHZhciBvbGRS YW5nZVN0YXJ0VGltZSA9IHRoaXMuX3JhbmdlU3RhcnRUaW1lOwpAQCAtMTQ1LDE2ICsxNjMsMTEg QEAgV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lRGF0YUdyaWROb2RlID0gY2xhc3MgU2NyaXB0 VGltZWxpbmVEYXRhR3JpZE5vZGUgZXh0ZW4KICAgICAgICAgbGV0IGZyYWdtZW50ID0gZG9jdW1l bnQuY3JlYXRlRG9jdW1lbnRGcmFnbWVudCgpOwogICAgICAgICBmcmFnbWVudC5hcHBlbmQodGhp cy5kaXNwbGF5TmFtZSgpKTsKIAotICAgICAgICBpZiAodGhpcy5fcmVjb3JkLmV2ZW50VHlwZSA9 PT0gV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5UaW1lckluc3Rh bGxlZCkgeworICAgICAgICBpZiAodGhpcy5zdWJ0aXRsZSkgewogICAgICAgICAgICAgbGV0IHN1 YnRpdGxlRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKICAgICAgICAg ICAgIHN1YnRpdGxlRWxlbWVudC5jbGFzc0xpc3QuYWRkKCJzdWJ0aXRsZSIpOworICAgICAgICAg ICAgc3VidGl0bGVFbGVtZW50LnRleHRDb250ZW50ID0gdGhpcy5zdWJ0aXRsZTsKICAgICAgICAg ICAgIGZyYWdtZW50LmFwcGVuZChzdWJ0aXRsZUVsZW1lbnQpOwotCi0gICAgICAgICAgICBsZXQg dGltZW91dFN0cmluZyA9IE51bWJlci5zZWNvbmRzVG9TdHJpbmcodGhpcy5fcmVjb3JkLmRldGFp bHMudGltZW91dCAvIDEwMDApOwotICAgICAgICAgICAgaWYgKHRoaXMuX3JlY29yZC5kZXRhaWxz LnJlcGVhdGluZykKLSAgICAgICAgICAgICAgICBzdWJ0aXRsZUVsZW1lbnQudGV4dENvbnRlbnQg PSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIiVzIGludGVydmFsIikuZm9ybWF0KHRpbWVvdXRTdHJp bmcpOwotICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIHN1YnRpdGxlRWxlbWVudC50 ZXh0Q29udGVudCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiJXMgZGVsYXkiKS5mb3JtYXQodGlt ZW91dFN0cmluZyk7CiAgICAgICAgIH0KIAogICAgICAgICByZXR1cm4gZnJhZ21lbnQ7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGlu ZURhdGFHcmlkLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv VGltZWxpbmVEYXRhR3JpZC5qcwppbmRleCBkMTUzMWIzNDc4MTFiMmE0ODJlYjIwZjkyYzg3ZmFh NzI4OWQxNTYzLi40Nzg0MDYzNWQxZWM4NWZiZDM4YzcxM2QzMzRlNGVmODJlMzFjNWU1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGlu ZURhdGFHcmlkLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1RpbWVsaW5lRGF0YUdyaWQuanMKQEAgLTM1LDYgKzM1LDcgQEAgV2ViSW5zcGVjdG9yLlRp bWVsaW5lRGF0YUdyaWQgPSBjbGFzcyBUaW1lbGluZURhdGFHcmlkIGV4dGVuZHMgV2ViSW5zcGVj dG9yLkRhdGEKICAgICAgICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoInRpbWVsaW5lIik7 CiAKICAgICAgICAgdGhpcy5fZmlsdGVyYWJsZUNvbHVtbnMgPSBbXTsKKyAgICAgICAgdGhpcy5f c29ydERlbGVnYXRlID0gbnVsbDsKIAogICAgICAgICAvLyBDaGVjayBpZiBhbnkgb2YgdGhlIGNl bGxzIGNhbiBiZSBmaWx0ZXJlZC4KICAgICAgICAgZm9yICh2YXIgW2lkZW50aWZpZXIsIGNvbHVt bl0gb2YgdGhpcy5jb2x1bW5zKSB7CkBAIC03OSw2ICs4MCwyMyBAQCBXZWJJbnNwZWN0b3IuVGlt ZWxpbmVEYXRhR3JpZCA9IGNsYXNzIFRpbWVsaW5lRGF0YUdyaWQgZXh0ZW5kcyBXZWJJbnNwZWN0 b3IuRGF0YQogCiAgICAgLy8gUHVibGljCiAKKyAgICBnZXQgc29ydERlbGVnYXRlKCkKKyAgICB7 CisgICAgICAgIHJldHVybiB0aGlzLl9zb3J0RGVsZWdhdGU7CisgICAgfQorCisgICAgc2V0IHNv cnREZWxlZ2F0ZShkZWxlZ2F0ZSkKKyAgICB7CisgICAgICAgIGRlbGVnYXRlID0gZGVsZWdhdGUg fHwgbnVsbDsKKyAgICAgICAgaWYgKHRoaXMuX3NvcnREZWxlZ2F0ZSA9PT0gZGVsZWdhdGUpCisg ICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgdGhpcy5fc29ydERlbGVnYXRlID0gZGVsZWdh dGU7CisKKyAgICAgICAgaWYgKHRoaXMuc29ydE9yZGVyICE9PSBXZWJJbnNwZWN0b3IuRGF0YUdy aWQuU29ydE9yZGVyLkluZGV0ZXJtaW5hdGUpCisgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZl bnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRGF0YUdyaWQuRXZlbnQuU29ydENoYW5nZWQpOwor ICAgIH0KKwogICAgIHJlc2V0KCkKICAgICB7CiAgICAgICAgIC8vIE1heSBiZSBvdmVycmlkZGVu IGJ5IHN1YmNsYXNzZXMuIElmIHNvLCB0aGV5IHNob3VsZCBjYWxsIHRoZSBzdXBlcmNsYXNzLgpA QCAtMjgyLDYgKzMwMCw5IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkID0gY2xhc3Mg VGltZWxpbmVEYXRhR3JpZCBleHRlbmRzIFdlYkluc3BlY3Rvci5EYXRhCiAKICAgICBfc29ydCgp CiAgICAgeworICAgICAgICBpZiAoIXRoaXMuX3Jvd3MubGVuZ3RoKQorICAgICAgICAgICAgcmV0 dXJuOworCiAgICAgICAgIGxldCBzb3J0Q29sdW1uSWRlbnRpZmllciA9IHRoaXMuc29ydENvbHVt bklkZW50aWZpZXI7CiAgICAgICAgIGlmICghc29ydENvbHVtbklkZW50aWZpZXIpCiAgICAgICAg ICAgICByZXR1cm47CkBAIC0zMDEsNyArMzIyLDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lRGF0 YUdyaWQgPSBjbGFzcyBUaW1lbGluZURhdGFHcmlkIGV4dGVuZHMgV2ViSW5zcGVjdG9yLkRhdGEK ICAgICAgICAgLy8gQ29sbGVjdCBwYXJlbnQgbm9kZXMgdGhhdCBuZWVkIHRoZWlyIGNoaWxkcmVu IHNvcnRlZC4gU28gdGhpcyBpbiB0d28gcGhhc2VzIHNpbmNlCiAgICAgICAgIC8vIHRyYXZlcnNl TmV4dE5vZGUgd291bGQgZ2V0IGNvbmZ1c2VkIGlmIHdlIHNvcnQgdGhlIHRyZWUgd2hpbGUgdHJh dmVyc2luZyBpdC4KICAgICAgICAgbGV0IHBhcmVudERhdGFHcmlkTm9kZXMgPSBbdGhpc107Ci0g ICAgICAgIGxldCBjdXJyZW50RGF0YUdyaWROb2RlID0gdGhpcy5jaGlsZHJlblswXTsKKyAgICAg ICAgbGV0IGN1cnJlbnREYXRhR3JpZE5vZGUgPSB0aGlzLl9yb3dzWzBdOwogICAgICAgICB3aGls ZSAoY3VycmVudERhdGFHcmlkTm9kZSkgewogICAgICAgICAgICAgaWYgKGN1cnJlbnREYXRhR3Jp ZE5vZGUuY2hpbGRyZW4ubGVuZ3RoKQogICAgICAgICAgICAgICAgIHBhcmVudERhdGFHcmlkTm9k ZXMucHVzaChjdXJyZW50RGF0YUdyaWROb2RlKTsKQEAgLTM1Nyw2ICszNzgsMTIgQEAgV2ViSW5z cGVjdG9yLlRpbWVsaW5lRGF0YUdyaWQgPSBjbGFzcyBUaW1lbGluZURhdGFHcmlkIGV4dGVuZHMg V2ViSW5zcGVjdG9yLkRhdGEKIAogICAgICAgICB2YXIgc29ydERpcmVjdGlvbiA9IHRoaXMuc29y dE9yZGVyID09PSBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkFzY2VuZGluZyA/IDEg OiAtMTsKIAorICAgICAgICBpZiAodGhpcy5fc29ydERlbGVnYXRlICYmIHR5cGVvZiB0aGlzLl9z b3J0RGVsZWdhdGUuZGF0YUdyaWRTb3J0Q29tcGFyYXRvciA9PT0gImZ1bmN0aW9uIikgeworICAg ICAgICAgICAgbGV0IHJlc3VsdCA9IHRoaXMuX3NvcnREZWxlZ2F0ZS5kYXRhR3JpZFNvcnRDb21w YXJhdG9yKHNvcnRDb2x1bW5JZGVudGlmaWVyLCBzb3J0RGlyZWN0aW9uLCBub2RlMSwgbm9kZTIp OworICAgICAgICAgICAgaWYgKHR5cGVvZiByZXN1bHQgPT09ICJudW1iZXIiKQorICAgICAgICAg ICAgICAgIHJldHVybiByZXN1bHQ7CisgICAgICAgIH0KKwogICAgICAgICB2YXIgdmFsdWUxID0g bm9kZTEuZGF0YVtzb3J0Q29sdW1uSWRlbnRpZmllcl07CiAgICAgICAgIHZhciB2YWx1ZTIgPSBu b2RlMi5kYXRhW3NvcnRDb2x1bW5JZGVudGlmaWVyXTsKIApAQCAtMzg0LDYgKzQxMSwxMSBAQCBX ZWJJbnNwZWN0b3IuVGltZWxpbmVEYXRhR3JpZCA9IGNsYXNzIFRpbWVsaW5lRGF0YUdyaWQgZXh0 ZW5kcyBXZWJJbnNwZWN0b3IuRGF0YQogICAgICAgICAgICAgdmFsdWUyID0gdmFsdWUyID8gdmFs dWUyLmRpc3BsYXlOYW1lIHx8ICIiIDogIiI7CiAgICAgICAgIH0KIAorICAgICAgICBpZiAodmFs dWUxIGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVMb2NhdGlvbiB8fCB2YWx1ZTIg aW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuU291cmNlQ29kZUxvY2F0aW9uKSB7CisgICAgICAgICAg ICB2YWx1ZTEgPSB2YWx1ZTEgPyB2YWx1ZTEuZGlzcGxheUxvY2F0aW9uU3RyaW5nKCkgfHwgIiIg OiAiIjsKKyAgICAgICAgICAgIHZhbHVlMiA9IHZhbHVlMiA/IHZhbHVlMi5kaXNwbGF5TG9jYXRp b25TdHJpbmcoKSB8fCAiIiA6ICIiOworICAgICAgICB9CisKICAgICAgICAgLy8gRm9yIGV2ZXJ5 dGhpbmcgZWxzZSAobW9zdGx5IGJvb2xlYW5zKS4KICAgICAgICAgcmV0dXJuICh2YWx1ZTEgPCB2 YWx1ZTIgPyAtMSA6ICh2YWx1ZTEgPiB2YWx1ZTIgPyAxIDogMCkpICogc29ydERpcmVjdGlvbjsK ICAgICB9Cg== 277211 2016-04-24 19:01:45 -0700 2016-04-24 20:08:55 -0700 [Patch] Proposed Fix bug-156965-20160424190212.patch text/plain 11392 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5OTczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBj YjQyMjFjMDg5NWY5MGM2YThmNjFkYTRhYjhhYmQxY2NmMTE4ZTcxLi45ZTdhODU2NDkyYTIwYTQw Y2E2YWQ1ZTNkZjBjZDg5NTA3ZDQ2NzdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSw0NSBAQAogMjAxNi0wNC0yNCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQ2FuJ3Qgc29ydCBieSBuYW1lL3NvdXJjZSBjb2Rl IGxvY2F0aW9uIGNvbHVtbnMgaW4gVGltZWxpbmUgZGF0YSBncmlkcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU2OTY1CisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS8yNTg5ODcxNj4KKworICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIu CisKKyAgICAgICAgQWRkIHN1cHBvcnQgZm9yIHNvcnRpbmcgU291cmNlQ29kZUxvY2F0aW9uIG9i amVjdHMgdG8gVGltZWxpbmVEYXRhR3JpZCwKKyAgICAgICAgYW5kIGluY2x1ZGUgYSBncmlkIGRl bGVnYXRlIHNvIHRoYXQgdmlld3MgY2FuIGV4dGVuZCBzb3J0aW5nIGxvZ2ljIGZvcgorICAgICAg ICBvdGhlciBkb2N1bWVudCBmcmFnbWVudCBjb2x1bW5zLgorCisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9OZXR3b3JrVGltZWxpbmVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y Lk5ldHdvcmtUaW1lbGluZVZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtUaW1l bGluZVZpZXcucHJvdG90eXBlLmRhdGFHcmlkU29ydENvbXBhcmF0b3IpOgorICAgICAgICBTb3J0 ICJuYW1lIiBjb2x1bW4gYnkgZGlzcGxheSBuYW1lIGZpcnN0LCB0aGVuIHJlc291cmNlIFVSTC4K KworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0RGV0YWlsc1RpbWVsaW5lVmll dy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHREZXRhaWxzVGltZWxpbmVWaWV3KToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHREZXRhaWxzVGltZWxpbmVWaWV3LnByb3RvdHlw ZS5kYXRhR3JpZFNvcnRDb21wYXJhdG9yKToKKyAgICAgICAgU29ydCAibmFtZSIgY29sdW1uIGJ5 IGRpc3BsYXkgbmFtZSBmaXJzdCwgdGhlbiBzdWJ0aXRsZS4KKworICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvU2NyaXB0VGltZWxpbmVEYXRhR3JpZE5vZGUuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU2NyaXB0VGltZWxpbmVEYXRhR3JpZE5vZGUucHJvdG90eXBlLmdldCBzdWJ0aXRs ZSk6CisgICAgICAgIE1ha2Ugc3VidGl0bGUgYWNjZXNzaWJsZSBleHRlcm5hbGx5IGZvciBzb3J0 aW5nLgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lRGF0YUdyaWROb2RlLnBy b3RvdHlwZS5fY3JlYXRlTmFtZUNlbGxEb2N1bWVudEZyYWdtZW50KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5TY3JpcHRUaW1lbGluZURhdGFHcmlkTm9kZSk6CisKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lRGF0YUdyaWQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu VGltZWxpbmVEYXRhR3JpZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVEYXRhR3Jp ZC5wcm90b3R5cGUuZ2V0IHNvcnREZWxlZ2F0ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGlt ZWxpbmVEYXRhR3JpZC5wcm90b3R5cGUuc2V0IHNvcnREZWxlZ2F0ZSk6CisgICAgICAgIEZpcmUg YSBTb3J0Q2hhbmdlZCBldmVudCBpZiB0aGUgZGVsZWdhdGUgY2hhbmdlZCBhbmQgdGhlIGdyaWQg aXMgc29ydGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lRGF0YUdyaWQucHJvdG90 eXBlLl9zb3J0KToKKyAgICAgICAgSWYgYSBzb3J0IGRlbGVnYXRlIGV4aXN0cywgYW5kIGl0IHJl dHVybnMgYSBudW1lcmljIHZhbHVlLCBza2lwIHRoZQorICAgICAgICBkZWZhdWx0IGNvbXBhcmUu CisKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkLnByb3RvdHlwZS5fc29y dENvbXBhcmF0b3IpOgorICAgICAgICBBZGQgc3VwcG9ydCBmb3Igc29ydGluZyBTb3VyY2VDb2Rl TG9jYXRpb24gY29sdW1ucy4KKworMjAxNi0wNC0yNCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBh cHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogRXJyb3Igd2hlbiBzZWxlY3Rpbmcg YSBiYXIgaW4gdGhlIEZyYW1lcyB0aW1lbGluZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU2OTYwCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yNTg5 Nzk1NT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL05ldHdvcmtUaW1lbGluZVZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9OZXR3b3JrVGltZWxpbmVWaWV3LmpzCmluZGV4IDdjNjFiM2M1MWFjMzVm MGZiOTNkZGFmNTgyODhmYjI4YjQxMTJiOWUuLmM2MmZhYTkyNTAxMDVlN2Q1ODBiNGNiNTAxZmNm MGQ4YTBmZDY1N2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL05ldHdvcmtUaW1lbGluZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RpbWVsaW5lVmlldy5qcwpAQCAtOTAsNiAr OTAsNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1RpbWVsaW5lVmlldyA9IGNsYXNzIE5ldHdvcmtU aW1lbGluZVZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0bwogICAgICAgICB0aGlzLl9kYXRhR3JpZCA9 IG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmVEYXRhR3JpZChjb2x1bW5zKTsKICAgICAgICAgdGhp cy5fZGF0YUdyaWQuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGltZWxpbmVEYXRhR3Jp ZC5FdmVudC5GaWx0ZXJzRGlkQ2hhbmdlLCB0aGlzLl9kYXRhR3JpZEZpbHRlcnNEaWRDaGFuZ2Us IHRoaXMpOwogICAgICAgICB0aGlzLl9kYXRhR3JpZC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3Bl Y3Rvci5EYXRhR3JpZC5FdmVudC5TZWxlY3RlZE5vZGVDaGFuZ2VkLCB0aGlzLl9kYXRhR3JpZE5v ZGVTZWxlY3RlZCwgdGhpcyk7CisgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnREZWxlZ2F0ZSA9 IHRoaXM7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRDb2x1bW5JZGVudGlmaWVyU2V0dGlu ZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZygibmV0d29yay10aW1lbGluZS12aWV3LXNvcnQi LCAicmVxdWVzdFNlbnQiKTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydE9yZGVyU2V0dGlu ZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZygibmV0d29yay10aW1lbGluZS12aWV3LXNvcnQt b3JkZXIiLCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkFzY2VuZGluZyk7CiAKQEAg LTE1Miw2ICsxNTMsMjEgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtUaW1lbGluZVZpZXcgPSBjbGFz cyBOZXR3b3JrVGltZWxpbmVWaWV3IGV4dGVuZHMgV2ViSW5zcGVjdG8KICAgICAgICAgdGhpcy5f cGVuZGluZ1JlY29yZHMgPSBbXTsKICAgICB9CiAKKyAgICAvLyBUaW1lbGluZURhdGFHcmlkIHNv cnQgZGVsZWdhdGUKKworICAgIGRhdGFHcmlkU29ydENvbXBhcmF0b3Ioc29ydENvbHVtbklkZW50 aWZpZXIsIHNvcnREaXJlY3Rpb24sIG5vZGUxLCBub2RlMikKKyAgICB7CisgICAgICAgIGlmIChz b3J0Q29sdW1uSWRlbnRpZmllciAhPT0gIm5hbWUiKQorICAgICAgICAgICAgcmV0dXJuIG51bGw7 CisKKyAgICAgICAgbGV0IGRpc3BsYXlOYW1lMSA9IG5vZGUxLmRpc3BsYXlOYW1lKCk7CisgICAg ICAgIGxldCBkaXNwbGF5TmFtZTIgPSBub2RlMi5kaXNwbGF5TmFtZSgpOworICAgICAgICBpZiAo ZGlzcGxheU5hbWUxICE9PSBkaXNwbGF5TmFtZTIpCisgICAgICAgICAgICByZXR1cm4gZGlzcGxh eU5hbWUxLmxvY2FsZUNvbXBhcmUoZGlzcGxheU5hbWUyKSAqIHNvcnREaXJlY3Rpb247CisKKyAg ICAgICAgcmV0dXJuIG5vZGUxLnJlc291cmNlLnVybC5sb2NhbGVDb21wYXJlKG5vZGUyLnJlc291 cmNlLnVybCkgKiBzb3J0RGlyZWN0aW9uOworICAgIH0KKwogICAgIC8vIFByb3RlY3RlZAogCiAg ICAgY2FuU2hvd0NvbnRlbnRWaWV3Rm9yVHJlZUVsZW1lbnQodHJlZUVsZW1lbnQpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHREZXRh aWxzVGltZWxpbmVWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvU2NyaXB0RGV0YWlsc1RpbWVsaW5lVmlldy5qcwppbmRleCBlMDEwNmNkMTY1NDEzODFm YTBmOWRjMzVlNDMwNTgwYjQ5N2VlYTBhLi40MTIwOTAyMTFkOTc1MDFmOTdkODRkMDIwZGMwYTkz MTBiZDAwOTA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9TY3JpcHREZXRhaWxzVGltZWxpbmVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdERldGFpbHNUaW1lbGluZVZpZXcuanMK QEAgLTc0LDYgKzc0LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdERldGFpbHNUaW1lbGluZVZpZXcg PSBjbGFzcyBTY3JpcHREZXRhaWxzVGltZWxpbmVWaWV3IGV4dGVuZHMKICAgICAgICAgdGhpcy5f ZGF0YUdyaWQgPSBuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lRGF0YUdyaWQoY29sdW1u cyk7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9y LlRpbWVsaW5lRGF0YUdyaWQuRXZlbnQuRmlsdGVyc0RpZENoYW5nZSwgdGhpcy5fZGF0YUdyaWRG aWx0ZXJzRGlkQ2hhbmdlLCB0aGlzKTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuYWRkRXZlbnRM aXN0ZW5lcihXZWJJbnNwZWN0b3IuRGF0YUdyaWQuRXZlbnQuU2VsZWN0ZWROb2RlQ2hhbmdlZCwg dGhpcy5fZGF0YUdyaWROb2RlU2VsZWN0ZWQsIHRoaXMpOworICAgICAgICB0aGlzLl9kYXRhR3Jp ZC5zb3J0RGVsZWdhdGUgPSB0aGlzOwogICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0Q29sdW1u SWRlbnRpZmllclNldHRpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcoInNjcmlwdC10aW1l bGluZS12aWV3LXNvcnQiLCAic3RhcnRUaW1lIik7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNv cnRPcmRlclNldHRpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcoInNjcmlwdC10aW1lbGlu ZS12aWV3LXNvcnQtb3JkZXIiLCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkFzY2Vu ZGluZyk7CiAKQEAgLTE0NSw2ICsxNDYsMjEgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdERldGFpbHNU aW1lbGluZVZpZXcgPSBjbGFzcyBTY3JpcHREZXRhaWxzVGltZWxpbmVWaWV3IGV4dGVuZHMKICAg ICAgICAgdGhpcy5fcGVuZGluZ1JlY29yZHMgPSBbXTsKICAgICB9CiAKKyAgICAvLyBUaW1lbGlu ZURhdGFHcmlkIHNvcnQgZGVsZWdhdGUKKworICAgIGRhdGFHcmlkU29ydENvbXBhcmF0b3Ioc29y dENvbHVtbklkZW50aWZpZXIsIHNvcnREaXJlY3Rpb24sIG5vZGUxLCBub2RlMikKKyAgICB7Cisg ICAgICAgIGlmIChzb3J0Q29sdW1uSWRlbnRpZmllciAhPT0gIm5hbWUiKQorICAgICAgICAgICAg cmV0dXJuIG51bGw7CisKKyAgICAgICAgbGV0IGRpc3BsYXlOYW1lMSA9IG5vZGUxLmRpc3BsYXlO YW1lKCk7CisgICAgICAgIGxldCBkaXNwbGF5TmFtZTIgPSBub2RlMi5kaXNwbGF5TmFtZSgpOwor ICAgICAgICBpZiAoZGlzcGxheU5hbWUxICE9PSBkaXNwbGF5TmFtZTIpCisgICAgICAgICAgICBy ZXR1cm4gZGlzcGxheU5hbWUxLmxvY2FsZUNvbXBhcmUoZGlzcGxheU5hbWUyKSAqIHNvcnREaXJl Y3Rpb247CisKKyAgICAgICAgcmV0dXJuIG5vZGUxLnN1YnRpdGxlLmxvY2FsZUNvbXBhcmUobm9k ZTIuc3VidGl0bGUpICogc29ydERpcmVjdGlvbjsKKyAgICB9CisKICAgICAvLyBQcm90ZWN0ZWQK IAogICAgIGRhdGFHcmlkTm9kZVBhdGhDb21wb25lbnRTZWxlY3RlZChldmVudCkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRpbWVs aW5lRGF0YUdyaWROb2RlLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvU2NyaXB0VGltZWxpbmVEYXRhR3JpZE5vZGUuanMKaW5kZXggMWMxMDAzNzRiOTRhZTFh ZDdkOGRkYWI3ZTc5YmMxNWM3YTRjMGI1Ni4uM2ZiNDg0ZWI1YmIyYTRiNWU0YjY0MGIwNzc0MWI0 OTM4MTUwYzdmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvU2NyaXB0VGltZWxpbmVEYXRhR3JpZE5vZGUuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0VGltZWxpbmVEYXRhR3JpZE5vZGUu anMKQEAgLTg3LDYgKzg3LDI0IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZURhdGFHcmlk Tm9kZSA9IGNsYXNzIFNjcmlwdFRpbWVsaW5lRGF0YUdyaWROb2RlIGV4dGVuCiAgICAgICAgIHJl dHVybiB0aGlzLl9jYWNoZWREYXRhOwogICAgIH0KIAorICAgIGdldCBzdWJ0aXRsZSgpCisgICAg eworICAgICAgICBpZiAodGhpcy5fc3VidGl0bGUgIT09IHVuZGVmaW5lZCkKKyAgICAgICAgICAg IHJldHVybiB0aGlzLl9zdWJ0aXRsZTsKKworICAgICAgICB0aGlzLl9zdWJ0aXRsZSA9ICIiOwor CisgICAgICAgIGlmICh0aGlzLl9yZWNvcmQuZXZlbnRUeXBlID09PSBXZWJJbnNwZWN0b3IuU2Ny aXB0VGltZWxpbmVSZWNvcmQuRXZlbnRUeXBlLlRpbWVySW5zdGFsbGVkKSB7CisgICAgICAgICAg ICBsZXQgdGltZW91dFN0cmluZyA9IE51bWJlci5zZWNvbmRzVG9TdHJpbmcodGhpcy5fcmVjb3Jk LmRldGFpbHMudGltZW91dCAvIDEwMDApOworICAgICAgICAgICAgaWYgKHRoaXMuX3JlY29yZC5k ZXRhaWxzLnJlcGVhdGluZykKKyAgICAgICAgICAgICAgICB0aGlzLl9zdWJ0aXRsZSA9IFdlYklu c3BlY3Rvci5VSVN0cmluZygiJXMgaW50ZXJ2YWwiKS5mb3JtYXQodGltZW91dFN0cmluZyk7Cisg ICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgdGhpcy5fc3VidGl0bGUgPSBXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoIiVzIGRlbGF5IikuZm9ybWF0KHRpbWVvdXRTdHJpbmcpOworICAgICAg ICB9CisKKyAgICAgICAgcmV0dXJuIHRoaXMuX3N1YnRpdGxlOworICAgIH0KKwogICAgIHVwZGF0 ZVJhbmdlVGltZXMoc3RhcnRUaW1lLCBlbmRUaW1lKQogICAgIHsKICAgICAgICAgdmFyIG9sZFJh bmdlU3RhcnRUaW1lID0gdGhpcy5fcmFuZ2VTdGFydFRpbWU7CkBAIC0xNDUsMTYgKzE2MywxMSBA QCBXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVEYXRhR3JpZE5vZGUgPSBjbGFzcyBTY3JpcHRU aW1lbGluZURhdGFHcmlkTm9kZSBleHRlbgogICAgICAgICBsZXQgZnJhZ21lbnQgPSBkb2N1bWVu dC5jcmVhdGVEb2N1bWVudEZyYWdtZW50KCk7CiAgICAgICAgIGZyYWdtZW50LmFwcGVuZCh0aGlz LmRpc3BsYXlOYW1lKCkpOwogCi0gICAgICAgIGlmICh0aGlzLl9yZWNvcmQuZXZlbnRUeXBlID09 PSBXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVSZWNvcmQuRXZlbnRUeXBlLlRpbWVySW5zdGFs bGVkKSB7CisgICAgICAgIGlmICh0aGlzLnN1YnRpdGxlKSB7CiAgICAgICAgICAgICBsZXQgc3Vi dGl0bGVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOwogICAgICAgICAg ICAgc3VidGl0bGVFbGVtZW50LmNsYXNzTGlzdC5hZGQoInN1YnRpdGxlIik7CisgICAgICAgICAg ICBzdWJ0aXRsZUVsZW1lbnQudGV4dENvbnRlbnQgPSB0aGlzLnN1YnRpdGxlOwogICAgICAgICAg ICAgZnJhZ21lbnQuYXBwZW5kKHN1YnRpdGxlRWxlbWVudCk7Ci0KLSAgICAgICAgICAgIGxldCB0 aW1lb3V0U3RyaW5nID0gTnVtYmVyLnNlY29uZHNUb1N0cmluZyh0aGlzLl9yZWNvcmQuZGV0YWls cy50aW1lb3V0IC8gMTAwMCk7Ci0gICAgICAgICAgICBpZiAodGhpcy5fcmVjb3JkLmRldGFpbHMu cmVwZWF0aW5nKQotICAgICAgICAgICAgICAgIHN1YnRpdGxlRWxlbWVudC50ZXh0Q29udGVudCA9 IFdlYkluc3BlY3Rvci5VSVN0cmluZygiJXMgaW50ZXJ2YWwiKS5mb3JtYXQodGltZW91dFN0cmlu Zyk7Ci0gICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgc3VidGl0bGVFbGVtZW50LnRl eHRDb250ZW50ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIlcyBkZWxheSIpLmZvcm1hdCh0aW1l b3V0U3RyaW5nKTsKICAgICAgICAgfQogCiAgICAgICAgIHJldHVybiBmcmFnbWVudDsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5l RGF0YUdyaWQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9U aW1lbGluZURhdGFHcmlkLmpzCmluZGV4IGQxNTMxYjM0NzgxMWIyYTQ4MmViMjBmOTJjODdmYWE3 Mjg5ZDE1NjMuLjdmM2UzZWFjZWYxMzdiZjM1YTRkOTI3NjAxMjBkMDRlOGNmZWM0YTkgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5l RGF0YUdyaWQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVGltZWxpbmVEYXRhR3JpZC5qcwpAQCAtMzUsNiArMzUsNyBAQCBXZWJJbnNwZWN0b3IuVGlt ZWxpbmVEYXRhR3JpZCA9IGNsYXNzIFRpbWVsaW5lRGF0YUdyaWQgZXh0ZW5kcyBXZWJJbnNwZWN0 b3IuRGF0YQogICAgICAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgidGltZWxpbmUiKTsK IAogICAgICAgICB0aGlzLl9maWx0ZXJhYmxlQ29sdW1ucyA9IFtdOworICAgICAgICB0aGlzLl9z b3J0RGVsZWdhdGUgPSBudWxsOwogCiAgICAgICAgIC8vIENoZWNrIGlmIGFueSBvZiB0aGUgY2Vs bHMgY2FuIGJlIGZpbHRlcmVkLgogICAgICAgICBmb3IgKHZhciBbaWRlbnRpZmllciwgY29sdW1u XSBvZiB0aGlzLmNvbHVtbnMpIHsKQEAgLTc5LDYgKzgwLDIzIEBAIFdlYkluc3BlY3Rvci5UaW1l bGluZURhdGFHcmlkID0gY2xhc3MgVGltZWxpbmVEYXRhR3JpZCBleHRlbmRzIFdlYkluc3BlY3Rv ci5EYXRhCiAKICAgICAvLyBQdWJsaWMKIAorICAgIGdldCBzb3J0RGVsZWdhdGUoKQorICAgIHsK KyAgICAgICAgcmV0dXJuIHRoaXMuX3NvcnREZWxlZ2F0ZTsKKyAgICB9CisKKyAgICBzZXQgc29y dERlbGVnYXRlKGRlbGVnYXRlKQorICAgIHsKKyAgICAgICAgZGVsZWdhdGUgPSBkZWxlZ2F0ZSB8 fCBudWxsOworICAgICAgICBpZiAodGhpcy5fc29ydERlbGVnYXRlID09PSBkZWxlZ2F0ZSkKKyAg ICAgICAgICAgIHJldHVybjsKKworICAgICAgICB0aGlzLl9zb3J0RGVsZWdhdGUgPSBkZWxlZ2F0 ZTsKKworICAgICAgICBpZiAodGhpcy5zb3J0T3JkZXIgIT09IFdlYkluc3BlY3Rvci5EYXRhR3Jp ZC5Tb3J0T3JkZXIuSW5kZXRlcm1pbmF0ZSkKKyAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVu dFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5FdmVudC5Tb3J0Q2hhbmdlZCk7Cisg ICAgfQorCiAgICAgcmVzZXQoKQogICAgIHsKICAgICAgICAgLy8gTWF5IGJlIG92ZXJyaWRkZW4g Ynkgc3ViY2xhc3Nlcy4gSWYgc28sIHRoZXkgc2hvdWxkIGNhbGwgdGhlIHN1cGVyY2xhc3MuCkBA IC0yODIsNiArMzAwLDkgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lRGF0YUdyaWQgPSBjbGFzcyBU aW1lbGluZURhdGFHcmlkIGV4dGVuZHMgV2ViSW5zcGVjdG9yLkRhdGEKIAogICAgIF9zb3J0KCkK ICAgICB7CisgICAgICAgIGlmICghdGhpcy5jaGlsZHJlbi5sZW5ndGgpCisgICAgICAgICAgICBy ZXR1cm47CisKICAgICAgICAgbGV0IHNvcnRDb2x1bW5JZGVudGlmaWVyID0gdGhpcy5zb3J0Q29s dW1uSWRlbnRpZmllcjsKICAgICAgICAgaWYgKCFzb3J0Q29sdW1uSWRlbnRpZmllcikKICAgICAg ICAgICAgIHJldHVybjsKQEAgLTM1Nyw2ICszNzgsMTIgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5l RGF0YUdyaWQgPSBjbGFzcyBUaW1lbGluZURhdGFHcmlkIGV4dGVuZHMgV2ViSW5zcGVjdG9yLkRh dGEKIAogICAgICAgICB2YXIgc29ydERpcmVjdGlvbiA9IHRoaXMuc29ydE9yZGVyID09PSBXZWJJ bnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkFzY2VuZGluZyA/IDEgOiAtMTsKIAorICAgICAg ICBpZiAodGhpcy5fc29ydERlbGVnYXRlICYmIHR5cGVvZiB0aGlzLl9zb3J0RGVsZWdhdGUuZGF0 YUdyaWRTb3J0Q29tcGFyYXRvciA9PT0gImZ1bmN0aW9uIikgeworICAgICAgICAgICAgbGV0IHJl c3VsdCA9IHRoaXMuX3NvcnREZWxlZ2F0ZS5kYXRhR3JpZFNvcnRDb21wYXJhdG9yKHNvcnRDb2x1 bW5JZGVudGlmaWVyLCBzb3J0RGlyZWN0aW9uLCBub2RlMSwgbm9kZTIpOworICAgICAgICAgICAg aWYgKHR5cGVvZiByZXN1bHQgPT09ICJudW1iZXIiKQorICAgICAgICAgICAgICAgIHJldHVybiBy ZXN1bHQ7CisgICAgICAgIH0KKwogICAgICAgICB2YXIgdmFsdWUxID0gbm9kZTEuZGF0YVtzb3J0 Q29sdW1uSWRlbnRpZmllcl07CiAgICAgICAgIHZhciB2YWx1ZTIgPSBub2RlMi5kYXRhW3NvcnRD b2x1bW5JZGVudGlmaWVyXTsKIApAQCAtMzg0LDYgKzQxMSwxMSBAQCBXZWJJbnNwZWN0b3IuVGlt ZWxpbmVEYXRhR3JpZCA9IGNsYXNzIFRpbWVsaW5lRGF0YUdyaWQgZXh0ZW5kcyBXZWJJbnNwZWN0 b3IuRGF0YQogICAgICAgICAgICAgdmFsdWUyID0gdmFsdWUyID8gdmFsdWUyLmRpc3BsYXlOYW1l IHx8ICIiIDogIiI7CiAgICAgICAgIH0KIAorICAgICAgICBpZiAodmFsdWUxIGluc3RhbmNlb2Yg V2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVMb2NhdGlvbiB8fCB2YWx1ZTIgaW5zdGFuY2VvZiBXZWJJ bnNwZWN0b3IuU291cmNlQ29kZUxvY2F0aW9uKSB7CisgICAgICAgICAgICB2YWx1ZTEgPSB2YWx1 ZTEgPyB2YWx1ZTEuZGlzcGxheUxvY2F0aW9uU3RyaW5nKCkgfHwgIiIgOiAiIjsKKyAgICAgICAg ICAgIHZhbHVlMiA9IHZhbHVlMiA/IHZhbHVlMi5kaXNwbGF5TG9jYXRpb25TdHJpbmcoKSB8fCAi IiA6ICIiOworICAgICAgICB9CisKICAgICAgICAgLy8gRm9yIGV2ZXJ5dGhpbmcgZWxzZSAobW9z dGx5IGJvb2xlYW5zKS4KICAgICAgICAgcmV0dXJuICh2YWx1ZTEgPCB2YWx1ZTIgPyAtMSA6ICh2 YWx1ZTEgPiB2YWx1ZTIgPyAxIDogMCkpICogc29ydERpcmVjdGlvbjsKICAgICB9Cg==