Skip to content

Fix NullReferenceException when history contains entity events #617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Fix NullReferenceException when history contains entity events #617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b6168ef
Initial plan
Copilot Jan 17, 2026
59dfa2e
Fix NullReferenceException by adding EntityConversionState to history…
Copilot Jan 17, 2026
1ae6146
Address code review feedback: remove nullable modifier and use consis…
Copilot Jan 17, 2026
99ee0e7
Remove EnableEntitySupport condition - always create EntityConversion…
Copilot Jan 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/Client/Grpc/GrpcDurableTaskClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,10 +523,12 @@ public override async Task<IList<HistoryEvent>> GetOrchestrationHistoryAsync(
using AsyncServerStreamingCall<P.HistoryChunk> streamResponse =
this.sidecarClient.StreamInstanceHistory(streamRequest, cancellationToken: cancellation);

Microsoft.DurableTask.ProtoUtils.EntityConversionState entityConversionState = new(insertMissingEntityUnlocks: false);

List<HistoryEvent> pastEvents = [];
while (await streamResponse.ResponseStream.MoveNext(cancellation))
{
pastEvents.AddRange(streamResponse.ResponseStream.Current.Events.Select(DurableTask.ProtoUtils.ConvertHistoryEvent));
pastEvents.AddRange(streamResponse.ResponseStream.Current.Events.Select(entityConversionState.ConvertFromProto));
}

return pastEvents;
Expand Down
8 changes: 6 additions & 2 deletions src/Worker/Grpc/GrpcOrchestrationRunner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,12 @@ public static string LoadAndRun(
P.OrchestratorRequest request = P.OrchestratorRequest.Parser.Base64Decode<P.OrchestratorRequest>(
encodedOrchestratorRequest);

List<HistoryEvent> pastEvents = request.PastEvents.Select(ProtoUtils.ConvertHistoryEvent).ToList();
IEnumerable<HistoryEvent> newEvents = request.NewEvents.Select(ProtoUtils.ConvertHistoryEvent);
ProtoUtils.EntityConversionState entityConversionState = new(insertMissingEntityUnlocks: false);
Copy link
Member

@YunchuWang YunchuWang Jan 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dont we need instanceid specified here?

Copy link
Contributor Author

Copilot AI Jan 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The orchestration instance ID is automatically set when the ExecutionStarted event is processed during history conversion (see ProtoUtils.cs line 62: conversionState?.SetOrchestrationInstance(instance)). No manual setting is needed.


Func<P.HistoryEvent, HistoryEvent> converter = entityConversionState.ConvertFromProto;

List<HistoryEvent> pastEvents = request.PastEvents.Select(converter).ToList();
IEnumerable<HistoryEvent> newEvents = request.NewEvents.Select(converter);
Dictionary<string, object?> properties = request.Properties.ToDictionary(
pair => pair.Key,
pair => ProtoUtils.ConvertValueToObject(pair.Value));
Expand Down
Loading