Added fix to handle null return values

Signed-off-by: Whit Waldo <whit.waldo@innovian.net>
dapr · Oct 6, 2024 · bc62fd5 · bc62fd5
1 parent 74f6b01
commit bc62fd5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/Dapr.Client/DaprClientGrpc.cs b/src/Dapr.Client/DaprClientGrpc.cs
@@ -2390,10 +2390,17 @@ public override async Task<DaprMetadata> GetMetadataAsync(CancellationToken canc
             try
             {
                 var response = await client.GetMetadataAsync(new Autogenerated.GetMetadataRequest(), options);
-                return new DaprMetadata(response.Id,
-                                        response.ActorRuntime.ActiveActors.Select(c => new DaprActorMetadata(c.Type, c.Count)).ToList(),
-                                        response.ExtendedMetadata.ToDictionary(c => c.Key, c => c.Value),
-                                        response.RegisteredComponents.Select(c => new DaprComponentsMetadata(c.Name, c.Type, c.Version, c.Capabilities.ToArray())).ToList());
+                if (response is null)
+                    return null;
+
+                return new DaprMetadata(response.Id ?? "",
+                    response.ActorRuntime?.ActiveActors?.Select(c => new DaprActorMetadata(c.Type, c.Count)).ToList() ??
+                    new List<DaprActorMetadata>(),
+                    response.ExtendedMetadata?.ToDictionary(c => c.Key, c => c.Value) ??
+                    new Dictionary<string, string>(),
+                    response.RegisteredComponents?.Select(c =>
+                        new DaprComponentsMetadata(c.Name, c.Type, c.Version, c.Capabilities.ToArray())).ToList() ??
+                    new List<DaprComponentsMetadata>());
             }
             catch (RpcException ex)
             {

diff --git a/src/Dapr.Client/DaprMetadata.cs b/src/Dapr.Client/DaprMetadata.cs
@@ -11,7 +11,6 @@
 // limitations under the License.
 // ------------------------------------------------------------------------
 
-using System;
 using System.Collections.Generic;
 
 namespace Dapr.Client