158675 2016-06-12 14:01:04 -0700 Web Inspector: DataGrid should manage its own settings 2016-06-16 12:39:14 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 158676 158767 1 mattbaker mattbaker bburg commit-queue joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1201721 0 mattbaker 2016-06-12 14:01:04 -0700 * SUMMARY DataGrid should manage its own settings. Code for creating grid settings (for sorting) is repeated in a dozen places. DataGrid needs an "identifier" property, so that each instance will have it's own settings, and a way to handle default setting values. 1201722 1 webkit-bug-importer 2016-06-12 14:01:57 -0700 <rdar://problem/26761338> 1202396 2 281301 mattbaker 2016-06-14 17:37:09 -0700 Created attachment 281301 [Patch] Proposed Fix 1202772 3 281301 commit-queue 2016-06-15 17:16:28 -0700 Comment on attachment 281301 [Patch] Proposed Fix Rejecting attachment 281301 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-03', 'apply-attachment', '--no-update', '--non-interactive', 281301, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: kGridContentView.js patching file Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js patching file Source/WebInspectorUI/UserInterface/Views/ProfileView.js patching file Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js patching file Source/WebInspectorUI/UserInterface/Views/ScriptDetailsTimelineView.js Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Timothy Hatcher']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.webkit.org/results/1509777 1202789 4 281416 mattbaker 2016-06-15 17:35:47 -0700 Created attachment 281416 [Patch] For Landing 1202973 5 281416 commit-queue 2016-06-16 12:39:11 -0700 Comment on attachment 281416 [Patch] For Landing Clearing flags on attachment: 281416 Committed r202133: <http://trac.webkit.org/changeset/202133> 1202974 6 commit-queue 2016-06-16 12:39:14 -0700 All reviewed patches have been landed. Closing bug. 281301 2016-06-14 17:37:09 -0700 2016-06-15 17:35:44 -0700 [Patch] Proposed Fix bug-158675-20160614173845.patch text/plain 22610 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyMDYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA1 NTEzMGUzMmU2YmU5YTQ4M2E5NzhjZTczZGE4OTYzMTQ2ODc2YWMyLi41Y2FjZTVjNzgyYWQ4NzJh NzY1NjRkNzAzZmI3Mjk0NmI5ODFmZTJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw1NiBAQAorMjAxNi0wNi0xNCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRGF0YUdyaWQgc2hvdWxkIG1hbmFnZSBpdHMgb3du IHNldHRpbmdzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNTg2NzUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI2NzYxMzM4PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgZ3JpZCBzb3J0aW5nIHNl dHRpbmdzIChzb3J0IG9yZGVyLCBjb2x1bW4gaWRlbnRpZmllcikgaW50byBEYXRhR3JpZCwKKyAg ICAgICAgcmVtb3ZpbmcgZHVwbGljYXRlZCBjb2RlIGZyb20gdmFyaW91cyB2aWV3cy4gQSBuZXcg Z3JpZCBtZXRob2QsICJjcmVhdGVTZXR0aW5ncyIsCisgICAgICAgIHRha2VzIGFuIGlkZW50aWZp ZXIgd2hpY2ggaXMgdXNlZCBhcyBhIHByZWZpeCBmb3IgbmFtaW5nIHRoZSBncmlkJ3Mgc2V0dGlu Z3MuCisKKyAgICAgICAgU28gdGhhdCB0aGUgbmV3IGJlaGF2aW9yIGlzIGVhc3kgdG8gdXNlIGFu ZCBoYXJkIHRvIG1pc3VzZSwgZGVmYXVsdCB2YWx1ZXMKKyAgICAgICAgZm9yIGVhY2ggc2V0dGlu ZyBhcmUgc2V0IHRvIHRoZSBjdXJyZW50IHZhbHVlIG9mIHRoZSBhc3NvY2lhdGVkIHByb3BlcnR5 LgorICAgICAgICBUaGUgcmVzdWx0IGlzIHRoYXQ6CisKKyAgICAgICAgICAgIGdyaWQuc29ydENv bHVtbklkZW50aWZpZXIgPSAiY29sdW1uQSI7CisgICAgICAgICAgICBncmlkLmNyZWF0ZVNldHRp bmdzKCJteUdyaWQiKTsKKworICAgICAgICB3aWxsIHVzZSAiY29sdW1uQSIgYXMgdGhlIGRlZmF1 bHQgdmFsdWUgdGhlIGZpcnN0IHRpbWUgdGhlIHNldHRpbmcgaXMgY3JlYXRlZC4KKworICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQXBwbGljYXRpb25DYWNoZUZyYW1lQ29udGVudFZpZXcu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZUZyYW1lQ29udGVudFZp ZXcucHJvdG90eXBlLl9jcmVhdGVEYXRhR3JpZCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9W aWV3cy9Db29raWVTdG9yYWdlQ29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu Q29va2llU3RvcmFnZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5fcmVidWlsZFRhYmxlKToKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVN0b3JhZ2VDb250ZW50Vmlldy5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5ET01TdG9yYWdlQ29udGVudFZpZXcpOgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvRGF0YUdyaWQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YUdy aWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZS5jcmVhdGVTZXR0 aW5ncyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlLmdldCBpZGVu dGlmaWVyKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5 cGUuc2V0IGlkZW50aWZpZXIpOiBEZWxldGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFH cmlkLnByb3RvdHlwZS5zZXQgc29ydE9yZGVyU2V0dGluZyk6IERlbGV0ZWQuCisgICAgICAgIChX ZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlLnNldCBzb3J0Q29sdW1uSWRlbnRpZmllclNl dHRpbmcpOiBEZWxldGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvSGVhcEFsbG9j YXRpb25zVGltZWxpbmVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBBbGxvY2F0 aW9uc1RpbWVsaW5lVmlldyk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9IZWFwU25h cHNob3RDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RD b250ZW50Vmlldyk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9MYXllclRyZWVEZXRh aWxzU2lkZWJhclBhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxheWVyVHJlZURldGFp bHNTaWRlYmFyUGFuZWwucHJvdG90eXBlLl9idWlsZERhdGFHcmlkU2VjdGlvbik6CisgICAgICAg ICogVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXRUaW1lbGluZVZpZXcuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVWaWV3KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL05ldHdvcmtHcmlkQ29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu TmV0d29ya0dyaWRDb250ZW50Vmlldyk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9O ZXR3b3JrVGltZWxpbmVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtUaW1l bGluZVZpZXcpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUHJvZmlsZVZpZXcuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvZmlsZVZpZXcpOgorICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvUmVuZGVyaW5nRnJhbWVUaW1lbGluZVZpZXcuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuUmVuZGVyaW5nRnJhbWVUaW1lbGluZVZpZXcpOgorICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvU2NyaXB0RGV0YWlsc1RpbWVsaW5lVmlldy5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5TY3JpcHREZXRhaWxzVGltZWxpbmVWaWV3KToKKwogMjAxNi0wNi0xNCAgU2FhbSBC YXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNvbT4KIAogICAgICAgICBGb2xsb3cgdXAgdG86IFdlYiBJ bnNwZWN0b3I6IENhbGwgVHJlZXMgdmlldyBzaG91bGQgaGF2ZSBhICdUb3AgRnVuY3Rpb25zJy1s aWtlIG1vZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0FwcGxpY2F0aW9uQ2FjaGVGcmFtZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQXBwbGljYXRpb25DYWNoZUZyYW1lQ29udGVu dFZpZXcuanMKaW5kZXggNGRjZDhhMzFjYjYxYzU0NmNjYzM2MjQ5MjM0MWY3NWViNWEyYzZiZS4u ZDM2NzhlMGNjYzZiYTVkNzEwMzc1NWFiZTc4MjVhMWYyNjA5MGJhNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQXBwbGljYXRpb25DYWNoZUZy YW1lQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQXBwbGljYXRpb25DYWNoZUZyYW1lQ29udGVudFZpZXcuanMKQEAgLTE2Miw4ICsx NjIsOSBAQCBXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZUZyYW1lQ29udGVudFZpZXcgPSBj bGFzcyBBcHBsaWNhdGlvbkNhY2hlRnJhbWVDb250ZQogICAgICAgICB0aGlzLl9kYXRhR3JpZCA9 IG5ldyBXZWJJbnNwZWN0b3IuRGF0YUdyaWQoY29sdW1ucyk7CiAgICAgICAgIHRoaXMuX2RhdGFH cmlkLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLkV2ZW50LlNvcnRDaGFu Z2VkLCB0aGlzLl9zb3J0RGF0YUdyaWQsIHRoaXMpOwogCi0gICAgICAgIHRoaXMuX2RhdGFHcmlk LnNvcnRDb2x1bW5JZGVudGlmaWVyU2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZygi YXBwbGljYXRpb24tY2FjaGUtZnJhbWUtY29udGVudC12aWV3LXNvcnQiLCAidXJsIik7Ci0gICAg ICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRPcmRlclNldHRpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNl dHRpbmcoImFwcGxpY2F0aW9uLWNhY2hlLWZyYW1lLWNvbnRlbnQtdmlldy1zb3J0LW9yZGVyIiwg V2ViSW5zcGVjdG9yLkRhdGFHcmlkLlNvcnRPcmRlci5Bc2NlbmRpbmcpOworICAgICAgICB0aGlz Ll9kYXRhR3JpZC5zb3J0Q29sdW1uSWRlbnRpZmllciA9ICJ1cmwiOworICAgICAgICB0aGlzLl9k YXRhR3JpZC5zb3J0T3JkZXIgPSBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkFzY2Vu ZGluZzsKKyAgICAgICAgdGhpcy5fZGF0YUdyaWQuY3JlYXRlU2V0dGluZ3MoImFwcGxpY2F0aW9u LWNhY2hlLWZyYW1lLWNvbnRlbnQtdmlldyIpOwogCiAgICAgICAgIHRoaXMuYWRkU3Vidmlldyh0 aGlzLl9kYXRhR3JpZCk7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnVwZGF0ZUxheW91dCgpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29v a2llU3RvcmFnZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3LmpzCmluZGV4IDAyZTBlZmRjZGU1 ZjUzYWNlMjI4YTliMjI3MGU4ZDcwZDM4NjcxY2IuLjU2ZjI3MzZhMzVhZGIyYzA2MDVjMDA5YTFj NGY1Mjg2OTc4NTFjZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0Nvb2tpZVN0b3JhZ2VDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db29raWVTdG9yYWdlQ29udGVudFZpZXcu anMKQEAgLTE0Miw4ICsxNDIsOCBAQCBXZWJJbnNwZWN0b3IuQ29va2llU3RvcmFnZUNvbnRlbnRW aWV3ID0gY2xhc3MgQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3IGV4dGVuZHMgVwogICAgICAgICAg ICAgdGhpcy5fZGF0YUdyaWQuYXBwZW5kQ2hpbGQobm9kZSk7CiAgICAgICAgIH0KIAotICAgICAg ICB0aGlzLl9kYXRhR3JpZC5zb3J0Q29sdW1uSWRlbnRpZmllclNldHRpbmcgPSBuZXcgV2ViSW5z cGVjdG9yLlNldHRpbmcoImNvb2tpZS1zdG9yYWdlLWNvbnRlbnQtdmlldy1zb3J0IiwgIm5hbWUi KTsKLSAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydE9yZGVyU2V0dGluZyA9IG5ldyBXZWJJbnNw ZWN0b3IuU2V0dGluZygiY29va2llLXN0b3JhZ2UtY29udGVudC12aWV3LXNvcnQtb3JkZXIiLCBX ZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkluZGV0ZXJtaW5hdGUpOworICAgICAgICB0 aGlzLl9kYXRhR3JpZC5zb3J0Q29sdW1uSWRlbnRpZmllciA9ICJuYW1lIjsKKyAgICAgICAgdGhp cy5fZGF0YUdyaWQuY3JlYXRlU2V0dGluZ3MoImNvb2tpZS1zdG9yYWdlLWNvbnRlbnQtdmlldyIp OwogICAgIH0KIAogICAgIF9maWx0ZXJDb29raWVzKGNvb2tpZXMpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01TdG9yYWdlQ29udGVudFZp ZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01TdG9y YWdlQ29udGVudFZpZXcuanMKaW5kZXggOTk5NTFhNmY3NWJmNzMxMDdiMTllM2E0MDIzODQ1OTYz ZTM0OGVkMy4uODg0ODQ2ZTA0MzUzNTNlYzgxMTc4ZWZiODQ3MWUzOGM2ZDQ4YjEyMyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NU3RvcmFn ZUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0RPTVN0b3JhZ2VDb250ZW50Vmlldy5qcwpAQCAtNDIsOCArNDIsOSBAQCBXZWJJbnNw ZWN0b3IuRE9NU3RvcmFnZUNvbnRlbnRWaWV3ID0gY2xhc3MgRE9NU3RvcmFnZUNvbnRlbnRWaWV3 IGV4dGVuZHMgV2ViSW5zcAogICAgICAgICBjb2x1bW5zLnZhbHVlID0ge3RpdGxlOiBXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoIlZhbHVlIiksIHNvcnRhYmxlOiB0cnVlfTsKIAogICAgICAgICB0aGlz Ll9kYXRhR3JpZCA9IG5ldyBXZWJJbnNwZWN0b3IuRGF0YUdyaWQoY29sdW1ucywgdGhpcy5fZWRp dGluZ0NhbGxiYWNrLmJpbmQodGhpcyksIHRoaXMuX2RlbGV0ZUNhbGxiYWNrLmJpbmQodGhpcykp OwotICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0T3JkZXJTZXR0aW5nID0gbmV3IFdlYkluc3Bl Y3Rvci5TZXR0aW5nKCJkb20tc3RvcmFnZS1jb250ZW50LXZpZXctc29ydC1vcmRlciIsIFdlYklu c3BlY3Rvci5EYXRhR3JpZC5Tb3J0T3JkZXIuQXNjZW5kaW5nKTsKLSAgICAgICAgdGhpcy5fZGF0 YUdyaWQuc29ydENvbHVtbklkZW50aWZpZXJTZXR0aW5nID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0 aW5nKCJkb20tc3RvcmFnZS1jb250ZW50LXZpZXctc29ydCIsICJrZXkiKTsKKyAgICAgICAgdGhp cy5fZGF0YUdyaWQuc29ydE9yZGVyID0gV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlNvcnRPcmRlci5B c2NlbmRpbmc7CisgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRDb2x1bW5JZGVudGlmaWVyID0g ImtleSI7CisgICAgICAgIHRoaXMuX2RhdGFHcmlkLmNyZWF0ZVNldHRpbmdzKCJkb20tc3RvcmFn ZS1jb250ZW50LXZpZXciKTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuYWRkRXZlbnRMaXN0ZW5l cihXZWJJbnNwZWN0b3IuRGF0YUdyaWQuRXZlbnQuU29ydENoYW5nZWQsIHRoaXMuX3NvcnREYXRh R3JpZCwgdGhpcyk7CiAKICAgICAgICAgdGhpcy5hZGRTdWJ2aWV3KHRoaXMuX2RhdGFHcmlkKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Rh dGFHcmlkLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0 YUdyaWQuanMKaW5kZXggODBlZGYzY2RmNWRjMjQxMzEwMzk5ZDk0ZjQ5NzgzMjllZDZkZjY0YS4u MTE2NjYwZTQxMDVjOTc5MzlmMzE1YTNkNTE5MDc4NDFkYTJlYzFiYSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0YUdyaWQuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0YUdyaWQuanMKQEAg LTMyLDcgKzMyLDcgQEAgV2ViSW5zcGVjdG9yLkRhdGFHcmlkID0gY2xhc3MgRGF0YUdyaWQgZXh0 ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAgICB0aGlzLmNvbHVtbnMgPSBuZXcgTWFwOwog ICAgICAgICB0aGlzLm9yZGVyZWRDb2x1bW5zID0gW107CiAKLSAgICAgICAgdGhpcy5faWRlbnRp ZmllciA9IG51bGw7CisgICAgICAgIHRoaXMuX3NldHRpbmdzSWRlbnRpZmllciA9IG51bGw7CiAg ICAgICAgIHRoaXMuX3NvcnRDb2x1bW5JZGVudGlmaWVyID0gbnVsbDsKICAgICAgICAgdGhpcy5f c29ydENvbHVtbklkZW50aWZpZXJTZXR0aW5nID0gbnVsbDsKICAgICAgICAgdGhpcy5fc29ydE9y ZGVyID0gV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlNvcnRPcmRlci5JbmRldGVybWluYXRlOwpAQCAt MjA4LDI3ICsyMDgsNiBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQgPSBjbGFzcyBEYXRhR3JpZCBl eHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAgICAgICAgIHJldHVybiBkYXRhR3JpZDsKICAgICB9 CiAKLSAgICBnZXQgaWRlbnRpZmllcigpIHsgcmV0dXJuIHRoaXMuX2lkZW50aWZpZXI7IH0KLQot ICAgIHNldCBpZGVudGlmaWVyKHgpCi0gICAgewotICAgICAgICBjb25zb2xlLmFzc2VydCh4ICYm IHR5cGVvZiB4ID09PSAic3RyaW5nIik7Ci0KLSAgICAgICAgaWYgKHRoaXMuX2lkZW50aWZpZXIg PT09IHgpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgdGhpcy5faWRlbnRpZmllciA9 IHg7Ci0KLSAgICAgICAgLy8gRklYTUU6IEFkZCBzb3J0Q29sdW1uSWRlbnRpZmllclNldHRpbmcg YW5kIHNvcnRPcmRlclNldHRpbmcgYXMgcGFydCBvZiA8d2Via2l0Lm9yZy9iLzE1ODY3NT4uCi0g ICAgICAgIHRoaXMuX2hpZGRlbkNvbHVtblNldHRpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRp bmcodGhpcy5faWRlbnRpZmllciArICItaGlkZGVuLWNvbHVtbnMiLCBbXSk7Ci0KLSAgICAgICAg aWYgKCF0aGlzLmNvbHVtbnMpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgZm9yIChs ZXQgY29sdW1uSWRlbnRpZmllciBvZiB0aGlzLl9oaWRkZW5Db2x1bW5TZXR0aW5nLnZhbHVlKQot ICAgICAgICAgICAgdGhpcy5zaG93Q29sdW1uKGNvbHVtbklkZW50aWZpZXIsIGZhbHNlKTsKLSAg ICB9Ci0KICAgICBnZXQgY29sdW1uQ2hvb3NlckVuYWJsZWQoKSB7IHJldHVybiB0aGlzLl9jb2x1 bW5DaG9vc2VyRW5hYmxlZDsgfQogICAgIHNldCBjb2x1bW5DaG9vc2VyRW5hYmxlZCh4KSB7IHRo aXMuX2NvbHVtbkNob29zZXJFbmFibGVkID0geDsgfQogCkBAIC0yNjgsMTUgKzI0Nyw2IEBAIFdl Ykluc3BlY3Rvci5EYXRhR3JpZCA9IGNsYXNzIERhdGFHcmlkIGV4dGVuZHMgV2ViSW5zcGVjdG9y LlZpZXcKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9y LkRhdGFHcmlkLkV2ZW50LlNvcnRDaGFuZ2VkKTsKICAgICB9CiAKLSAgICBzZXQgc29ydE9yZGVy U2V0dGluZyhzZXR0aW5nKQotICAgIHsKLSAgICAgICAgY29uc29sZS5hc3NlcnQoc2V0dGluZyBp bnN0YW5jZW9mIFdlYkluc3BlY3Rvci5TZXR0aW5nKTsKLQotICAgICAgICB0aGlzLl9zb3J0T3Jk ZXJTZXR0aW5nID0gc2V0dGluZzsKLSAgICAgICAgaWYgKHRoaXMuX3NvcnRPcmRlclNldHRpbmcu dmFsdWUpCi0gICAgICAgICAgICB0aGlzLnNvcnRPcmRlciA9IHRoaXMuX3NvcnRPcmRlclNldHRp bmcudmFsdWU7Ci0gICAgfQotCiAgICAgZ2V0IHNvcnRDb2x1bW5JZGVudGlmaWVyKCkKICAgICB7 CiAgICAgICAgIHJldHVybiB0aGlzLl9zb3J0Q29sdW1uSWRlbnRpZmllcjsKQEAgLTI5NSwxNSAr MjY1LDYgQEAgV2ViSW5zcGVjdG9yLkRhdGFHcmlkID0gY2xhc3MgRGF0YUdyaWQgZXh0ZW5kcyBX ZWJJbnNwZWN0b3IuVmlldwogICAgICAgICB0aGlzLl91cGRhdGVTb3J0ZWRDb2x1bW4ob2xkU29y dENvbHVtbklkZW50aWZpZXIpOwogICAgIH0KIAotICAgIHNldCBzb3J0Q29sdW1uSWRlbnRpZmll clNldHRpbmcoc2V0dGluZykKLSAgICB7Ci0gICAgICAgIGNvbnNvbGUuYXNzZXJ0KHNldHRpbmcg aW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuU2V0dGluZyk7Ci0KLSAgICAgICAgdGhpcy5fc29ydENv bHVtbklkZW50aWZpZXJTZXR0aW5nID0gc2V0dGluZzsKLSAgICAgICAgaWYgKHRoaXMuX3NvcnRD b2x1bW5JZGVudGlmaWVyU2V0dGluZy52YWx1ZSkKLSAgICAgICAgICAgIHRoaXMuc29ydENvbHVt bklkZW50aWZpZXIgPSB0aGlzLl9zb3J0Q29sdW1uSWRlbnRpZmllclNldHRpbmcudmFsdWU7Ci0g ICAgfQotCiAgICAgZ2V0IGlubGluZSgpIHsgcmV0dXJuIHRoaXMuX2lubGluZTsgfQogCiAgICAg c2V0IGlubGluZSh4KQpAQCAtMzc2LDYgKzMzNywzMCBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQg PSBjbGFzcyBEYXRhR3JpZCBleHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAgICAgICAgIHJldHVy biB0aGlzLl9maWx0ZXJEZWxlZ2F0ZS5kYXRhR3JpZE1hdGNoTm9kZUFnYWluc3RDdXN0b21GaWx0 ZXJzKG5vZGUpOwogICAgIH0KIAorICAgIGNyZWF0ZVNldHRpbmdzKGlkZW50aWZpZXIpCisgICAg eworICAgICAgICBjb25zb2xlLmFzc2VydChpZGVudGlmaWVyICYmIHR5cGVvZiBpZGVudGlmaWVy ID09PSAic3RyaW5nIik7CisgICAgICAgIGlmICh0aGlzLl9zZXR0aW5nc0lkZW50aWZpZXIgPT09 IGlkZW50aWZpZXIpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgdGhpcy5fc2V0dGlu Z3NJZGVudGlmaWVyID0gaWRlbnRpZmllcjsKKworICAgICAgICB0aGlzLl9zb3J0Q29sdW1uSWRl bnRpZmllclNldHRpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcodGhpcy5fc2V0dGluZ3NJ ZGVudGlmaWVyICsgIi1zb3J0IiwgdGhpcy5fc29ydENvbHVtbklkZW50aWZpZXIpOworICAgICAg ICB0aGlzLl9zb3J0T3JkZXJTZXR0aW5nID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0aW5nKHRoaXMu X3NldHRpbmdzSWRlbnRpZmllciArICItc29ydC1vcmRlciIsIHRoaXMuX3NvcnRPcmRlcik7Cisg ICAgICAgIHRoaXMuX2hpZGRlbkNvbHVtblNldHRpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRp bmcodGhpcy5fc2V0dGluZ3NJZGVudGlmaWVyICsgIi1oaWRkZW4tY29sdW1ucyIsIFtdKTsKKwor ICAgICAgICBpZiAoIXRoaXMuY29sdW1ucykKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAg ICBpZiAodGhpcy5fc29ydENvbHVtbklkZW50aWZpZXJTZXR0aW5nLnZhbHVlKSB7CisgICAgICAg ICAgICB0aGlzLnNvcnRDb2x1bW5JZGVudGlmaWVyID0gdGhpcy5fc29ydENvbHVtbklkZW50aWZp ZXJTZXR0aW5nLnZhbHVlOworICAgICAgICAgICAgdGhpcy5zb3J0T3JkZXIgPSB0aGlzLl9zb3J0 T3JkZXJTZXR0aW5nLnZhbHVlOworICAgICAgICB9CisKKyAgICAgICAgZm9yIChsZXQgY29sdW1u SWRlbnRpZmllciBvZiB0aGlzLl9oaWRkZW5Db2x1bW5TZXR0aW5nLnZhbHVlKQorICAgICAgICAg ICAgdGhpcy5zaG93Q29sdW1uKGNvbHVtbklkZW50aWZpZXIsIGZhbHNlKTsKKyAgICB9CisKICAg ICBfdXBkYXRlU2Nyb2xsTGlzdGVuZXJzKCkKICAgICB7CiAgICAgICAgIGlmICh0aGlzLl9pbmxp bmUgfHwgdGhpcy5fdmFyaWFibGVIZWlnaHRSb3dzKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9IZWFwQWxsb2NhdGlvbnNUaW1lbGluZVZp ZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9IZWFwQWxs b2NhdGlvbnNUaW1lbGluZVZpZXcuanMKaW5kZXggZDExYTFiZTk4Mzg4MWVjYzlhMzg3ODAwOTAw ZTQ2MGNlN2IxM2RmNC4uMTUwNGU5NDExYjEyMDFiNGYzZWFhNjU1NzRmNWY0OTNmOWJlNTBlMCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSGVh cEFsbG9jYXRpb25zVGltZWxpbmVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0hlYXBBbGxvY2F0aW9uc1RpbWVsaW5lVmlldy5qcwpAQCAtNzcs OSArNzcsMTEgQEAgV2ViSW5zcGVjdG9yLkhlYXBBbGxvY2F0aW9uc1RpbWVsaW5lVmlldyA9IGNs YXNzIEhlYXBBbGxvY2F0aW9uc1RpbWVsaW5lVmlldyBleHQKICAgICAgICAgdGhpcy5fc25hcHNo b3RMaXN0UGF0aENvbXBvbmVudC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5IaWVyYXJj aGljYWxQYXRoQ29tcG9uZW50LkV2ZW50LkNsaWNrZWQsIHRoaXMuX3NuYXBzaG90TGlzdFBhdGhD b21wb25lbnRDbGlja2VkLCB0aGlzKTsKIAogICAgICAgICB0aGlzLl9kYXRhR3JpZCA9IG5ldyBX ZWJJbnNwZWN0b3IuVGltZWxpbmVEYXRhR3JpZChjb2x1bW5zKTsKLSAgICAgICAgdGhpcy5fZGF0 YUdyaWQuc29ydENvbHVtbklkZW50aWZpZXJTZXR0aW5nID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0 aW5nKCJoZWFwLWFsbG9jYXRpb25zLXRpbWVsaW5lLXZpZXctc29ydCIsICJ0aW1lc3RhbXAiKTsK LSAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydE9yZGVyU2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0 b3IuU2V0dGluZygiaGVhcC1hbGxvY2F0aW9ucy10aW1lbGluZS12aWV3LXNvcnQtb3JkZXIiLCBX ZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkFzY2VuZGluZyk7CisgICAgICAgIHRoaXMu X2RhdGFHcmlkLnNvcnRDb2x1bW5JZGVudGlmaWVyID0gInRpbWVzdGFtcCI7CisgICAgICAgIHRo aXMuX2RhdGFHcmlkLnNvcnRPcmRlciA9IFdlYkluc3BlY3Rvci5EYXRhR3JpZC5Tb3J0T3JkZXIu QXNjZW5kaW5nOworICAgICAgICB0aGlzLl9kYXRhR3JpZC5jcmVhdGVTZXR0aW5ncygiaGVhcC1h bGxvY2F0aW9ucy10aW1lbGluZS12aWV3Iik7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmFkZEV2 ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLkV2ZW50LlNlbGVjdGVkTm9kZUNoYW5n ZWQsIHRoaXMuX2RhdGFHcmlkTm9kZVNlbGVjdGVkLCB0aGlzKTsKKwogICAgICAgICB0aGlzLmFk ZFN1YnZpZXcodGhpcy5fZGF0YUdyaWQpOwogCiAgICAgICAgIHRoaXMuX2NvbnRlbnRWaWV3Q29u dGFpbmVyID0gbmV3IFdlYkluc3BlY3Rvci5Db250ZW50Vmlld0NvbnRhaW5lcjsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0hlYXBTbmFwc2hv dENvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvSGVhcFNuYXBzaG90Q29udGVudFZpZXcuanMKaW5kZXggYjllNjVjNGFhZjBiZTYxNjQ3ZDQ5 ZWJmYTE1ZDM3OTRlOThmNDU2YS4uMGM3MjUwNGY0ZGEzNDJhNGRmYTU3NTBhOTBkOGFhYzM0YmY0 NmM2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvSGVhcFNuYXBzaG90Q29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvSGVhcFNuYXBzaG90Q29udGVudFZpZXcuanMKQEAgLTM0LDgg KzM0LDkgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdENvbnRlbnRWaWV3ID0gY2xhc3MgSGVh cFNuYXBzaG90Q29udGVudFZpZXcgZXh0ZW5kcyBXZWIKICAgICAgICAgdGhpcy5lbGVtZW50LmNs YXNzTGlzdC5hZGQoImhlYXAtc25hcHNob3QiKTsKIAogICAgICAgICB0aGlzLl9kYXRhR3JpZCA9 IG5ldyBXZWJJbnNwZWN0b3IuRGF0YUdyaWQoY29sdW1ucyk7Ci0gICAgICAgIHRoaXMuX2RhdGFH cmlkLnNvcnRDb2x1bW5JZGVudGlmaWVyU2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGlu ZyhpZGVudGlmaWVyICsgIi1zb3J0IiwgInJldGFpbmVkU2l6ZSIpOwotICAgICAgICB0aGlzLl9k YXRhR3JpZC5zb3J0T3JkZXJTZXR0aW5nID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0aW5nKGlkZW50 aWZpZXIgKyAiLXNvcnQtb3JkZXIiLCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkRl c2NlbmRpbmcpOworICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0Q29sdW1uSWRlbnRpZmllciA9 ICJyZXRhaW5lZFNpemUiOworICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0T3JkZXIgPSBXZWJJ bnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkRlc2NlbmRpbmc7CisgICAgICAgIHRoaXMuX2Rh dGFHcmlkLmNyZWF0ZVNldHRpbmdzKGlkZW50aWZpZXIpOwogICAgICAgICB0aGlzLl9kYXRhR3Jp ZC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5FdmVudC5Tb3J0Q2hhbmdl ZCwgdGhpcy5fc29ydERhdGFHcmlkLCB0aGlzKTsKIAogICAgICAgICBsZXQgc29ydENvbXBhcmF0 b3IgPSBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90RGF0YUdyaWRUcmVlLmJ1aWxkU29ydENvbXBh cmF0b3IodGhpcy5fZGF0YUdyaWQuc29ydENvbHVtbklkZW50aWZpZXIsIHRoaXMuX2RhdGFHcmlk LnNvcnRPcmRlcik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9MYXllclRyZWVEZXRhaWxzU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJUcmVlRGV0YWlsc1NpZGViYXJQYW5l bC5qcwppbmRleCBlMzVkNjcwNDIwZTg3NDM0ZTQxOTYwNjNiY2Q4NGEzNTg2YjFlY2E2Li4zODVi Zjc3MjMyNmVjMzEzMTdjYTZhZWRhZGRlZTU2MTMwYzhkYTRhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXllclRyZWVEZXRhaWxzU2lkZWJh clBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0xheWVyVHJlZURldGFpbHNTaWRlYmFyUGFuZWwuanMKQEAgLTE0Miw4ICsxNDIsOSBAQCBXZWJJ bnNwZWN0b3IuTGF5ZXJUcmVlRGV0YWlsc1NpZGViYXJQYW5lbCA9IGNsYXNzIExheWVyVHJlZURl dGFpbHNTaWRlYmFyUGFuZWwgZQogICAgICAgICB0aGlzLl9kYXRhR3JpZC5hZGRFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5FdmVudC5Tb3J0Q2hhbmdlZCwgdGhpcy5fc29ydERh dGFHcmlkLCB0aGlzKTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuYWRkRXZlbnRMaXN0ZW5lcihX ZWJJbnNwZWN0b3IuRGF0YUdyaWQuRXZlbnQuU2VsZWN0ZWROb2RlQ2hhbmdlZCwgdGhpcy5fc2Vs ZWN0ZWREYXRhR3JpZE5vZGVDaGFuZ2VkLCB0aGlzKTsKIAotICAgICAgICB0aGlzLnNvcnRDb2x1 bW5JZGVudGlmaWVyU2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZygibGF5ZXItdHJl ZS1kZXRhaWxzLXNpZGViYXItcGFuZWwtc29ydCIsICJtZW1vcnkiKTsKLSAgICAgICAgdGhpcy5z b3J0T3JkZXJTZXR0aW5nID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0aW5nKCJsYXllci10cmVlLWRl dGFpbHMtc2lkZWJhci1wYW5lbC1zb3J0LW9yZGVyIiwgV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlNv cnRPcmRlci5EZXNjZW5kaW5nKTsKKyAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydENvbHVtbklk ZW50aWZpZXIgPSAibWVtb3J5IjsKKyAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydE9yZGVyID0g V2ViSW5zcGVjdG9yLkRhdGFHcmlkLlNvcnRPcmRlci5EZXNjZW5kaW5nOworICAgICAgICB0aGlz Ll9kYXRhR3JpZC5jcmVhdGVTZXR0aW5ncygibGF5ZXItdHJlZS1kZXRhaWxzLXNpZGViYXItcGFu ZWwiKTsKIAogICAgICAgICB2YXIgZWxlbWVudCA9IHRoaXMuX2RhdGFHcmlkLmVsZW1lbnQ7CiAg ICAgICAgIGVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiZm9jdXMiLCB0aGlzLl9kYXRhR3JpZEdh aW5lZEZvY3VzLmJpbmQodGhpcyksIGZhbHNlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheW91dFRpbWVsaW5lVmlldy5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheW91dFRpbWVsaW5lVmlldy5q cwppbmRleCA0MjY5ZDc5Yjk3YTJhNWJmZDg1NjEwN2FkZmJlYWY5OGZhNjE4Mjk4Li5kZDk1MmJj NDljM2NmMjMyNjFiOTU2OGI3ZjNkMDI1N2VjZDFmYjIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXRUaW1lbGluZVZpZXcuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0VGltZWxp bmVWaWV3LmpzCkBAIC03NywxMSArNzcsOSBAQCBXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVW aWV3ID0gY2xhc3MgTGF5b3V0VGltZWxpbmVWaWV3IGV4dGVuZHMgV2ViSW5zcGVjdG9yLgogCiAg ICAgICAgIHRoaXMuc2V0dXBEYXRhR3JpZCh0aGlzLl9kYXRhR3JpZCk7CiAKLSAgICAgICAgdGhp cy5fZGF0YUdyaWQuaWRlbnRpZmllciA9ICJsYXlvdXQtdGltZWxpbmUtdmlldyI7Ci0KLSAgICAg ICAgLy8gRklYTUU6IFJlbW92ZSBvbmNlIDx3ZWJraXQub3JnL2IvMTU4Njc1PiBpcyBmaXhlZC4K LSAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydENvbHVtbklkZW50aWZpZXJTZXR0aW5nID0gbmV3 IFdlYkluc3BlY3Rvci5TZXR0aW5nKCJsYXlvdXQtdGltZWxpbmUtdmlldy1zb3J0IiwgInN0YXJ0 VGltZSIpOwotICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0T3JkZXJTZXR0aW5nID0gbmV3IFdl Ykluc3BlY3Rvci5TZXR0aW5nKCJsYXlvdXQtdGltZWxpbmUtdmlldy1zb3J0LW9yZGVyIiwgV2Vi SW5zcGVjdG9yLkRhdGFHcmlkLlNvcnRPcmRlci5Bc2NlbmRpbmcpOworICAgICAgICB0aGlzLl9k YXRhR3JpZC5zb3J0Q29sdW1uSWRlbnRpZmllciA9ICJzdGFydFRpbWUiOworICAgICAgICB0aGlz Ll9kYXRhR3JpZC5zb3J0T3JkZXIgPSBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkFz Y2VuZGluZzsKKyAgICAgICAgdGhpcy5fZGF0YUdyaWQuY3JlYXRlU2V0dGluZ3MoImxheW91dC10 aW1lbGluZS12aWV3Iik7CiAKICAgICAgICAgdGhpcy5faG92ZXJlZFRyZWVFbGVtZW50ID0gbnVs bDsKICAgICAgICAgdGhpcy5faG92ZXJlZERhdGFHcmlkTm9kZSA9IG51bGw7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrR3JpZENv bnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv TmV0d29ya0dyaWRDb250ZW50Vmlldy5qcwppbmRleCA1OWJlOGY3YjcxODg1NWU0ZWI3MzYzNzJl ZDRmZDQxNDhmYTgwMjViLi5jYWI0OTVmMjBmNDU2NDEyNDRhNWM5N2U1MzE2YzE2YTdlM2Y0Y2Ey IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9O ZXR3b3JrR3JpZENvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtHcmlkQ29udGVudFZpZXcuanMKQEAgLTgyLDggKzgyLDkg QEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtHcmlkQ29udGVudFZpZXcgPSBjbGFzcyBOZXR3b3JrR3Jp ZENvbnRlbnRWaWV3IGV4dGVuZHMgV2ViSW4KIAogICAgICAgICB0aGlzLl9kYXRhR3JpZCA9IG5l dyBXZWJJbnNwZWN0b3IuVGltZWxpbmVEYXRhR3JpZChjb2x1bW5zLCB0aGlzLl9jb250ZW50VHJl ZU91dGxpbmUpOwogICAgICAgICB0aGlzLl9kYXRhR3JpZC5hZGRFdmVudExpc3RlbmVyKFdlYklu c3BlY3Rvci5EYXRhR3JpZC5FdmVudC5TZWxlY3RlZE5vZGVDaGFuZ2VkLCB0aGlzLl9kYXRhR3Jp ZE5vZGVTZWxlY3RlZCwgdGhpcyk7Ci0gICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRDb2x1bW5J ZGVudGlmaWVyU2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZygibmV0d29yay1ncmlk LWNvbnRlbnQtdmlldy1zb3J0IiwgInJlcXVlc3RTZW50Iik7Ci0gICAgICAgIHRoaXMuX2RhdGFH cmlkLnNvcnRPcmRlclNldHRpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcoIm5ldHdvcmst Z3JpZC1jb250ZW50LXZpZXctc29ydC1vcmRlciIsIFdlYkluc3BlY3Rvci5EYXRhR3JpZC5Tb3J0 T3JkZXIuQXNjZW5kaW5nKTsKKyAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydENvbHVtbklkZW50 aWZpZXIgPSAicmVxdWVzdFNlbnQiOworICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0T3JkZXIg PSBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkFzY2VuZGluZzsKKyAgICAgICAgdGhp cy5fZGF0YUdyaWQuY3JlYXRlU2V0dGluZ3MoIm5ldHdvcmstZ3JpZC1jb250ZW50LXZpZXciKTsK IAogICAgICAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgibmV0d29yay1ncmlkIik7CiAg ICAgICAgIHRoaXMuYWRkU3Vidmlldyh0aGlzLl9kYXRhR3JpZCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGltZWxpbmVWaWV3 LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1Rp bWVsaW5lVmlldy5qcwppbmRleCBjZWFjY2EwMWRjMDFkNzIyODU2ZGI3NmM5NTVkMDJlZTk2YmEy MTg0Li4zODQ2NDJkOGE5OGJiOTk3ODg1NzJlMzE1MzgzZDg2ZjJmMmQ5Y2Y2IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGltZWxp bmVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L05ldHdvcmtUaW1lbGluZVZpZXcuanMKQEAgLTg5LDEyICs4OSwxMCBAQCBXZWJJbnNwZWN0b3Iu TmV0d29ya1RpbWVsaW5lVmlldyA9IGNsYXNzIE5ldHdvcmtUaW1lbGluZVZpZXcgZXh0ZW5kcyBX ZWJJbnNwZWN0bwogICAgICAgICAgICAgY29sdW1uc1tjb2x1bW5dLnNvcnRhYmxlID0gdHJ1ZTsK IAogICAgICAgICB0aGlzLl9kYXRhR3JpZCA9IG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmVEYXRh R3JpZChjb2x1bW5zKTsKLSAgICAgICAgdGhpcy5fZGF0YUdyaWQuaWRlbnRpZmllciA9ICJuZXR3 b3JrLXRpbWVsaW5lLXZpZXciOwogICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0RGVsZWdhdGUg PSB0aGlzOwotCi0gICAgICAgIC8vIEZJWE1FOiBSZW1vdmUgb25jZSA8d2Via2l0Lm9yZy9iLzE1 ODY3NT4gaXMgZml4ZWQuCi0gICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRDb2x1bW5JZGVudGlm aWVyU2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZygibmV0d29yay10aW1lbGluZS12 aWV3LXNvcnQiLCAicmVxdWVzdFNlbnQiKTsKLSAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydE9y ZGVyU2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZygibmV0d29yay10aW1lbGluZS12 aWV3LXNvcnQtb3JkZXIiLCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkFzY2VuZGlu Zyk7CisgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRDb2x1bW5JZGVudGlmaWVyID0gInJlcXVl c3RTZW50IjsKKyAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydE9yZGVyID0gV2ViSW5zcGVjdG9y LkRhdGFHcmlkLlNvcnRPcmRlci5Bc2NlbmRpbmc7CisgICAgICAgIHRoaXMuX2RhdGFHcmlkLmNy ZWF0ZVNldHRpbmdzKCJuZXR3b3JrLXRpbWVsaW5lLXZpZXciKTsKIAogICAgICAgICB0aGlzLnNl dHVwRGF0YUdyaWQodGhpcy5fZGF0YUdyaWQpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qcm9maWxlVmlldy5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Byb2ZpbGVWaWV3LmpzCmluZGV4IGE0YjM1 MmVhZDFmYTFiMjg2N2RmMWViMjVlNTZkMTA3ODkwZmI0NmMuLjY0OTJmY2VjMmU4MzFmZDcwNDVi M2EyN2E4Mzk4Njg3MjAxN2I1NjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1Byb2ZpbGVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Byb2ZpbGVWaWV3LmpzCkBAIC02NSw4ICs2NSw5IEBA IFdlYkluc3BlY3Rvci5Qcm9maWxlVmlldyA9IGNsYXNzIFByb2ZpbGVWaWV3IGV4dGVuZHMgV2Vi SW5zcGVjdG9yLkNvbnRlbnRWaWV3CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmVsZW1lbnQuYWRk RXZlbnRMaXN0ZW5lcigibW91c2VvdmVyIiwgdGhpcy5fbW91c2VPdmVyRGF0YUdyaWQuYmluZCh0 aGlzKSk7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigi bW91c2VsZWF2ZSIsIHRoaXMuX21vdXNlTGVhdmVEYXRhR3JpZC5iaW5kKHRoaXMpKTsKICAgICAg ICAgdGhpcy5fZGF0YUdyaWQuaW5kZW50V2lkdGggPSAyMDsKLSAgICAgICAgdGhpcy5fZGF0YUdy aWQuc29ydENvbHVtbklkZW50aWZpZXJTZXR0aW5nID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0aW5n KCJwcm9maWxlLXZpZXctc29ydCIsICJ0b3RhbFRpbWUiKTsKLSAgICAgICAgdGhpcy5fZGF0YUdy aWQuc29ydE9yZGVyU2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZygicHJvZmlsZS12 aWV3LXNvcnQtb3JkZXIiLCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkRlc2NlbmRp bmcpOworICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0Q29sdW1uSWRlbnRpZmllciA9ICJ0b3Rh bFRpbWUiOworICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0T3JkZXIgPSBXZWJJbnNwZWN0b3Iu RGF0YUdyaWQuU29ydE9yZGVyLkRlc2NlbmRpbmc7CisgICAgICAgIHRoaXMuX2RhdGFHcmlkLmNy ZWF0ZVNldHRpbmdzKCJwcm9maWxlLXZpZXciKTsKIAogICAgICAgICB0aGlzLmFkZFN1YnZpZXco dGhpcy5fZGF0YUdyaWQpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlbmRlcmluZ0ZyYW1lVGltZWxpbmVWaWV3LmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVuZGVyaW5nRnJhbWVUaW1l bGluZVZpZXcuanMKaW5kZXggZjI1YWM2YzRlZGRhZjYzNzczZjYxNDczMWJiMjRkMDM4OWNjYjQw NC4uNWI3Mjg5MDA3YzYzNjM2OTdiZWJkZjAwOGMyNmMwZTA3MzI5Y2E5ZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVuZGVyaW5nRnJhbWVU aW1lbGluZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvUmVuZGVyaW5nRnJhbWVUaW1lbGluZVZpZXcuanMKQEAgLTc4LDExICs3OCw5IEBAIFdl Ykluc3BlY3Rvci5SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldyA9IGNsYXNzIFJlbmRlcmluZ0Zy YW1lVGltZWxpbmVWaWV3IGV4dGVuCiAgICAgICAgICAgICBjb2x1bW5zW2NvbHVtbl0uc29ydGFi bGUgPSB0cnVlOwogCiAgICAgICAgIHRoaXMuX2RhdGFHcmlkID0gbmV3IFdlYkluc3BlY3Rvci5U aW1lbGluZURhdGFHcmlkKGNvbHVtbnMpOwotICAgICAgICB0aGlzLl9kYXRhR3JpZC5pZGVudGlm aWVyID0gInJlbmRlcmluZy1mcmFtZS10aW1lbGluZS12aWV3IjsKLQotICAgICAgICAvLyBGSVhN RTogUmVtb3ZlIG9uY2UgPHdlYmtpdC5vcmcvYi8xNTg2NzU+IGlzIGZpeGVkLgotICAgICAgICB0 aGlzLl9kYXRhR3JpZC5zb3J0Q29sdW1uSWRlbnRpZmllclNldHRpbmcgPSBuZXcgV2ViSW5zcGVj dG9yLlNldHRpbmcoInJlbmRlcmluZy1mcmFtZS10aW1lbGluZS12aWV3LXNvcnQiLCAic3RhcnRU aW1lIik7Ci0gICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRPcmRlclNldHRpbmcgPSBuZXcgV2Vi SW5zcGVjdG9yLlNldHRpbmcoInJlbmRlcmluZy1mcmFtZS10aW1lbGluZS12aWV3LXNvcnQtb3Jk ZXIiLCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkFzY2VuZGluZyk7CisgICAgICAg IHRoaXMuX2RhdGFHcmlkLnNvcnRDb2x1bW5JZGVudGlmaWVyID0gInN0YXJ0VGltZSI7CisgICAg ICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRPcmRlciA9IFdlYkluc3BlY3Rvci5EYXRhR3JpZC5Tb3J0 T3JkZXIuQXNjZW5kaW5nOworICAgICAgICB0aGlzLl9kYXRhR3JpZC5jcmVhdGVTZXR0aW5ncygi cmVuZGVyaW5nLWZyYW1lLXRpbWVsaW5lLXZpZXciKTsKIAogICAgICAgICB0aGlzLnNldHVwRGF0 YUdyaWQodGhpcy5fZGF0YUdyaWQpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHREZXRhaWxzVGltZWxpbmVWaWV3LmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0RGV0YWlsc1RpbWVs aW5lVmlldy5qcwppbmRleCAwOWFkZWZhODdkOTJiMTlhNDI1YzVjMGJlZDBhNTFhZmQ2YTA1YTZi Li42YWEwMWM4NzgwNjNkZWU1MjU2ZmVjZGY2YTY5YjE0MjAyNGFjMTU0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHREZXRhaWxzVGlt ZWxpbmVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1NjcmlwdERldGFpbHNUaW1lbGluZVZpZXcuanMKQEAgLTczLDEyICs3MywxMCBAQCBXZWJJ bnNwZWN0b3IuU2NyaXB0RGV0YWlsc1RpbWVsaW5lVmlldyA9IGNsYXNzIFNjcmlwdERldGFpbHNU aW1lbGluZVZpZXcgZXh0ZW5kcwogICAgICAgICAgICAgY29sdW1uc1tjb2x1bW5dLnNvcnRhYmxl ID0gdHJ1ZTsKIAogICAgICAgICB0aGlzLl9kYXRhR3JpZCA9IG5ldyBXZWJJbnNwZWN0b3IuU2Ny aXB0VGltZWxpbmVEYXRhR3JpZChjb2x1bW5zKTsKLSAgICAgICAgdGhpcy5fZGF0YUdyaWQuaWRl bnRpZmllciA9ICJzY3JpcHQtdGltZWxpbmUtdmlldyI7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlk LnNvcnREZWxlZ2F0ZSA9IHRoaXM7Ci0KLSAgICAgICAgLy8gRklYTUU6IFJlbW92ZSBvbmNlIDx3 ZWJraXQub3JnL2IvMTU4Njc1PiBpcyBmaXhlZC4KLSAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29y dENvbHVtbklkZW50aWZpZXJTZXR0aW5nID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0aW5nKCJzY3Jp cHQtdGltZWxpbmUtdmlldy1zb3J0IiwgInN0YXJ0VGltZSIpOwotICAgICAgICB0aGlzLl9kYXRh R3JpZC5zb3J0T3JkZXJTZXR0aW5nID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0aW5nKCJzY3JpcHQt dGltZWxpbmUtdmlldy1zb3J0LW9yZGVyIiwgV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlNvcnRPcmRl ci5Bc2NlbmRpbmcpOworICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0Q29sdW1uSWRlbnRpZmll ciA9ICJzdGFydFRpbWUiOworICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0T3JkZXIgPSBXZWJJ bnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkFzY2VuZGluZzsKKyAgICAgICAgdGhpcy5fZGF0 YUdyaWQuY3JlYXRlU2V0dGluZ3MoInNjcmlwdC10aW1lbGluZS12aWV3Iik7CiAKICAgICAgICAg dGhpcy5zZXR1cERhdGFHcmlkKHRoaXMuX2RhdGFHcmlkKTsKIAo= 281416 2016-06-15 17:35:47 -0700 2016-06-16 12:39:11 -0700 [Patch] For Landing bug-158675-20160615173545.patch text/plain 22633 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyMTE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAw ZjZlNWM1MGU2MTRhZGE2Yzc2ZTlmOWFjYWZkOGJiYzU2MjU1M2FkLi5hOTU4Nzg4ZmE1NGYzN2Nj MjhhOTgwMTIzM2E0NGJkN2UyODAwYzIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw1NiBAQAorMjAxNi0wNi0xNSAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRGF0YUdyaWQgc2hvdWxkIG1hbmFnZSBpdHMgb3du IHNldHRpbmdzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNTg2NzUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI2NzYxMzM4PgorCisgICAgICAgIFJl dmlld2VkIGJ5IFRpbW90aHkgSGF0Y2hlci4KKworICAgICAgICBNb3ZlIGdyaWQgc29ydGluZyBz ZXR0aW5ncyAoc29ydCBvcmRlciwgY29sdW1uIGlkZW50aWZpZXIpIGludG8gRGF0YUdyaWQsCisg ICAgICAgIHJlbW92aW5nIGR1cGxpY2F0ZWQgY29kZSBmcm9tIHZhcmlvdXMgdmlld3MuIEEgbmV3 IGdyaWQgbWV0aG9kLCAiY3JlYXRlU2V0dGluZ3MiLAorICAgICAgICB0YWtlcyBhbiBpZGVudGlm aWVyIHdoaWNoIGlzIHVzZWQgYXMgYSBwcmVmaXggZm9yIG5hbWluZyB0aGUgZ3JpZCdzIHNldHRp bmdzLgorCisgICAgICAgIFNvIHRoYXQgdGhlIG5ldyBiZWhhdmlvciBpcyBlYXN5IHRvIHVzZSBh bmQgaGFyZCB0byBtaXN1c2UsIGRlZmF1bHQgdmFsdWVzCisgICAgICAgIGZvciBlYWNoIHNldHRp bmcgYXJlIHNldCB0byB0aGUgY3VycmVudCB2YWx1ZSBvZiB0aGUgYXNzb2NpYXRlZCBwcm9wZXJ0 eS4KKyAgICAgICAgVGhlIHJlc3VsdCBpcyB0aGF0OgorCisgICAgICAgICAgICBncmlkLnNvcnRD b2x1bW5JZGVudGlmaWVyID0gImNvbHVtbkEiOworICAgICAgICAgICAgZ3JpZC5jcmVhdGVTZXR0 aW5ncygibXlHcmlkIik7CisKKyAgICAgICAgd2lsbCB1c2UgImNvbHVtbkEiIGFzIHRoZSBkZWZh dWx0IHZhbHVlIHRoZSBmaXJzdCB0aW1lIHRoZSBzZXR0aW5nIGlzIGNyZWF0ZWQuCisKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0FwcGxpY2F0aW9uQ2FjaGVGcmFtZUNvbnRlbnRWaWV3 LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVGcmFtZUNvbnRlbnRW aWV3LnByb3RvdHlwZS5fY3JlYXRlRGF0YUdyaWQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkNvb2tpZVN0b3JhZ2VDb250ZW50Vmlldy5wcm90b3R5cGUuX3JlYnVpbGRUYWJsZSk6CisgICAg ICAgICogVXNlckludGVyZmFjZS9WaWV3cy9ET01TdG9yYWdlQ29udGVudFZpZXcuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuRE9NU3RvcmFnZUNvbnRlbnRWaWV3KToKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFH cmlkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUuY3JlYXRlU2V0 dGluZ3MpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZS5nZXQgaWRl bnRpZmllcik6IERlbGV0ZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90 eXBlLnNldCBpZGVudGlmaWVyKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXRh R3JpZC5wcm90b3R5cGUuc2V0IHNvcnRPcmRlclNldHRpbmcpOiBEZWxldGVkLgorICAgICAgICAo V2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZS5zZXQgc29ydENvbHVtbklkZW50aWZpZXJT ZXR0aW5nKTogRGVsZXRlZC4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0hlYXBBbGxv Y2F0aW9uc1RpbWVsaW5lVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwQWxsb2Nh dGlvbnNUaW1lbGluZVZpZXcpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvSGVhcFNu YXBzaG90Q29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90 Q29udGVudFZpZXcpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJUcmVlRGV0 YWlsc1NpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5MYXllclRyZWVEZXRh aWxzU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fYnVpbGREYXRhR3JpZFNlY3Rpb24pOgorICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0VGltZWxpbmVWaWV3LmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5lVmlldyk6CisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9OZXR3b3JrR3JpZENvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y Lk5ldHdvcmtHcmlkQ29udGVudFZpZXcpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv TmV0d29ya1RpbWVsaW5lVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrVGlt ZWxpbmVWaWV3KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Byb2ZpbGVWaWV3Lmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVWaWV3KToKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL1JlbmRlcmluZ0ZyYW1lVGltZWxpbmVWaWV3LmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlJlbmRlcmluZ0ZyYW1lVGltZWxpbmVWaWV3KToKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL1NjcmlwdERldGFpbHNUaW1lbGluZVZpZXcuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU2NyaXB0RGV0YWlsc1RpbWVsaW5lVmlldyk6CisKIDIwMTYtMDYtMTUgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBVbmNhdWdodCBFeGNl cHRpb246IFR5cGVFcnJvcjogdW5kZWZpbmVkIGlzIG5vdCBhbiBvYmplY3QgKGV2YWx1YXRpbmcg J2ltYWdlRWxlbWVudC5jbGFzc0xpc3QnKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQXBwbGljYXRpb25DYWNoZUZyYW1lQ29udGVudFZpZXcu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9BcHBsaWNhdGlv bkNhY2hlRnJhbWVDb250ZW50Vmlldy5qcwppbmRleCA0ZGNkOGEzMWNiNjFjNTQ2Y2NjMzYyNDky MzQxZjc1ZWI1YTJjNmJlLi5kMzY3OGUwY2NjNmJhNWQ3MTAzNzU1YWJlNzgyNWExZjI2MDkwYmE2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9B cHBsaWNhdGlvbkNhY2hlRnJhbWVDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9BcHBsaWNhdGlvbkNhY2hlRnJhbWVDb250ZW50Vmll dy5qcwpAQCAtMTYyLDggKzE2Miw5IEBAIFdlYkluc3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlRnJh bWVDb250ZW50VmlldyA9IGNsYXNzIEFwcGxpY2F0aW9uQ2FjaGVGcmFtZUNvbnRlCiAgICAgICAg IHRoaXMuX2RhdGFHcmlkID0gbmV3IFdlYkluc3BlY3Rvci5EYXRhR3JpZChjb2x1bW5zKTsKICAg ICAgICAgdGhpcy5fZGF0YUdyaWQuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGF0YUdy aWQuRXZlbnQuU29ydENoYW5nZWQsIHRoaXMuX3NvcnREYXRhR3JpZCwgdGhpcyk7CiAKLSAgICAg ICAgdGhpcy5fZGF0YUdyaWQuc29ydENvbHVtbklkZW50aWZpZXJTZXR0aW5nID0gbmV3IFdlYklu c3BlY3Rvci5TZXR0aW5nKCJhcHBsaWNhdGlvbi1jYWNoZS1mcmFtZS1jb250ZW50LXZpZXctc29y dCIsICJ1cmwiKTsKLSAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydE9yZGVyU2V0dGluZyA9IG5l dyBXZWJJbnNwZWN0b3IuU2V0dGluZygiYXBwbGljYXRpb24tY2FjaGUtZnJhbWUtY29udGVudC12 aWV3LXNvcnQtb3JkZXIiLCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkFzY2VuZGlu Zyk7CisgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRDb2x1bW5JZGVudGlmaWVyID0gInVybCI7 CisgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRPcmRlciA9IFdlYkluc3BlY3Rvci5EYXRhR3Jp ZC5Tb3J0T3JkZXIuQXNjZW5kaW5nOworICAgICAgICB0aGlzLl9kYXRhR3JpZC5jcmVhdGVTZXR0 aW5ncygiYXBwbGljYXRpb24tY2FjaGUtZnJhbWUtY29udGVudC12aWV3Iik7CiAKICAgICAgICAg dGhpcy5hZGRTdWJ2aWV3KHRoaXMuX2RhdGFHcmlkKTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQu dXBkYXRlTGF5b3V0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9Db29raWVTdG9yYWdlQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db29raWVTdG9yYWdlQ29udGVudFZpZXcuanMK aW5kZXggNDJkMjE0MTY5MWUzN2JmMjlkMjIyNjkyMTRjN2JlNmMyMWQxZjA5NC4uNTk5NGZmMDA3 OTY4ODc2ODBiZjhkZmRhZGQ0N2I1ZmZhMjJkYmRhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3Lmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Nvb2tpZVN0 b3JhZ2VDb250ZW50Vmlldy5qcwpAQCAtMTQ1LDggKzE0NSw4IEBAIFdlYkluc3BlY3Rvci5Db29r aWVTdG9yYWdlQ29udGVudFZpZXcgPSBjbGFzcyBDb29raWVTdG9yYWdlQ29udGVudFZpZXcgZXh0 ZW5kcyBXCiAgICAgICAgICAgICB0aGlzLl9kYXRhR3JpZC5hcHBlbmRDaGlsZChub2RlKTsKICAg ICAgICAgfQogCi0gICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRDb2x1bW5JZGVudGlmaWVyU2V0 dGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZygiY29va2llLXN0b3JhZ2UtY29udGVudC12 aWV3LXNvcnQiLCAibmFtZSIpOwotICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0T3JkZXJTZXR0 aW5nID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0aW5nKCJjb29raWUtc3RvcmFnZS1jb250ZW50LXZp ZXctc29ydC1vcmRlciIsIFdlYkluc3BlY3Rvci5EYXRhR3JpZC5Tb3J0T3JkZXIuSW5kZXRlcm1p bmF0ZSk7CisgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRDb2x1bW5JZGVudGlmaWVyID0gIm5h bWUiOworICAgICAgICB0aGlzLl9kYXRhR3JpZC5jcmVhdGVTZXR0aW5ncygiY29va2llLXN0b3Jh Z2UtY29udGVudC12aWV3Iik7CiAgICAgfQogCiAgICAgX2ZpbHRlckNvb2tpZXMoY29va2llcykK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RP TVN0b3JhZ2VDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0RPTVN0b3JhZ2VDb250ZW50Vmlldy5qcwppbmRleCA5OTk1MWE2Zjc1YmY3MzEw N2IxOWUzYTQwMjM4NDU5NjNlMzQ4ZWQzLi44ODQ4NDZlMDQzNTM1M2VjODExNzhlZmI4NDcxZTM4 YzZkNDhiMTIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9ET01TdG9yYWdlQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NU3RvcmFnZUNvbnRlbnRWaWV3LmpzCkBAIC00Miw4 ICs0Miw5IEBAIFdlYkluc3BlY3Rvci5ET01TdG9yYWdlQ29udGVudFZpZXcgPSBjbGFzcyBET01T dG9yYWdlQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJbnNwCiAgICAgICAgIGNvbHVtbnMudmFsdWUg PSB7dGl0bGU6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiVmFsdWUiKSwgc29ydGFibGU6IHRydWV9 OwogCiAgICAgICAgIHRoaXMuX2RhdGFHcmlkID0gbmV3IFdlYkluc3BlY3Rvci5EYXRhR3JpZChj b2x1bW5zLCB0aGlzLl9lZGl0aW5nQ2FsbGJhY2suYmluZCh0aGlzKSwgdGhpcy5fZGVsZXRlQ2Fs bGJhY2suYmluZCh0aGlzKSk7Ci0gICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRPcmRlclNldHRp bmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcoImRvbS1zdG9yYWdlLWNvbnRlbnQtdmlldy1z b3J0LW9yZGVyIiwgV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlNvcnRPcmRlci5Bc2NlbmRpbmcpOwot ICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0Q29sdW1uSWRlbnRpZmllclNldHRpbmcgPSBuZXcg V2ViSW5zcGVjdG9yLlNldHRpbmcoImRvbS1zdG9yYWdlLWNvbnRlbnQtdmlldy1zb3J0IiwgImtl eSIpOworICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0T3JkZXIgPSBXZWJJbnNwZWN0b3IuRGF0 YUdyaWQuU29ydE9yZGVyLkFzY2VuZGluZzsKKyAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydENv bHVtbklkZW50aWZpZXIgPSAia2V5IjsKKyAgICAgICAgdGhpcy5fZGF0YUdyaWQuY3JlYXRlU2V0 dGluZ3MoImRvbS1zdG9yYWdlLWNvbnRlbnQtdmlldyIpOwogICAgICAgICB0aGlzLl9kYXRhR3Jp ZC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5FdmVudC5Tb3J0Q2hhbmdl ZCwgdGhpcy5fc29ydERhdGFHcmlkLCB0aGlzKTsKIAogICAgICAgICB0aGlzLmFkZFN1YnZpZXco dGhpcy5fZGF0YUdyaWQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvRGF0YUdyaWQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9EYXRhR3JpZC5qcwppbmRleCA0NjBiMThhOGNiYTAwYzU4YWRhN2EzZjcx MzgzMDM1YTZiNTA2NDk4Li4zNTM1YWY5YjkzYTI0YTQ1ZmEzNGQyYjk2MmExZTkxZDYyYzJlOTBl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9E YXRhR3JpZC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9EYXRhR3JpZC5qcwpAQCAtMzIsNyArMzIsNyBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQgPSBj bGFzcyBEYXRhR3JpZCBleHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAgICAgICAgIHRoaXMuY29s dW1ucyA9IG5ldyBNYXA7CiAgICAgICAgIHRoaXMub3JkZXJlZENvbHVtbnMgPSBbXTsKIAotICAg ICAgICB0aGlzLl9pZGVudGlmaWVyID0gbnVsbDsKKyAgICAgICAgdGhpcy5fc2V0dGluZ3NJZGVu dGlmaWVyID0gbnVsbDsKICAgICAgICAgdGhpcy5fc29ydENvbHVtbklkZW50aWZpZXIgPSBudWxs OwogICAgICAgICB0aGlzLl9zb3J0Q29sdW1uSWRlbnRpZmllclNldHRpbmcgPSBudWxsOwogICAg ICAgICB0aGlzLl9zb3J0T3JkZXIgPSBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLklu ZGV0ZXJtaW5hdGU7CkBAIC0yMDksMjcgKzIwOSw2IEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZCA9 IGNsYXNzIERhdGFHcmlkIGV4dGVuZHMgV2ViSW5zcGVjdG9yLlZpZXcKICAgICAgICAgcmV0dXJu IGRhdGFHcmlkOwogICAgIH0KIAotICAgIGdldCBpZGVudGlmaWVyKCkgeyByZXR1cm4gdGhpcy5f aWRlbnRpZmllcjsgfQotCi0gICAgc2V0IGlkZW50aWZpZXIoeCkKLSAgICB7Ci0gICAgICAgIGNv bnNvbGUuYXNzZXJ0KHggJiYgdHlwZW9mIHggPT09ICJzdHJpbmciKTsKLQotICAgICAgICBpZiAo dGhpcy5faWRlbnRpZmllciA9PT0geCkKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICB0 aGlzLl9pZGVudGlmaWVyID0geDsKLQotICAgICAgICAvLyBGSVhNRTogQWRkIHNvcnRDb2x1bW5J ZGVudGlmaWVyU2V0dGluZyBhbmQgc29ydE9yZGVyU2V0dGluZyBhcyBwYXJ0IG9mIDx3ZWJraXQu b3JnL2IvMTU4Njc1Pi4KLSAgICAgICAgdGhpcy5faGlkZGVuQ29sdW1uU2V0dGluZyA9IG5ldyBX ZWJJbnNwZWN0b3IuU2V0dGluZyh0aGlzLl9pZGVudGlmaWVyICsgIi1oaWRkZW4tY29sdW1ucyIs IFtdKTsKLQotICAgICAgICBpZiAoIXRoaXMuY29sdW1ucykKLSAgICAgICAgICAgIHJldHVybjsK LQotICAgICAgICBmb3IgKGxldCBjb2x1bW5JZGVudGlmaWVyIG9mIHRoaXMuX2hpZGRlbkNvbHVt blNldHRpbmcudmFsdWUpCi0gICAgICAgICAgICB0aGlzLnNldENvbHVtblZpc2libGUoY29sdW1u SWRlbnRpZmllciwgZmFsc2UpOwotICAgIH0KLQogICAgIGdldCBjb2x1bW5DaG9vc2VyRW5hYmxl ZCgpIHsgcmV0dXJuIHRoaXMuX2NvbHVtbkNob29zZXJFbmFibGVkOyB9CiAgICAgc2V0IGNvbHVt bkNob29zZXJFbmFibGVkKHgpIHsgdGhpcy5fY29sdW1uQ2hvb3NlckVuYWJsZWQgPSB4OyB9CiAK QEAgLTI2OSwxNSArMjQ4LDYgQEAgV2ViSW5zcGVjdG9yLkRhdGFHcmlkID0gY2xhc3MgRGF0YUdy aWQgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRU b0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRGF0YUdyaWQuRXZlbnQuU29ydENoYW5nZWQpOwogICAg IH0KIAotICAgIHNldCBzb3J0T3JkZXJTZXR0aW5nKHNldHRpbmcpCi0gICAgewotICAgICAgICBj b25zb2xlLmFzc2VydChzZXR0aW5nIGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlNldHRpbmcpOwot Ci0gICAgICAgIHRoaXMuX3NvcnRPcmRlclNldHRpbmcgPSBzZXR0aW5nOwotICAgICAgICBpZiAo dGhpcy5fc29ydE9yZGVyU2V0dGluZy52YWx1ZSkKLSAgICAgICAgICAgIHRoaXMuc29ydE9yZGVy ID0gdGhpcy5fc29ydE9yZGVyU2V0dGluZy52YWx1ZTsKLSAgICB9Ci0KICAgICBnZXQgc29ydENv bHVtbklkZW50aWZpZXIoKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX3NvcnRDb2x1bW5J ZGVudGlmaWVyOwpAQCAtMjk2LDE1ICsyNjYsNiBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQgPSBj bGFzcyBEYXRhR3JpZCBleHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAgICAgICAgIHRoaXMuX3Vw ZGF0ZVNvcnRlZENvbHVtbihvbGRTb3J0Q29sdW1uSWRlbnRpZmllcik7CiAgICAgfQogCi0gICAg c2V0IHNvcnRDb2x1bW5JZGVudGlmaWVyU2V0dGluZyhzZXR0aW5nKQotICAgIHsKLSAgICAgICAg Y29uc29sZS5hc3NlcnQoc2V0dGluZyBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5TZXR0aW5nKTsK LQotICAgICAgICB0aGlzLl9zb3J0Q29sdW1uSWRlbnRpZmllclNldHRpbmcgPSBzZXR0aW5nOwot ICAgICAgICBpZiAodGhpcy5fc29ydENvbHVtbklkZW50aWZpZXJTZXR0aW5nLnZhbHVlKQotICAg ICAgICAgICAgdGhpcy5zb3J0Q29sdW1uSWRlbnRpZmllciA9IHRoaXMuX3NvcnRDb2x1bW5JZGVu dGlmaWVyU2V0dGluZy52YWx1ZTsKLSAgICB9Ci0KICAgICBnZXQgaW5saW5lKCkgeyByZXR1cm4g dGhpcy5faW5saW5lOyB9CiAKICAgICBzZXQgaW5saW5lKHgpCkBAIC0zNzcsNiArMzM4LDMwIEBA IFdlYkluc3BlY3Rvci5EYXRhR3JpZCA9IGNsYXNzIERhdGFHcmlkIGV4dGVuZHMgV2ViSW5zcGVj dG9yLlZpZXcKICAgICAgICAgcmV0dXJuIHRoaXMuX2ZpbHRlckRlbGVnYXRlLmRhdGFHcmlkTWF0 Y2hOb2RlQWdhaW5zdEN1c3RvbUZpbHRlcnMobm9kZSk7CiAgICAgfQogCisgICAgY3JlYXRlU2V0 dGluZ3MoaWRlbnRpZmllcikKKyAgICB7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGlkZW50aWZp ZXIgJiYgdHlwZW9mIGlkZW50aWZpZXIgPT09ICJzdHJpbmciKTsKKyAgICAgICAgaWYgKHRoaXMu X3NldHRpbmdzSWRlbnRpZmllciA9PT0gaWRlbnRpZmllcikKKyAgICAgICAgICAgIHJldHVybjsK KworICAgICAgICB0aGlzLl9zZXR0aW5nc0lkZW50aWZpZXIgPSBpZGVudGlmaWVyOworCisgICAg ICAgIHRoaXMuX3NvcnRDb2x1bW5JZGVudGlmaWVyU2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0b3Iu U2V0dGluZyh0aGlzLl9zZXR0aW5nc0lkZW50aWZpZXIgKyAiLXNvcnQiLCB0aGlzLl9zb3J0Q29s dW1uSWRlbnRpZmllcik7CisgICAgICAgIHRoaXMuX3NvcnRPcmRlclNldHRpbmcgPSBuZXcgV2Vi SW5zcGVjdG9yLlNldHRpbmcodGhpcy5fc2V0dGluZ3NJZGVudGlmaWVyICsgIi1zb3J0LW9yZGVy IiwgdGhpcy5fc29ydE9yZGVyKTsKKyAgICAgICAgdGhpcy5faGlkZGVuQ29sdW1uU2V0dGluZyA9 IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZyh0aGlzLl9zZXR0aW5nc0lkZW50aWZpZXIgKyAiLWhp ZGRlbi1jb2x1bW5zIiwgW10pOworCisgICAgICAgIGlmICghdGhpcy5jb2x1bW5zKQorICAgICAg ICAgICAgcmV0dXJuOworCisgICAgICAgIGlmICh0aGlzLl9zb3J0Q29sdW1uSWRlbnRpZmllclNl dHRpbmcudmFsdWUpIHsKKyAgICAgICAgICAgIHRoaXMuc29ydENvbHVtbklkZW50aWZpZXIgPSB0 aGlzLl9zb3J0Q29sdW1uSWRlbnRpZmllclNldHRpbmcudmFsdWU7CisgICAgICAgICAgICB0aGlz LnNvcnRPcmRlciA9IHRoaXMuX3NvcnRPcmRlclNldHRpbmcudmFsdWU7CisgICAgICAgIH0KKwor ICAgICAgICBmb3IgKGxldCBjb2x1bW5JZGVudGlmaWVyIG9mIHRoaXMuX2hpZGRlbkNvbHVtblNl dHRpbmcudmFsdWUpCisgICAgICAgICAgICB0aGlzLnNob3dDb2x1bW4oY29sdW1uSWRlbnRpZmll ciwgZmFsc2UpOworICAgIH0KKwogICAgIF91cGRhdGVTY3JvbGxMaXN0ZW5lcnMoKQogICAgIHsK ICAgICAgICAgaWYgKHRoaXMuX2lubGluZSB8fCB0aGlzLl92YXJpYWJsZUhlaWdodFJvd3MpIHsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0hl YXBBbGxvY2F0aW9uc1RpbWVsaW5lVmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0hlYXBBbGxvY2F0aW9uc1RpbWVsaW5lVmlldy5qcwppbmRleCBkMTFh MWJlOTgzODgxZWNjOWEzODc4MDA5MDBlNDYwY2U3YjEzZGY0Li4xNTA0ZTk0MTFiMTIwMWI0ZjNl YWE2NTU3NGY1ZjQ5M2Y5YmU1MGUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9IZWFwQWxsb2NhdGlvbnNUaW1lbGluZVZpZXcuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSGVhcEFsbG9jYXRpb25z VGltZWxpbmVWaWV3LmpzCkBAIC03Nyw5ICs3NywxMSBAQCBXZWJJbnNwZWN0b3IuSGVhcEFsbG9j YXRpb25zVGltZWxpbmVWaWV3ID0gY2xhc3MgSGVhcEFsbG9jYXRpb25zVGltZWxpbmVWaWV3IGV4 dAogICAgICAgICB0aGlzLl9zbmFwc2hvdExpc3RQYXRoQ29tcG9uZW50LmFkZEV2ZW50TGlzdGVu ZXIoV2ViSW5zcGVjdG9yLkhpZXJhcmNoaWNhbFBhdGhDb21wb25lbnQuRXZlbnQuQ2xpY2tlZCwg dGhpcy5fc25hcHNob3RMaXN0UGF0aENvbXBvbmVudENsaWNrZWQsIHRoaXMpOwogCiAgICAgICAg IHRoaXMuX2RhdGFHcmlkID0gbmV3IFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkKGNvbHVt bnMpOwotICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0Q29sdW1uSWRlbnRpZmllclNldHRpbmcg PSBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcoImhlYXAtYWxsb2NhdGlvbnMtdGltZWxpbmUtdmll dy1zb3J0IiwgInRpbWVzdGFtcCIpOwotICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0T3JkZXJT ZXR0aW5nID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0aW5nKCJoZWFwLWFsbG9jYXRpb25zLXRpbWVs aW5lLXZpZXctc29ydC1vcmRlciIsIFdlYkluc3BlY3Rvci5EYXRhR3JpZC5Tb3J0T3JkZXIuQXNj ZW5kaW5nKTsKKyAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydENvbHVtbklkZW50aWZpZXIgPSAi dGltZXN0YW1wIjsKKyAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydE9yZGVyID0gV2ViSW5zcGVj dG9yLkRhdGFHcmlkLlNvcnRPcmRlci5Bc2NlbmRpbmc7CisgICAgICAgIHRoaXMuX2RhdGFHcmlk LmNyZWF0ZVNldHRpbmdzKCJoZWFwLWFsbG9jYXRpb25zLXRpbWVsaW5lLXZpZXciKTsKICAgICAg ICAgdGhpcy5fZGF0YUdyaWQuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGF0YUdyaWQu RXZlbnQuU2VsZWN0ZWROb2RlQ2hhbmdlZCwgdGhpcy5fZGF0YUdyaWROb2RlU2VsZWN0ZWQsIHRo aXMpOworCiAgICAgICAgIHRoaXMuYWRkU3Vidmlldyh0aGlzLl9kYXRhR3JpZCk7CiAKICAgICAg ICAgdGhpcy5fY29udGVudFZpZXdDb250YWluZXIgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnRlbnRW aWV3Q29udGFpbmVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvSGVhcFNuYXBzaG90Q29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9IZWFwU25hcHNob3RDb250ZW50Vmlldy5qcwppbmRl eCBiOWU2NWM0YWFmMGJlNjE2NDdkNDllYmZhMTVkMzc5NGU5OGY0NTZhLi4wYzcyNTA0ZjRkYTM0 MmE0ZGZhNTc1MGE5MGQ4YWFjMzRiZjQ2YzZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9IZWFwU25hcHNob3RDb250ZW50Vmlldy5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9IZWFwU25hcHNob3RD b250ZW50Vmlldy5qcwpAQCAtMzQsOCArMzQsOSBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90 Q29udGVudFZpZXcgPSBjbGFzcyBIZWFwU25hcHNob3RDb250ZW50VmlldyBleHRlbmRzIFdlYgog ICAgICAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiaGVhcC1zbmFwc2hvdCIpOwogCiAg ICAgICAgIHRoaXMuX2RhdGFHcmlkID0gbmV3IFdlYkluc3BlY3Rvci5EYXRhR3JpZChjb2x1bW5z KTsKLSAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydENvbHVtbklkZW50aWZpZXJTZXR0aW5nID0g bmV3IFdlYkluc3BlY3Rvci5TZXR0aW5nKGlkZW50aWZpZXIgKyAiLXNvcnQiLCAicmV0YWluZWRT aXplIik7Ci0gICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRPcmRlclNldHRpbmcgPSBuZXcgV2Vi SW5zcGVjdG9yLlNldHRpbmcoaWRlbnRpZmllciArICItc29ydC1vcmRlciIsIFdlYkluc3BlY3Rv ci5EYXRhR3JpZC5Tb3J0T3JkZXIuRGVzY2VuZGluZyk7CisgICAgICAgIHRoaXMuX2RhdGFHcmlk LnNvcnRDb2x1bW5JZGVudGlmaWVyID0gInJldGFpbmVkU2l6ZSI7CisgICAgICAgIHRoaXMuX2Rh dGFHcmlkLnNvcnRPcmRlciA9IFdlYkluc3BlY3Rvci5EYXRhR3JpZC5Tb3J0T3JkZXIuRGVzY2Vu ZGluZzsKKyAgICAgICAgdGhpcy5fZGF0YUdyaWQuY3JlYXRlU2V0dGluZ3MoaWRlbnRpZmllcik7 CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRh dGFHcmlkLkV2ZW50LlNvcnRDaGFuZ2VkLCB0aGlzLl9zb3J0RGF0YUdyaWQsIHRoaXMpOwogCiAg ICAgICAgIGxldCBzb3J0Q29tcGFyYXRvciA9IFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3REYXRh R3JpZFRyZWUuYnVpbGRTb3J0Q29tcGFyYXRvcih0aGlzLl9kYXRhR3JpZC5zb3J0Q29sdW1uSWRl bnRpZmllciwgdGhpcy5fZGF0YUdyaWQuc29ydE9yZGVyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyVHJlZURldGFpbHNTaWRlYmFy UGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXll clRyZWVEZXRhaWxzU2lkZWJhclBhbmVsLmpzCmluZGV4IGUzNWQ2NzA0MjBlODc0MzRlNDE5NjA2 M2JjZDg0YTM1ODZiMWVjYTYuLjM4NWJmNzcyMzI2ZWMzMTMxN2NhNmFlZGFkZGVlNTYxMzBjOGRh NGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0xheWVyVHJlZURldGFpbHNTaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJUcmVlRGV0YWlsc1NpZGViYXJQYW5lbC5qcwpA QCAtMTQyLDggKzE0Miw5IEBAIFdlYkluc3BlY3Rvci5MYXllclRyZWVEZXRhaWxzU2lkZWJhclBh bmVsID0gY2xhc3MgTGF5ZXJUcmVlRGV0YWlsc1NpZGViYXJQYW5lbCBlCiAgICAgICAgIHRoaXMu X2RhdGFHcmlkLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLkV2ZW50LlNv cnRDaGFuZ2VkLCB0aGlzLl9zb3J0RGF0YUdyaWQsIHRoaXMpOwogICAgICAgICB0aGlzLl9kYXRh R3JpZC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5FdmVudC5TZWxlY3Rl ZE5vZGVDaGFuZ2VkLCB0aGlzLl9zZWxlY3RlZERhdGFHcmlkTm9kZUNoYW5nZWQsIHRoaXMpOwog Ci0gICAgICAgIHRoaXMuc29ydENvbHVtbklkZW50aWZpZXJTZXR0aW5nID0gbmV3IFdlYkluc3Bl Y3Rvci5TZXR0aW5nKCJsYXllci10cmVlLWRldGFpbHMtc2lkZWJhci1wYW5lbC1zb3J0IiwgIm1l bW9yeSIpOwotICAgICAgICB0aGlzLnNvcnRPcmRlclNldHRpbmcgPSBuZXcgV2ViSW5zcGVjdG9y LlNldHRpbmcoImxheWVyLXRyZWUtZGV0YWlscy1zaWRlYmFyLXBhbmVsLXNvcnQtb3JkZXIiLCBX ZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkRlc2NlbmRpbmcpOworICAgICAgICB0aGlz Ll9kYXRhR3JpZC5zb3J0Q29sdW1uSWRlbnRpZmllciA9ICJtZW1vcnkiOworICAgICAgICB0aGlz Ll9kYXRhR3JpZC5zb3J0T3JkZXIgPSBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkRl c2NlbmRpbmc7CisgICAgICAgIHRoaXMuX2RhdGFHcmlkLmNyZWF0ZVNldHRpbmdzKCJsYXllci10 cmVlLWRldGFpbHMtc2lkZWJhci1wYW5lbCIpOwogCiAgICAgICAgIHZhciBlbGVtZW50ID0gdGhp cy5fZGF0YUdyaWQuZWxlbWVudDsKICAgICAgICAgZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJm b2N1cyIsIHRoaXMuX2RhdGFHcmlkR2FpbmVkRm9jdXMuYmluZCh0aGlzKSwgZmFsc2UpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0 VGltZWxpbmVWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvTGF5b3V0VGltZWxpbmVWaWV3LmpzCmluZGV4IDQyNjlkNzliOTdhMmE1YmZkODU2MTA3YWRm YmVhZjk4ZmE2MTgyOTguLmRkOTUyYmM0OWMzY2YyMzI2MWI5NTY4YjdmM2QwMjU3ZWNkMWZiMjIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xh eW91dFRpbWVsaW5lVmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9MYXlvdXRUaW1lbGluZVZpZXcuanMKQEAgLTc3LDExICs3Nyw5IEBAIFdlYklu c3BlY3Rvci5MYXlvdXRUaW1lbGluZVZpZXcgPSBjbGFzcyBMYXlvdXRUaW1lbGluZVZpZXcgZXh0 ZW5kcyBXZWJJbnNwZWN0b3IuCiAKICAgICAgICAgdGhpcy5zZXR1cERhdGFHcmlkKHRoaXMuX2Rh dGFHcmlkKTsKIAotICAgICAgICB0aGlzLl9kYXRhR3JpZC5pZGVudGlmaWVyID0gImxheW91dC10 aW1lbGluZS12aWV3IjsKLQotICAgICAgICAvLyBGSVhNRTogUmVtb3ZlIG9uY2UgPHdlYmtpdC5v cmcvYi8xNTg2NzU+IGlzIGZpeGVkLgotICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0Q29sdW1u SWRlbnRpZmllclNldHRpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcoImxheW91dC10aW1l bGluZS12aWV3LXNvcnQiLCAic3RhcnRUaW1lIik7Ci0gICAgICAgIHRoaXMuX2RhdGFHcmlkLnNv cnRPcmRlclNldHRpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcoImxheW91dC10aW1lbGlu ZS12aWV3LXNvcnQtb3JkZXIiLCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkFzY2Vu ZGluZyk7CisgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRDb2x1bW5JZGVudGlmaWVyID0gInN0 YXJ0VGltZSI7CisgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRPcmRlciA9IFdlYkluc3BlY3Rv ci5EYXRhR3JpZC5Tb3J0T3JkZXIuQXNjZW5kaW5nOworICAgICAgICB0aGlzLl9kYXRhR3JpZC5j cmVhdGVTZXR0aW5ncygibGF5b3V0LXRpbWVsaW5lLXZpZXciKTsKIAogICAgICAgICB0aGlzLl9o b3ZlcmVkVHJlZUVsZW1lbnQgPSBudWxsOwogICAgICAgICB0aGlzLl9ob3ZlcmVkRGF0YUdyaWRO b2RlID0gbnVsbDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL05ldHdvcmtHcmlkQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrR3JpZENvbnRlbnRWaWV3LmpzCmluZGV4IDU5 YmU4ZjdiNzE4ODU1ZTRlYjczNjM3MmVkNGZkNDE0OGZhODAyNWIuLmNhYjQ5NWYyMGY0NTY0MTI0 NGE1Yzk3ZTUzMTZjMTZhN2UzZjRjYTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtHcmlkQ29udGVudFZpZXcuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya0dyaWRDb250ZW50 Vmlldy5qcwpAQCAtODIsOCArODIsOSBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0dyaWRDb250ZW50 VmlldyA9IGNsYXNzIE5ldHdvcmtHcmlkQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJbgogCiAgICAg ICAgIHRoaXMuX2RhdGFHcmlkID0gbmV3IFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkKGNv bHVtbnMsIHRoaXMuX2NvbnRlbnRUcmVlT3V0bGluZSk7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlk LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLkV2ZW50LlNlbGVjdGVkTm9k ZUNoYW5nZWQsIHRoaXMuX2RhdGFHcmlkTm9kZVNlbGVjdGVkLCB0aGlzKTsKLSAgICAgICAgdGhp cy5fZGF0YUdyaWQuc29ydENvbHVtbklkZW50aWZpZXJTZXR0aW5nID0gbmV3IFdlYkluc3BlY3Rv ci5TZXR0aW5nKCJuZXR3b3JrLWdyaWQtY29udGVudC12aWV3LXNvcnQiLCAicmVxdWVzdFNlbnQi KTsKLSAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydE9yZGVyU2V0dGluZyA9IG5ldyBXZWJJbnNw ZWN0b3IuU2V0dGluZygibmV0d29yay1ncmlkLWNvbnRlbnQtdmlldy1zb3J0LW9yZGVyIiwgV2Vi SW5zcGVjdG9yLkRhdGFHcmlkLlNvcnRPcmRlci5Bc2NlbmRpbmcpOworICAgICAgICB0aGlzLl9k YXRhR3JpZC5zb3J0Q29sdW1uSWRlbnRpZmllciA9ICJyZXF1ZXN0U2VudCI7CisgICAgICAgIHRo aXMuX2RhdGFHcmlkLnNvcnRPcmRlciA9IFdlYkluc3BlY3Rvci5EYXRhR3JpZC5Tb3J0T3JkZXIu QXNjZW5kaW5nOworICAgICAgICB0aGlzLl9kYXRhR3JpZC5jcmVhdGVTZXR0aW5ncygibmV0d29y ay1ncmlkLWNvbnRlbnQtdmlldyIpOwogCiAgICAgICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3Qu YWRkKCJuZXR3b3JrLWdyaWQiKTsKICAgICAgICAgdGhpcy5hZGRTdWJ2aWV3KHRoaXMuX2RhdGFH cmlkKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL05ldHdvcmtUaW1lbGluZVZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9OZXR3b3JrVGltZWxpbmVWaWV3LmpzCmluZGV4IGNlYWNjYTAxZGMwMWQ3 MjI4NTZkYjc2Yzk1NWQwMmVlOTZiYTIxODQuLjM4NDY0MmQ4YTk4YmI5OTc4ODU3MmUzMTUzODNk ODZmMmYyZDljZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL05ldHdvcmtUaW1lbGluZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RpbWVsaW5lVmlldy5qcwpAQCAtODksMTIg Kzg5LDEwIEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrVGltZWxpbmVWaWV3ID0gY2xhc3MgTmV0d29y a1RpbWVsaW5lVmlldyBleHRlbmRzIFdlYkluc3BlY3RvCiAgICAgICAgICAgICBjb2x1bW5zW2Nv bHVtbl0uc29ydGFibGUgPSB0cnVlOwogCiAgICAgICAgIHRoaXMuX2RhdGFHcmlkID0gbmV3IFdl Ykluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkKGNvbHVtbnMpOwotICAgICAgICB0aGlzLl9kYXRh R3JpZC5pZGVudGlmaWVyID0gIm5ldHdvcmstdGltZWxpbmUtdmlldyI7CiAgICAgICAgIHRoaXMu X2RhdGFHcmlkLnNvcnREZWxlZ2F0ZSA9IHRoaXM7Ci0KLSAgICAgICAgLy8gRklYTUU6IFJlbW92 ZSBvbmNlIDx3ZWJraXQub3JnL2IvMTU4Njc1PiBpcyBmaXhlZC4KLSAgICAgICAgdGhpcy5fZGF0 YUdyaWQuc29ydENvbHVtbklkZW50aWZpZXJTZXR0aW5nID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0 aW5nKCJuZXR3b3JrLXRpbWVsaW5lLXZpZXctc29ydCIsICJyZXF1ZXN0U2VudCIpOwotICAgICAg ICB0aGlzLl9kYXRhR3JpZC5zb3J0T3JkZXJTZXR0aW5nID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0 aW5nKCJuZXR3b3JrLXRpbWVsaW5lLXZpZXctc29ydC1vcmRlciIsIFdlYkluc3BlY3Rvci5EYXRh R3JpZC5Tb3J0T3JkZXIuQXNjZW5kaW5nKTsKKyAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydENv bHVtbklkZW50aWZpZXIgPSAicmVxdWVzdFNlbnQiOworICAgICAgICB0aGlzLl9kYXRhR3JpZC5z b3J0T3JkZXIgPSBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkFzY2VuZGluZzsKKyAg ICAgICAgdGhpcy5fZGF0YUdyaWQuY3JlYXRlU2V0dGluZ3MoIm5ldHdvcmstdGltZWxpbmUtdmll dyIpOwogCiAgICAgICAgIHRoaXMuc2V0dXBEYXRhR3JpZCh0aGlzLl9kYXRhR3JpZCk7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Byb2Zp bGVWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUHJv ZmlsZVZpZXcuanMKaW5kZXggYTRiMzUyZWFkMWZhMWIyODY3ZGYxZWIyNWU1NmQxMDc4OTBmYjQ2 Yy4uNjQ5MmZjZWMyZTgzMWZkNzA0NWIzYTI3YTgzOTg2ODcyMDE3YjU2NSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUHJvZmlsZVZpZXcuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUHJvZmlsZVZp ZXcuanMKQEAgLTY1LDggKzY1LDkgQEAgV2ViSW5zcGVjdG9yLlByb2ZpbGVWaWV3ID0gY2xhc3Mg UHJvZmlsZVZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuQ29udGVudFZpZXcKICAgICAgICAgdGhp cy5fZGF0YUdyaWQuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZW92ZXIiLCB0aGlzLl9t b3VzZU92ZXJEYXRhR3JpZC5iaW5kKHRoaXMpKTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuZWxl bWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWxlYXZlIiwgdGhpcy5fbW91c2VMZWF2ZURhdGFH cmlkLmJpbmQodGhpcykpOwogICAgICAgICB0aGlzLl9kYXRhR3JpZC5pbmRlbnRXaWR0aCA9IDIw OwotICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0Q29sdW1uSWRlbnRpZmllclNldHRpbmcgPSBu ZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcoInByb2ZpbGUtdmlldy1zb3J0IiwgInRvdGFsVGltZSIp OwotICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0T3JkZXJTZXR0aW5nID0gbmV3IFdlYkluc3Bl Y3Rvci5TZXR0aW5nKCJwcm9maWxlLXZpZXctc29ydC1vcmRlciIsIFdlYkluc3BlY3Rvci5EYXRh R3JpZC5Tb3J0T3JkZXIuRGVzY2VuZGluZyk7CisgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRD b2x1bW5JZGVudGlmaWVyID0gInRvdGFsVGltZSI7CisgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNv cnRPcmRlciA9IFdlYkluc3BlY3Rvci5EYXRhR3JpZC5Tb3J0T3JkZXIuRGVzY2VuZGluZzsKKyAg ICAgICAgdGhpcy5fZGF0YUdyaWQuY3JlYXRlU2V0dGluZ3MoInByb2ZpbGUtdmlldyIpOwogCiAg ICAgICAgIHRoaXMuYWRkU3Vidmlldyh0aGlzLl9kYXRhR3JpZCk7CiAgICAgfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVuZGVyaW5nRnJh bWVUaW1lbGluZVZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldy5qcwppbmRleCBmMjVhYzZjNGVkZGFmNjM3 NzNmNjE0NzMxYmIyNGQwMzg5Y2NiNDA0Li41YjcyODkwMDdjNjM2MzY5N2JlYmRmMDA4YzI2YzBl MDczMjljYTlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldy5q cwpAQCAtNzgsMTEgKzc4LDkgQEAgV2ViSW5zcGVjdG9yLlJlbmRlcmluZ0ZyYW1lVGltZWxpbmVW aWV3ID0gY2xhc3MgUmVuZGVyaW5nRnJhbWVUaW1lbGluZVZpZXcgZXh0ZW4KICAgICAgICAgICAg IGNvbHVtbnNbY29sdW1uXS5zb3J0YWJsZSA9IHRydWU7CiAKICAgICAgICAgdGhpcy5fZGF0YUdy aWQgPSBuZXcgV2ViSW5zcGVjdG9yLlRpbWVsaW5lRGF0YUdyaWQoY29sdW1ucyk7Ci0gICAgICAg IHRoaXMuX2RhdGFHcmlkLmlkZW50aWZpZXIgPSAicmVuZGVyaW5nLWZyYW1lLXRpbWVsaW5lLXZp ZXciOwotCi0gICAgICAgIC8vIEZJWE1FOiBSZW1vdmUgb25jZSA8d2Via2l0Lm9yZy9iLzE1ODY3 NT4gaXMgZml4ZWQuCi0gICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRDb2x1bW5JZGVudGlmaWVy U2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZygicmVuZGVyaW5nLWZyYW1lLXRpbWVs aW5lLXZpZXctc29ydCIsICJzdGFydFRpbWUiKTsKLSAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29y dE9yZGVyU2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZygicmVuZGVyaW5nLWZyYW1l LXRpbWVsaW5lLXZpZXctc29ydC1vcmRlciIsIFdlYkluc3BlY3Rvci5EYXRhR3JpZC5Tb3J0T3Jk ZXIuQXNjZW5kaW5nKTsKKyAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydENvbHVtbklkZW50aWZp ZXIgPSAic3RhcnRUaW1lIjsKKyAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydE9yZGVyID0gV2Vi SW5zcGVjdG9yLkRhdGFHcmlkLlNvcnRPcmRlci5Bc2NlbmRpbmc7CisgICAgICAgIHRoaXMuX2Rh dGFHcmlkLmNyZWF0ZVNldHRpbmdzKCJyZW5kZXJpbmctZnJhbWUtdGltZWxpbmUtdmlldyIpOwog CiAgICAgICAgIHRoaXMuc2V0dXBEYXRhR3JpZCh0aGlzLl9kYXRhR3JpZCk7CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdERldGFp bHNUaW1lbGluZVZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9TY3JpcHREZXRhaWxzVGltZWxpbmVWaWV3LmpzCmluZGV4IDA5YWRlZmE4N2Q5MmIxOWE0 MjVjNWMwYmVkMGE1MWFmZDZhMDVhNmIuLjZhYTAxYzg3ODA2M2RlZTUyNTZmZWNkZjZhNjliMTQy MDI0YWMxNTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1NjcmlwdERldGFpbHNUaW1lbGluZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0RGV0YWlsc1RpbWVsaW5lVmlldy5qcwpA QCAtNzMsMTIgKzczLDEwIEBAIFdlYkluc3BlY3Rvci5TY3JpcHREZXRhaWxzVGltZWxpbmVWaWV3 ID0gY2xhc3MgU2NyaXB0RGV0YWlsc1RpbWVsaW5lVmlldyBleHRlbmRzCiAgICAgICAgICAgICBj b2x1bW5zW2NvbHVtbl0uc29ydGFibGUgPSB0cnVlOwogCiAgICAgICAgIHRoaXMuX2RhdGFHcmlk ID0gbmV3IFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZURhdGFHcmlkKGNvbHVtbnMpOwotICAg ICAgICB0aGlzLl9kYXRhR3JpZC5pZGVudGlmaWVyID0gInNjcmlwdC10aW1lbGluZS12aWV3IjsK ICAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydERlbGVnYXRlID0gdGhpczsKLQotICAgICAgICAv LyBGSVhNRTogUmVtb3ZlIG9uY2UgPHdlYmtpdC5vcmcvYi8xNTg2NzU+IGlzIGZpeGVkLgotICAg ICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0Q29sdW1uSWRlbnRpZmllclNldHRpbmcgPSBuZXcgV2Vi SW5zcGVjdG9yLlNldHRpbmcoInNjcmlwdC10aW1lbGluZS12aWV3LXNvcnQiLCAic3RhcnRUaW1l Iik7Ci0gICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRPcmRlclNldHRpbmcgPSBuZXcgV2ViSW5z cGVjdG9yLlNldHRpbmcoInNjcmlwdC10aW1lbGluZS12aWV3LXNvcnQtb3JkZXIiLCBXZWJJbnNw ZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkFzY2VuZGluZyk7CisgICAgICAgIHRoaXMuX2RhdGFH cmlkLnNvcnRDb2x1bW5JZGVudGlmaWVyID0gInN0YXJ0VGltZSI7CisgICAgICAgIHRoaXMuX2Rh dGFHcmlkLnNvcnRPcmRlciA9IFdlYkluc3BlY3Rvci5EYXRhR3JpZC5Tb3J0T3JkZXIuQXNjZW5k aW5nOworICAgICAgICB0aGlzLl9kYXRhR3JpZC5jcmVhdGVTZXR0aW5ncygic2NyaXB0LXRpbWVs aW5lLXZpZXciKTsKIAogICAgICAgICB0aGlzLnNldHVwRGF0YUdyaWQodGhpcy5fZGF0YUdyaWQp OwogCg==