Tentative nullref fix for LogSource (#7078)

* Tenative nullref fix on LogSource * Simplify FromActorRef() method --------- Co-authored-by: Gregorius Soedharmo <arkatufus@yahoo.com>
akkadotnet · Jan 31, 2024 · 46d6711 · 46d6711
1 parent e78a805
commit 46d6711
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/src/core/Akka/Event/Logging.cs b/src/core/Akka/Event/Logging.cs
@@ -105,14 +105,8 @@ public static string FromActor(IActorContext actor, ActorSystem system)
 
         public static string FromActorRef(IActorRef a, ActorSystem system)
         {
-            try
-            {
-                return a.Path.ToStringWithAddress(system.AsInstanceOf<ExtendedActorSystem>().Provider.DefaultAddress);
-            }
-            catch // can fail if the ActorSystem (remoting) is not completely started yet
-            {
-                return a.Path.ToString();
-            }
+            var defaultAddress = system.AsInstanceOf<ExtendedActorSystem>().Provider.DefaultAddress;
+            return defaultAddress is null ? a.Path.ToString() : a.Path.ToStringWithAddress(defaultAddress);
         }
     }