Skip to content

Commit b39f674

Browse files
committed
Fix potential NullReferenceException and added comment why cannot use .Values directly
1 parent f29d91e commit b39f674

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/ServiceControl.Audit.Persistence.RavenDB/Indexes/MessagesViewIndex.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ from message in messages
2727
DeliveryTime = (TimeSpan?)metadata["DeliveryTime"],
2828
Query = new[] {
2929
string.Join(' ', message.Headers.Values),
30-
string.Join(' ', metadata.Values.Select(v => v.ToString() ?? string.Empty))
30+
string.Join(' ', metadata.Values.Where(v => v != null).Select(v => v.ToString())) // Needed, RaveDB does not like object arrays
3131
},
3232
ConversationId = (string)metadata["ConversationId"]
3333
};

src/ServiceControl.Persistence.RavenDB/Indexes/MessagesViewIndex.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ from message in messages
3333
CriticalTime = (TimeSpan?)metadata["CriticalTime"],
3434
ProcessingTime = (TimeSpan?)metadata["ProcessingTime"],
3535
DeliveryTime = (TimeSpan?)metadata["DeliveryTime"],
36-
Query = metadata.Select(_ => _.Value.ToString()).Union(new[] { string.Join(" ", last.Headers.Select(x => x.Value)) }).ToArray(),
36+
Query = new[] {
37+
string.Join(' ', last.Headers.Values),
38+
string.Join(' ', metadata.Values.Where(v => v != null).Select(v => v.ToString())) // Needed, RavenDB does not like object arrays
39+
},
3740
ConversationId = (string)metadata["ConversationId"]
3841
};
3942

0 commit comments

Comments
 (0)