Avoid NullReferenceException in Message.TargetAddress (#6635)

dotnet · Jul 7, 2020 · f2334a7 · f2334a7
1 parent 29400a2
commit f2334a7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/src/Orleans.Core.Abstractions/IDs/ActivationAddress.cs b/src/Orleans.Core.Abstractions/IDs/ActivationAddress.cs
@@ -30,7 +30,7 @@ public static ActivationAddress NewActivationAddress(SiloAddress silo, GrainId g
         public static ActivationAddress GetAddress(SiloAddress silo, GrainId grain, ActivationId activation)
         {
             // Silo part is not mandatory
-            if (grain == null) throw new ArgumentNullException("grain");
+            if (grain.IsDefault) throw new ArgumentNullException("grain");
 
             return new ActivationAddress(silo, grain, activation);
         }

diff --git a/src/Orleans.Core/Messaging/Message.cs b/src/Orleans.Core/Messaging/Message.cs
@@ -168,7 +168,17 @@ public ActivationId TargetActivation
 
         public ActivationAddress TargetAddress
         {
-            get { return targetAddress ?? (targetAddress = ActivationAddress.GetAddress(TargetSilo, TargetGrain, TargetActivation)); }
+            get
+            {
+                if (targetAddress is object) return targetAddress;
+                if (!TargetGrain.IsDefault)
+                {
+                    return targetAddress = ActivationAddress.GetAddress(TargetSilo, TargetGrain, TargetActivation);
+                }
+
+                return null;
+            }
+
             set
             {
                 TargetGrain = value.Grain;

diff --git a/src/Orleans.Runtime/Core/Dispatcher.cs b/src/Orleans.Runtime/Core/Dispatcher.cs
@@ -671,6 +671,7 @@ internal void SendMessage(Message message, IGrainContext sendingActivation = nul
         private Task AddressMessage(Message message)
         {
             var targetAddress = message.TargetAddress;
+            if (targetAddress is null) throw new InvalidOperationException("Cannot address a message with a null TargetAddress");
             if (targetAddress.IsComplete) return Task.CompletedTask;
 
             var target = new PlacementTarget(