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

Handle potential null dictionary

Browse source
This commit is contained in:
Sipke Schoorstra 2021-05-28 16:38:59 +02:00
parent 2924f49618
commit 2b77ac8fe0
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/core/Elsa.Abstractions/Services/ActivityPropertyProviders.cs
View file

@ -36,13 +36,16 @@ namespace Elsa.Services
properties[propertyName] = provider;
}
public IDictionary<string, IActivityPropertyValueProvider> GetProviders(string activityId) => _providers.TryGetValue(activityId, out var properties) ? properties : new Dictionary<string, IActivityPropertyValueProvider>();
public IDictionary<string, IActivityPropertyValueProvider> GetProviders(string activityId) =>
_providers.TryGetValue(activityId, out var properties)
? properties ?? new Dictionary<string, IActivityPropertyValueProvider>()
: new Dictionary<string, IActivityPropertyValueProvider>();
public IActivityPropertyValueProvider? GetProvider(string activityId, string propertyName) =>
_providers.TryGetValue(activityId, out var properties)
&& properties != null
&& properties.TryGetValue(propertyName, out var provider)
? provider
_providers.TryGetValue(activityId, out var properties)
&& properties != null
&& properties.TryGetValue(propertyName, out var provider)
? provider
: null;
public async ValueTask SetActivityPropertiesAsync(IActivity activity, ActivityExecutionContext activityExecutionContext, CancellationToken cancellationToken = default)
@ -64,14 +67,14 @@ namespace Elsa.Services
var activityPropertyAttribute = property.GetCustomAttribute<ActivityPropertyAttribute>();
value = activityPropertyAttribute?.DefaultValue;
}
if(value != null)
if (value != null)
{
property.SetValue(activity, value);
activityExecutionContext.SetState(property.Name, value);
}
}
catch(Exception e)
catch (Exception e)
{
throw new CannotSetActivityPropertyValueException($@"An exception was thrown whilst setting '{activity?.GetType().Name}.{property.Name}'. See the inner exception for further details.", e);
}

4
test/integration/Elsa.Core.IntegrationTests/Workflows/ForEachWorkflow.cs
View file

@ -22,8 +22,8 @@ namespace Elsa.Core.IntegrationTests.Workflows
.ForEach(
_items,
iterate => iterate
.Then<WriteLine>(activity => activity.Set(x => x.Text, context => $"{context.Input}")).WithId("WriteLine")
.Then<SignalReceived>() /* Block workflow.*/
.Then<WriteLine>(activity => activity.WithText(context => $"{context.Input}")).WithId("WriteLine")
.SignalReceived("The Signal") /* Block workflow.*/
.WriteLine("Resumed"))
.WriteLine("One iterations executing, rest is blocked");
}