From 5098e04fc51c3f0f915459d6f8fd0cbb7e7d8943 Mon Sep 17 00:00:00 2001 From: Codrin Poienaru Date: Thu, 12 May 2022 15:38:44 +0200 Subject: [PATCH] Added null checks for GetCachedExtensions call --- .../Discovery/DiscoveryRequest.cs | 4 ++-- src/Microsoft.TestPlatform.Client/Execution/TestRunRequest.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.TestPlatform.Client/Discovery/DiscoveryRequest.cs b/src/Microsoft.TestPlatform.Client/Discovery/DiscoveryRequest.cs index 25211c24f4..d9559f5980 100644 --- a/src/Microsoft.TestPlatform.Client/Discovery/DiscoveryRequest.cs +++ b/src/Microsoft.TestPlatform.Client/Discovery/DiscoveryRequest.cs @@ -256,7 +256,7 @@ public void HandleDiscoveryComplete(DiscoveryCompleteEventArgs discoveryComplete // and then we write again here. We should refactor this code and write only once. discoveryCompleteEventArgs.DiscoveredExtensions = TestExtensions.CreateMergedDictionary( discoveryCompleteEventArgs.DiscoveredExtensions, - TestPluginCache.Instance.TestExtensions.GetCachedExtensions()); + TestPluginCache.Instance.TestExtensions?.GetCachedExtensions()); if (RequestData.IsTelemetryOptedIn) { @@ -436,7 +436,7 @@ private string UpdateRawMessageWithTelemetryInfo(DiscoveryCompletePayload discov // would probably mean a performance hit. discoveryCompletePayload.DiscoveredExtensions = TestExtensions.CreateMergedDictionary( discoveryCompletePayload.DiscoveredExtensions, - TestPluginCache.Instance.TestExtensions.GetCachedExtensions()); + TestPluginCache.Instance.TestExtensions?.GetCachedExtensions()); // Write extensions to telemetry data. TestExtensions.AddExtensionTelemetry( diff --git a/src/Microsoft.TestPlatform.Client/Execution/TestRunRequest.cs b/src/Microsoft.TestPlatform.Client/Execution/TestRunRequest.cs index 0efe23df94..82ae877bea 100644 --- a/src/Microsoft.TestPlatform.Client/Execution/TestRunRequest.cs +++ b/src/Microsoft.TestPlatform.Client/Execution/TestRunRequest.cs @@ -409,7 +409,7 @@ public void HandleTestRunComplete(TestRunCompleteEventArgs runCompleteArgs!!, Te // and then we write again here. We should refactor this code and write only once. runCompleteArgs.DiscoveredExtensions = TestExtensions.CreateMergedDictionary( runCompleteArgs.DiscoveredExtensions, - TestPluginCache.Instance.TestExtensions.GetCachedExtensions()); + TestPluginCache.Instance.TestExtensions?.GetCachedExtensions()); if (_requestData.IsTelemetryOptedIn) { @@ -613,7 +613,7 @@ private string UpdateRawMessageWithTelemetryInfo(TestRunCompletePayload testRunC // would probably mean a performance hit. testRunCompletePayload.TestRunCompleteArgs.DiscoveredExtensions = TestExtensions.CreateMergedDictionary( testRunCompletePayload.TestRunCompleteArgs.DiscoveredExtensions, - TestPluginCache.Instance.TestExtensions.GetCachedExtensions()); + TestPluginCache.Instance.TestExtensions?.GetCachedExtensions()); // Write extensions to telemetry data. TestExtensions.AddExtensionTelemetry(