From fe6aa7d9ff3358815aec1564c8ed78916941e710 Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Thu, 14 Jan 2021 23:28:08 +0100 Subject: [PATCH] Fix OutcomeBuilder bug --- .../Services/QueueWorker.cs | 7 ++++--- src/core/Elsa.Core/Builders/OutcomeBuilder.cs | 5 ++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/activities/Elsa.Activities.AzureServiceBus/Services/QueueWorker.cs b/src/activities/Elsa.Activities.AzureServiceBus/Services/QueueWorker.cs index 7df605fa3..d13b61d4e 100644 --- a/src/activities/Elsa.Activities.AzureServiceBus/Services/QueueWorker.cs +++ b/src/activities/Elsa.Activities.AzureServiceBus/Services/QueueWorker.cs @@ -40,10 +40,11 @@ namespace Elsa.Activities.AzureServiceBus.Services { using var scope = _serviceProvider.CreateScope(); var workflowRunner = scope.ServiceProvider.GetRequiredService(); - + await workflowRunner.TriggerWorkflowsAsync( - x => x.QueueName == _messageReceiver.Path && (string.Equals(x.CorrelationId, message.CorrelationId)), - message, message.CorrelationId, + x => x.QueueName == _messageReceiver.Path && (string.Equals(x.CorrelationId, message.CorrelationId)), + message, + message.CorrelationId, cancellationToken: cancellationToken); } diff --git a/src/core/Elsa.Core/Builders/OutcomeBuilder.cs b/src/core/Elsa.Core/Builders/OutcomeBuilder.cs index b66f32320..b5241b7b0 100644 --- a/src/core/Elsa.Core/Builders/OutcomeBuilder.cs +++ b/src/core/Elsa.Core/Builders/OutcomeBuilder.cs @@ -1,13 +1,12 @@ using System; -using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Runtime.CompilerServices; using Elsa.Services; using Elsa.Services.Models; +// ReSharper disable ExplicitCallerInfoArgument namespace Elsa.Builders { - [SuppressMessage("ReSharper", "ExplicitCallerInfoArgument")] public class OutcomeBuilder : IOutcomeBuilder { public OutcomeBuilder(ICompositeActivityBuilder workflowBuilder, IActivityBuilder source, string outcome = OutcomeNames.Done) @@ -27,7 +26,7 @@ namespace Elsa.Builders [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) where T : class, IActivity { - var activityBuilder = WorkflowBuilder.Add(setup, lineNumber, sourceFile); + var activityBuilder = WorkflowBuilder.Add(setup, branch, lineNumber, sourceFile); Then(activityBuilder, branch); return activityBuilder; }