Remove unnecessary null checks (#387)

microsoft · Sep 20, 2024 · 6a3e4c3 · 6a3e4c3
1 parent 2073037
commit 6a3e4c3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/src/Microsoft.ServiceFabric.Actors/Remoting/V1/Client/ActorEventSubscriberManager.cs b/src/Microsoft.ServiceFabric.Actors/Remoting/V1/Client/ActorEventSubscriberManager.cs
@@ -54,8 +54,7 @@ public void OneWayMessage(ServiceRemotingMessageHeaders serviceMessageHeaders, b
                 return;
             }
 
-            if ((this.eventIdToDispatchersMap == null) ||
-                (!this.eventIdToDispatchersMap.TryGetValue(actorHeaders.InterfaceId, out var eventDispatcher)))
+            if (!this.eventIdToDispatchersMap.TryGetValue(actorHeaders.InterfaceId, out var eventDispatcher))
             {
                 return;
             }
@@ -110,13 +109,10 @@ public bool TryUnregisterSubscriber(ActorId actorId, Type eventInterfaceType, ob
 
         private int GetAndEnsureEventId(Type eventInterfaceType)
         {
-            if (this.eventIdToDispatchersMap != null)
+            var eventId = IdUtil.ComputeId(eventInterfaceType);
+            if (this.eventIdToDispatchersMap.ContainsKey(eventId))
             {
-                var eventId = IdUtil.ComputeId(eventInterfaceType);
-                if (this.eventIdToDispatchersMap.ContainsKey(eventId))
-                {
-                    return eventId;
-                }
+                return eventId;
             }
 
             throw new ArgumentException();

diff --git a/src/Microsoft.ServiceFabric.Actors/Remoting/V2/Client/ActorEventSubscriberManager.cs b/src/Microsoft.ServiceFabric.Actors/Remoting/V2/Client/ActorEventSubscriberManager.cs
@@ -46,8 +46,7 @@ public void HandleOneWayMessage(IServiceRemotingRequestMessage requestMessage)
         {
             var actorHeaders = (IActorRemotingMessageHeaders)requestMessage.GetHeader();
 
-            if ((this.eventIdToDispatchersMap == null) ||
-                (!this.eventIdToDispatchersMap.TryGetValue(actorHeaders.InterfaceId, out var eventDispatcher)))
+            if (!this.eventIdToDispatchersMap.TryGetValue(actorHeaders.InterfaceId, out var eventDispatcher))
             {
                 return;
             }
@@ -101,13 +100,10 @@ public bool TryUnregisterSubscriber(ActorId actorId, Type eventInterfaceType, ob
 
         private int GetAndEnsureEventId(Type eventInterfaceType)
         {
-            if (this.eventIdToDispatchersMap != null)
+            var eventId = IdUtil.ComputeIdWithCRC(eventInterfaceType);
+            if (this.eventIdToDispatchersMap.ContainsKey(eventId))
             {
-                var eventId = IdUtil.ComputeIdWithCRC(eventInterfaceType);
-                if (this.eventIdToDispatchersMap.ContainsKey(eventId))
-                {
-                    return eventId;
-                }
+                return eventId;
             }
 
             throw new ArgumentException();