172861 2017-06-02 09:53:34 -0700 ResourceLoadStatistics are not using unique paths during test runs 2017-06-02 17:20:41 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham cdumez aestes beidson bfulgham cdumez commit-queue darin webkit-bug-importer wilander oldest_to_newest 1315077 0 bfulgham 2017-06-02 09:53:34 -0700 The ResourceLoadStatistics data store is not being set to a unique path when running tests, causing multiple processes to interact with the same file on disk. This is causing crashes in the test system. 1315201 1 cdumez 2017-06-02 13:53:25 -0700 <rdar://problem/32442251> 1315221 2 311863 cdumez 2017-06-02 14:41:38 -0700 Created attachment 311863 Patch 1315231 3 311863 bfulgham 2017-06-02 14:59:09 -0700 Comment on attachment 311863 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=311863&action=review > Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp:71 > + configuration->m_resourceLoadStatisticsDirectory = legacyConfiguration.resourceLoadStatisticsDirectory; Do we need this same change in ProcessPoolConfiguration::createWithLegacyOptions? 1315241 4 311863 cdumez 2017-06-02 15:11:15 -0700 Comment on attachment 311863 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=311863&action=review >> Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp:71 >> + configuration->m_resourceLoadStatisticsDirectory = legacyConfiguration.resourceLoadStatisticsDirectory; > > Do we need this same change in ProcessPoolConfiguration::createWithLegacyOptions? ProcessPoolConfiguration::createWithLegacyOptions() calls ProcessPoolConfiguration::create(), which will call the default constructor of ProcessPoolConfiguration which initializes m_resourceLoadStatisticsDirectory to WebsiteDataStore::defaultResourceLoadStatisticsDirectory() (in my patch). So it looks fine to me. Am I missing something? I don't think we have a legacy path for resource statistics so I assume using the default one is fine? 1315286 5 311863 commit-queue 2017-06-02 16:48:54 -0700 Comment on attachment 311863 Patch Clearing flags on attachment: 311863 Committed r217743: <http://trac.webkit.org/changeset/217743> 1315287 6 commit-queue 2017-06-02 16:48:55 -0700 All reviewed patches have been landed. Closing bug. 1315307 7 311863 bfulgham 2017-06-02 17:20:41 -0700 Comment on attachment 311863 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=311863&action=review >>> Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp:71 >>> + configuration->m_resourceLoadStatisticsDirectory = legacyConfiguration.resourceLoadStatisticsDirectory; >> >> Do we need this same change in ProcessPoolConfiguration::createWithLegacyOptions? > > ProcessPoolConfiguration::createWithLegacyOptions() calls ProcessPoolConfiguration::create(), which will call the default constructor of ProcessPoolConfiguration which initializes m_resourceLoadStatisticsDirectory to WebsiteDataStore::defaultResourceLoadStatisticsDirectory() (in my patch). So it looks fine to me. Am I missing something? I don't think we have a legacy path for resource statistics so I assume using the default one is fine? You are right: we have no legacy data to worry about here. 311863 2017-06-02 14:41:38 -0700 2017-06-02 16:48:54 -0700 Patch bug-172861-20170602144137.patch text/plain 10574 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE3NzMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZTg4ZDAxMTRhOWNkMGY3 MzE2OTAyOGM5MGZjNzFkMDMzNWIwMzZjNS4uOWQ0ZTYxMDg4NmM1M2Y3ZjYzZDllMDMwZTYzNTdj NjgwMDJkNzEyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDE3LTA2LTAyICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgUmVzb3VyY2VMb2FkU3RhdGlz dGljcyBhcmUgbm90IHVzaW5nIHVuaXF1ZSBwYXRocyBkdXJpbmcgdGVzdCBydW5zCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzI4NjEKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzMyNDQyMjUxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEFkZCBXS0NvbnRleHRDb25maWd1cmF0aW9uU2V0UmVzb3VyY2VM b2FkU3RhdGlzdGljc0RpcmVjdG9yeSgpIEMgQVBJIHRvIGFsbG93CisgICAgICAgIFdLVFIgdG8g dXNlIGEgY3VzdG9tIGRpcmVjdG9yeS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQVBJUHJv Y2Vzc1Bvb2xDb25maWd1cmF0aW9uLmNwcDoKKyAgICAgICAgKEFQSTo6UHJvY2Vzc1Bvb2xDb25m aWd1cmF0aW9uOjpjcmVhdGVXaXRoV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24pOgorICAg ICAgICAoQVBJOjpQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb246OlByb2Nlc3NQb29sQ29uZmlndXJh dGlvbik6CisgICAgICAgIChBUEk6OlByb2Nlc3NQb29sQ29uZmlndXJhdGlvbjo6Y29weSk6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9BUElQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uaDoKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZi5jcHA6Cisg ICAgICAgIChXS0NvbnRleHRDb25maWd1cmF0aW9uQ29weVJlc291cmNlTG9hZFN0YXRpc3RpY3NE aXJlY3RvcnkpOgorICAgICAgICAoV0tDb250ZXh0Q29uZmlndXJhdGlvblNldFJlc291cmNlTG9h ZFN0YXRpc3RpY3NEaXJlY3RvcnkpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS0NvbnRl eHRDb25maWd1cmF0aW9uUmVmLmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29s LmNwcDoKKyAgICAgICAgKFdlYktpdDo6bGVnYWN5V2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRp b24pOgorCisyMDE3LTA2LTAyICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKICAg ICAgICAgUkVHUkVTU0lPTiAocjIwNjM4Nik6IFhhY3RpbWF0ZSBXZWJzaXRlIENyYXNoZXMgQCBj b20uYXBwbGUuV2ViS2l0OiBXZWJLaXQ6Ok5QUnVudGltZU9iamVjdE1hcDo6Y29udmVydEpTVmFs dWVUb05QVmFyaWFudCArIDI1NQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTcyODQ2CiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMTA5MzAwNT4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJUHJvY2Vzc1Bvb2xDb25m aWd1cmF0aW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJUHJvY2Vzc1Bv b2xDb25maWd1cmF0aW9uLmNwcAppbmRleCAzYmYyYTFjNDBjZmE5ZTUzM2MxNTgzMjg4YjI2NDQ4 N2YxOWEyMGRhLi4xZmRlMDE0YzdiMTljZjhiZDAxYjI5ZDNkOTdlNTUzNGYzYjFhMjk4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQb29sQ29uZmln dXJhdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9BUElQcm9jZXNz UG9vbENvbmZpZ3VyYXRpb24uY3BwCkBAIC02OCw2ICs2OCw3IEBAIFJlZjxQcm9jZXNzUG9vbENv bmZpZ3VyYXRpb24+IFByb2Nlc3NQb29sQ29uZmlndXJhdGlvbjo6Y3JlYXRlV2l0aFdlYnNpdGVE YXRhU3RvCiAgICAgY29uZmlndXJhdGlvbi0+bV9pbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeSA9 IFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OmxlZ2FjeVBsYXRmb3JtRGVmYXVsdEluZGV4ZWREQkRh dGFiYXNlRGlyZWN0b3J5KCk7CiAgICAgY29uZmlndXJhdGlvbi0+bV9sb2NhbFN0b3JhZ2VEaXJl Y3RvcnkgPSBsZWdhY3lDb25maWd1cmF0aW9uLmxvY2FsU3RvcmFnZURpcmVjdG9yeTsKICAgICBj b25maWd1cmF0aW9uLT5tX21lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkgPSBsZWdhY3lDb25maWd1 cmF0aW9uLm1lZGlhS2V5c1N0b3JhZ2VEaXJlY3Rvcnk7CisgICAgY29uZmlndXJhdGlvbi0+bV9y ZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5ID0gbGVnYWN5Q29uZmlndXJhdGlvbi5yZXNv dXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5OwogICAgIGNvbmZpZ3VyYXRpb24tPm1fd2ViU1FM RGF0YWJhc2VEaXJlY3RvcnkgPSBsZWdhY3lDb25maWd1cmF0aW9uLndlYlNRTERhdGFiYXNlRGly ZWN0b3J5OwogCiAgICAgcmV0dXJuIGNvbmZpZ3VyYXRpb247CkBAIC04Miw2ICs4Myw3IEBAIFBy b2Nlc3NQb29sQ29uZmlndXJhdGlvbjo6UHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uKCkKICAgICAs IG1fbG9jYWxTdG9yYWdlRGlyZWN0b3J5KFdlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRMb2NhbFN0 b3JhZ2VEaXJlY3RvcnkoKSkKICAgICAsIG1fd2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkoV2Vic2l0 ZURhdGFTdG9yZTo6ZGVmYXVsdFdlYlNRTERhdGFiYXNlRGlyZWN0b3J5KCkpCiAgICAgLCBtX21l ZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkoV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdE1lZGlhS2V5 c1N0b3JhZ2VEaXJlY3RvcnkoKSkKKyAgICAsIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVj dG9yeShXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVj dG9yeSgpKQogICAgICwgbV9qYXZhU2NyaXB0Q29uZmlndXJhdGlvbkRpcmVjdG9yeShXZWJzaXRl RGF0YVN0b3JlOjpkZWZhdWx0SmF2YVNjcmlwdENvbmZpZ3VyYXRpb25EaXJlY3RvcnkoKSkKIHsK IH0KQEAgLTEwNyw2ICsxMDksNyBAQCBSZWY8UHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uPiBQcm9j ZXNzUG9vbENvbmZpZ3VyYXRpb246OmNvcHkoKQogICAgIGNvcHktPm1faW5qZWN0ZWRCdW5kbGVQ YXRoID0gdGhpcy0+bV9pbmplY3RlZEJ1bmRsZVBhdGg7CiAgICAgY29weS0+bV9sb2NhbFN0b3Jh Z2VEaXJlY3RvcnkgPSB0aGlzLT5tX2xvY2FsU3RvcmFnZURpcmVjdG9yeTsKICAgICBjb3B5LT5t X21lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkgPSB0aGlzLT5tX21lZGlhS2V5c1N0b3JhZ2VEaXJl Y3Rvcnk7CisgICAgY29weS0+bV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5ID0gdGhp cy0+bV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5OwogICAgIGNvcHktPm1famF2YVNj cmlwdENvbmZpZ3VyYXRpb25EaXJlY3RvcnkgPSB0aGlzLT5tX2phdmFTY3JpcHRDb25maWd1cmF0 aW9uRGlyZWN0b3J5OwogICAgIGNvcHktPm1fd2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkgPSB0aGlz LT5tX3dlYlNRTERhdGFiYXNlRGlyZWN0b3J5OwogICAgIGNvcHktPm1fY2FjaGVQYXJ0aXRpb25l ZFVSTFNjaGVtZXMgPSB0aGlzLT5tX2NhY2hlUGFydGl0aW9uZWRVUkxTY2hlbWVzOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9BUElQcm9jZXNzUG9vbENvbmZpZ3Vy YXRpb24uaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJUHJvY2Vzc1Bvb2xDb25m aWd1cmF0aW9uLmgKaW5kZXggYzI5ZGEyMDZkM2ZhNzhkN2UwMDA4NWE0NzA2OTUwODJkZDE1Y2Rj MC4uNDQzOTI3ZjMzMzkzYzY1ZmIzOWYwNTY0MzhmNWNjNWY4NjhhYmJiYSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9BUElQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24u aAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQb29sQ29uZmln dXJhdGlvbi5oCkBAIC04Nyw2ICs4Nyw5IEBAIHB1YmxpYzoKICAgICBjb25zdCBXVEY6OlN0cmlu ZyYgbWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeSgpIGNvbnN0IHsgcmV0dXJuIG1fbWVkaWFLZXlz U3RvcmFnZURpcmVjdG9yeTsgfQogICAgIHZvaWQgc2V0TWVkaWFLZXlzU3RvcmFnZURpcmVjdG9y eShjb25zdCBXVEY6OlN0cmluZyYgbWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeSkgeyBtX21lZGlh S2V5c1N0b3JhZ2VEaXJlY3RvcnkgPSBtZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5OyB9CiAKKyAg ICBjb25zdCBXVEY6OlN0cmluZyYgcmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeSgpIGNv bnN0IHsgcmV0dXJuIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeTsgfQorICAgIHZv aWQgc2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeShjb25zdCBXVEY6OlN0cmluZyYg cmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeSkgeyBtX3Jlc291cmNlTG9hZFN0YXRpc3Rp Y3NEaXJlY3RvcnkgPSByZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5OyB9CisKICAgICBj b25zdCBXVEY6OlN0cmluZyYgamF2YVNjcmlwdENvbmZpZ3VyYXRpb25EaXJlY3RvcnkoKSBjb25z dCB7IHJldHVybiBtX2phdmFTY3JpcHRDb25maWd1cmF0aW9uRGlyZWN0b3J5OyB9CiAgICAgdm9p ZCBzZXRKYXZhU2NyaXB0Q29uZmlndXJhdGlvbkRpcmVjdG9yeShjb25zdCBXVEY6OlN0cmluZyYg amF2YVNjcmlwdENvbmZpZ3VyYXRpb25EaXJlY3RvcnkpIHsgbV9qYXZhU2NyaXB0Q29uZmlndXJh dGlvbkRpcmVjdG9yeSA9IGphdmFTY3JpcHRDb25maWd1cmF0aW9uRGlyZWN0b3J5OyB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHRDb25maWd1 cmF0aW9uUmVmLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHRD b25maWd1cmF0aW9uUmVmLmNwcAppbmRleCA2MzQyZWU5YWJkNjgwNGI1YjIxMjNlNzVjMWYyY2Zi ZDM4ZTA2Y2MwLi44YWM4MWRkNjM0MWE1NzA0ZjJmODZlYzI2MjBkOGFiZTY0YjkzYTdmIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0Q29uZmlndXJh dGlvblJlZi5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4 dENvbmZpZ3VyYXRpb25SZWYuY3BwCkBAIC0xMTgsNiArMTE4LDE2IEBAIHZvaWQgV0tDb250ZXh0 Q29uZmlndXJhdGlvblNldE1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkoV0tDb250ZXh0Q29uZmln dXJhdGlvblJlCiAgICAgdG9JbXBsKGNvbmZpZ3VyYXRpb24pLT5zZXRNZWRpYUtleXNTdG9yYWdl RGlyZWN0b3J5KHRvSW1wbChtZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KS0+c3RyaW5nKCkpOwog fQogCitXS1N0cmluZ1JlZiBXS0NvbnRleHRDb25maWd1cmF0aW9uQ29weVJlc291cmNlTG9hZFN0 YXRpc3RpY3NEaXJlY3RvcnkoV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9u KQoreworICAgIHJldHVybiB0b0NvcGllZEFQSSh0b0ltcGwoY29uZmlndXJhdGlvbiktPnJlc291 cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3RvcnkoKSk7Cit9CisKK3ZvaWQgV0tDb250ZXh0Q29uZmln dXJhdGlvblNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3RvcnkoV0tDb250ZXh0Q29uZmln dXJhdGlvblJlZiBjb25maWd1cmF0aW9uLCBXS1N0cmluZ1JlZiByZXNvdXJjZUxvYWRTdGF0aXN0 aWNzRGlyZWN0b3J5KQoreworICAgIHRvSW1wbChjb25maWd1cmF0aW9uKS0+c2V0UmVzb3VyY2VM b2FkU3RhdGlzdGljc0RpcmVjdG9yeSh0b0ltcGwocmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVj dG9yeSktPnN0cmluZygpKTsKK30KKwogYm9vbCBXS0NvbnRleHRDb25maWd1cmF0aW9uRnVsbHlT eW5jaHJvbm91c01vZGVJc0FsbG93ZWRGb3JUZXN0aW5nKFdLQ29udGV4dENvbmZpZ3VyYXRpb25S ZWYgY29uZmlndXJhdGlvbikKIHsKICAgICByZXR1cm4gdG9JbXBsKGNvbmZpZ3VyYXRpb24pLT5m dWxseVN5bmNocm9ub3VzTW9kZUlzQWxsb3dlZEZvclRlc3RpbmcoKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHRDb25maWd1cmF0aW9uUmVmLmgg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0Q29uZmlndXJhdGlvblJl Zi5oCmluZGV4IDYyZjk3NGZmMzM4OGMzZmM3MGExMTM0ODg4YzVhZWY4MWU0MGFhODAuLmQ2OWJi ODUyOTY3NjFiZWYyNWY1ZjBkMzE3OWJhMTNjNDAyNzM0MjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHRDb25maWd1cmF0aW9uUmVmLmgKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dENvbmZpZ3VyYXRpb25SZWYu aApAQCAtNTYsNiArNTYsOSBAQCBXS19FWFBPUlQgdm9pZCBXS0NvbnRleHRDb25maWd1cmF0aW9u U2V0V2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkoV0tDb250ZXh0Q29uZmlndQogV0tfRVhQT1JUIFdL U3RyaW5nUmVmIFdLQ29udGV4dENvbmZpZ3VyYXRpb25Db3B5TWVkaWFLZXlzU3RvcmFnZURpcmVj dG9yeShXS0NvbnRleHRDb25maWd1cmF0aW9uUmVmIGNvbmZpZ3VyYXRpb24pOwogV0tfRVhQT1JU IHZvaWQgV0tDb250ZXh0Q29uZmlndXJhdGlvblNldE1lZGlhS2V5c1N0b3JhZ2VEaXJlY3Rvcnko V0tDb250ZXh0Q29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uLCBXS1N0cmluZ1JlZiBtZWRp YUtleXNTdG9yYWdlRGlyZWN0b3J5KTsKIAorV0tfRVhQT1JUIFdLU3RyaW5nUmVmIFdLQ29udGV4 dENvbmZpZ3VyYXRpb25Db3B5UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeShXS0NvbnRl eHRDb25maWd1cmF0aW9uUmVmIGNvbmZpZ3VyYXRpb24pOworV0tfRVhQT1JUIHZvaWQgV0tDb250 ZXh0Q29uZmlndXJhdGlvblNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3RvcnkoV0tDb250 ZXh0Q29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uLCBXS1N0cmluZ1JlZiByZXNvdXJjZUxv YWRTdGF0aXN0aWNzRGlyZWN0b3J5KTsKKwogV0tfRVhQT1JUIGJvb2wgV0tDb250ZXh0Q29uZmln dXJhdGlvbkZ1bGx5U3luY2hyb25vdXNNb2RlSXNBbGxvd2VkRm9yVGVzdGluZyhXS0NvbnRleHRD b25maWd1cmF0aW9uUmVmIGNvbmZpZ3VyYXRpb24pOwogV0tfRVhQT1JUIHZvaWQgV0tDb250ZXh0 Q29uZmlndXJhdGlvblNldEZ1bGx5U3luY2hyb25vdXNNb2RlSXNBbGxvd2VkRm9yVGVzdGluZyhX S0NvbnRleHRDb25maWd1cmF0aW9uUmVmIGNvbmZpZ3VyYXRpb24sIGJvb2wgYWxsb3dlZCk7CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCmluZGV4IGM2ZTcw YzY3MjE0NzAyNDU1NjExZDk2YjljN2JhNjM1MWM3ZWM1YTIuLmNhM2Q2Y2JhOTdlZTg5N2IzOWE3 ZWVjZjY3YjNhY2U4YTZhZWY0MDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQcm9jZXNzUG9vbC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBy b2Nlc3NQb29sLmNwcApAQCAtMTk5LDEyICsxOTksMTAgQEAgc3RhdGljIFdlYnNpdGVEYXRhU3Rv cmU6OkNvbmZpZ3VyYXRpb24gbGVnYWN5V2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24oQVBJ OjoKICAgICBjb25maWd1cmF0aW9uLmFwcGxpY2F0aW9uQ2FjaGVGbGF0RmlsZVN1YmRpcmVjdG9y eU5hbWUgPSBwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uYXBwbGljYXRpb25DYWNoZUZsYXRGaWxl U3ViZGlyZWN0b3J5TmFtZSgpOwogICAgIGNvbmZpZ3VyYXRpb24ubWVkaWFDYWNoZURpcmVjdG9y eSA9IHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5tZWRpYUNhY2hlRGlyZWN0b3J5KCk7CiAgICAg Y29uZmlndXJhdGlvbi5tZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5ID0gcHJvY2Vzc1Bvb2xDb25m aWd1cmF0aW9uLm1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkoKTsKKyAgICBjb25maWd1cmF0aW9u LnJlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3RvcnkgPSBwcm9jZXNzUG9vbENvbmZpZ3VyYXRp b24ucmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeSgpOwogICAgIGNvbmZpZ3VyYXRpb24u bmV0d29ya0NhY2hlRGlyZWN0b3J5ID0gcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmRpc2tDYWNo ZURpcmVjdG9yeSgpOwogICAgIGNvbmZpZ3VyYXRpb24uamF2YVNjcmlwdENvbmZpZ3VyYXRpb25E aXJlY3RvcnkgPSBwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uamF2YVNjcmlwdENvbmZpZ3VyYXRp b25EaXJlY3RvcnkoKTsKIAotICAgIC8vIFRoaXMgaXMgbmVlZGVkIHRvIHN1cHBvcnQgbGVnYWN5 IFdLMiBjbGllbnRzLCB3aGljaCBkaWQgbm90IGhhdmUgcmVzb3VyY2UgbG9hZCBzdGF0aXN0aWNz LgotICAgIGNvbmZpZ3VyYXRpb24ucmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeSA9IEFQ STo6V2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdFJlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3Rv cnkoKTsKLQogICAgIHJldHVybiBjb25maWd1cmF0aW9uOwogfQogCmRpZmYgLS1naXQgYS9Ub29s cy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTk4YjdlNzIwNzhkOWRhZDQ1NWE5 Y2MyZDZjNDg2ZTI3ZWYyODgyNS4uOGU1ODE5M2ZlNGMzZjU2ODJjYWQzNjkwNDVmZjAxMjA0OGI0 NzU5MyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE3IEBACisyMDE3LTA2LTAyICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5j b20+CisKKyAgICAgICAgUmVzb3VyY2VMb2FkU3RhdGlzdGljcyBhcmUgbm90IHVzaW5nIHVuaXF1 ZSBwYXRocyBkdXJpbmcgdGVzdCBydW5zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNzI4NjEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMyNDQyMjUx PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1ha2Ug c3VyZSBXZWJLaXRUZXN0UnVubmVyIHNldHMgYSB0ZW1wb3JhcnkgcGF0aCBmb3Igc2F2aW5nIHJl c291cmNlCisgICAgICAgIGxvYWQgc3RhdGlzdGljcy4KKworICAgICAgICAqIFdlYktpdFRlc3RS dW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6 Z2VuZXJhdGVDb250ZXh0Q29uZmlndXJhdGlvbik6CisKIDIwMTctMDYtMDIgIFphbGFuIEJ1anRh cyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBBbGxvdyBjbGllbnRzIHRvIG92ZXJyaWRl IHZpZXdwb3J0IHNpemUgZm9yIENTUyB2aWV3cG9ydCB1bml0cy4KZGlmZiAtLWdpdCBhL1Rvb2xz L1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1 bm5lci9UZXN0Q29udHJvbGxlci5jcHAKaW5kZXggZDhmMWU5YjYzNWIxZGRkNzE1MmJjZjU4NDk1 YTE0MGYxZDBiZjZiZi4uZjQ4NTFmNDFjNjI1MTQyMTBlYmIyNjI0OTJiOGFjNjAzMTRlMWQ2NyAx MDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAKKysr IGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAKQEAgLTQwOSw2ICs0 MDksNyBAQCBXS1JldGFpblB0cjxXS0NvbnRleHRDb25maWd1cmF0aW9uUmVmPiBUZXN0Q29udHJv bGxlcjo6Z2VuZXJhdGVDb250ZXh0Q29uZmlndXJhdAogICAgICAgICBXS0NvbnRleHRDb25maWd1 cmF0aW9uU2V0TG9jYWxTdG9yYWdlRGlyZWN0b3J5KGNvbmZpZ3VyYXRpb24uZ2V0KCksIHRvV0so dGVtcG9yYXJ5Rm9sZGVyICsgc2VwYXJhdG9yICsgIkxvY2FsU3RvcmFnZSIpLmdldCgpKTsKICAg ICAgICAgV0tDb250ZXh0Q29uZmlndXJhdGlvblNldFdlYlNRTERhdGFiYXNlRGlyZWN0b3J5KGNv bmZpZ3VyYXRpb24uZ2V0KCksIHRvV0sodGVtcG9yYXJ5Rm9sZGVyICsgc2VwYXJhdG9yICsgIkRh dGFiYXNlcyIgKyBzZXBhcmF0b3IgKyAiV2ViU1FMIikuZ2V0KCkpOwogICAgICAgICBXS0NvbnRl eHRDb25maWd1cmF0aW9uU2V0TWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeShjb25maWd1cmF0aW9u LmdldCgpLCB0b1dLKHRlbXBvcmFyeUZvbGRlciArIHNlcGFyYXRvciArICJNZWRpYUtleXMiKS5n ZXQoKSk7CisgICAgICAgIFdLQ29udGV4dENvbmZpZ3VyYXRpb25TZXRSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzRGlyZWN0b3J5KGNvbmZpZ3VyYXRpb24uZ2V0KCksIHRvV0sodGVtcG9yYXJ5Rm9sZGVy ICsgc2VwYXJhdG9yICsgIlJlc291cmNlTG9hZFN0YXRpc3RpY3MiKS5nZXQoKSk7CiAgICAgfQog ICAgIHJldHVybiBjb25maWd1cmF0aW9uOwogfQo=