fixed more tests

Signed-off-by: Florian Bacher <[email protected]>
open-feature · Jan 2, 2024 · 8f40909 · 8f40909
1 parent 0f5a4a8
commit 8f40909
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/OpenFeature/EventExecutor.cs b/src/OpenFeature/EventExecutor.cs
@@ -1,4 +1,6 @@
+using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading;
 using System.Threading.Channels;
@@ -91,6 +93,10 @@ internal void RemoveClientHandler(string client, ProviderEventTypes type, EventH
 
         internal void RegisterDefaultFeatureProvider(FeatureProvider provider)
         {
+            if (provider == null)
+            {
+                return;
+            }
             this._mutex.WaitOne();
             var oldProvider = this._defaultProvider;
 
@@ -128,7 +134,15 @@ private void StartListeningAndShutdownOld(FeatureProviderReference newProvider,
             if (oldProvider != null && !this.IsProviderBound(oldProvider))
             {
                 this._activeSubscriptions.Remove(oldProvider);
-                oldProvider.Provider.GetEventChannel().Writer.TryWrite(new ShutdownSignal());
+                if (oldProvider.Provider == null)
+                {
+                    Console.WriteLine("wtf");
+                }
+                var channel = oldProvider.Provider.GetEventChannel();
+                if (channel != null)
+                {
+                    channel.Writer.TryWrite(new ShutdownSignal());
+                }
             }
         }
 

diff --git a/test/OpenFeature.Tests/OpenFeatureEventTests.cs b/test/OpenFeature.Tests/OpenFeatureEventTests.cs
@@ -26,6 +26,8 @@ public async Task Event_Executor_Should_Propagate_Events_ToGlobal_Handler()
             var eventPayload = new Event { EventPayload = new ProviderEventPayload { Type = ProviderEventTypes.ProviderReady }};
             eventExecutor.EventChannel.Writer.TryWrite(eventPayload);
 
+            Thread.Sleep(1000);
+
             eventHandler.Received().Invoke(Arg.Is<ProviderEventPayload>(payload => payload.Type == ProviderEventTypes.ProviderReady));
 
             // shut down the event executor