Merge pull request #1353 from WhitWaldo/get-metadata-fix

Added fix to handle null return values from GetMetadataAsync
dapr · Oct 11, 2024 · 19cb481 · 19cb481
2 parents c47e650 + c24a082
commit 19cb481
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/Dapr.Client/DaprClientGrpc.cs b/src/Dapr.Client/DaprClientGrpc.cs
@@ -2390,10 +2390,14 @@ 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());
+                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