SemianiakaVY/elsa-core
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Fix Output converter

Browse source
This commit is contained in:
Sipke Schoorstra 2022-06-08 11:33:25 +02:00
parent a64860273b
commit fec0f74c51
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/modules/Elsa.Workflows.Core/Models/Activity.cs
View file

@ -115,7 +115,7 @@ public abstract class ActivityWithResult : Activity
{
if (output != null) Result = new Output(output);
}
protected ActivityWithResult(Output? output)
{
Result = output;
@ -137,16 +137,22 @@ public abstract class Activity<T> : ActivityWithResult
protected Activity(MemoryReference? output) : base(output)
{
}
protected Activity(Output? output) : base(output)
{
}
public Activity<T> CaptureResult(MemoryReference output)
{
Result = new Output(output);
Result = new Output<T>(output);
return this;
}
public new Output<T>? Result
{
get => base.Result as Output<T>;
set => base.Result = value;
}
}
internal record SignalHandlerRegistration(Type SignalType, Func<object, SignalContext, ValueTask> Handler);

2
src/modules/Elsa.Workflows.Management/Serialization/Converters/OutputJsonConverterFactory.cs
View file

@ -13,7 +13,7 @@ public class OutputJsonConverterFactory : JsonConverterFactory
public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
{
var type = typeToConvert.GetGenericArguments().First();
var type = typeToConvert.GetGenericArguments().FirstOrDefault() ?? typeof(object);
return (JsonConverter)ActivatorUtilities.CreateInstance(_serviceProvider, typeof(OutputJsonConverter<>).MakeGenericType(type))!;
}
}