COREX-346 CoreDataService keeps crashing (#24)

- Call Abort on communicationObject when disposing AnnouncementClient in case it is in Faulted state
keghub · Mar 12, 2024 · cb17b44 · cb17b44
1 parent 8a2a871
commit cb17b44
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/ServiceModel/ServiceModel/ServiceModel/Discovery/DefaultAnnouncementClientWrapper.cs b/src/ServiceModel/ServiceModel/ServiceModel/Discovery/DefaultAnnouncementClientWrapper.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ServiceModel;
 using System.ServiceModel.Discovery;
 
 namespace EMG.Utilities.ServiceModel.Discovery
@@ -24,7 +25,16 @@ public void AnnounceOffline(EndpointDiscoveryMetadata metadata)
 
         public void Dispose()
         {
-            ((IDisposable)_client).Dispose();
+            var communicationObject = _client as ICommunicationObject;
+
+            if (communicationObject.State != CommunicationState.Faulted)
+            {
+                ((IDisposable)_client).Dispose();
+            }
+            else 
+            {
+                communicationObject.Abort();
+            }
         }
     }
 }