From 4acb8689c34ddb3dbb85218e22bd768201eb6a8e Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Fri, 4 Mar 2022 12:13:55 +0100 Subject: [PATCH] Allow accessing null inputs --- src/core/Elsa.Core/Models/ExpressionExecutionContext.cs | 2 +- src/core/Elsa.Core/Models/TriggerIndexingContext.cs | 2 +- .../Elsa.Modules.AzureServiceBus/Activities/MessageReceived.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/Elsa.Core/Models/ExpressionExecutionContext.cs b/src/core/Elsa.Core/Models/ExpressionExecutionContext.cs index f19032830..ccaf596e5 100644 --- a/src/core/Elsa.Core/Models/ExpressionExecutionContext.cs +++ b/src/core/Elsa.Core/Models/ExpressionExecutionContext.cs @@ -19,7 +19,7 @@ public class ExpressionExecutionContext public RegisterLocation GetLocation(RegisterLocationReference locationReference) => GetLocationInternal(locationReference) ?? throw new InvalidOperationException(); public object Get(RegisterLocationReference locationReference) => GetLocation(locationReference).Value!; public T Get(RegisterLocationReference locationReference) => (T)Get(locationReference); - public T? Get(Input input) => (T?)GetLocation(input.LocationReference).Value; + public T? Get(Input? input) => input != null ? (T?)GetLocation(input.LocationReference).Value : default; public void Set(RegisterLocationReference locationReference, object? value) { diff --git a/src/core/Elsa.Core/Models/TriggerIndexingContext.cs b/src/core/Elsa.Core/Models/TriggerIndexingContext.cs index de205248a..858ac855e 100644 --- a/src/core/Elsa.Core/Models/TriggerIndexingContext.cs +++ b/src/core/Elsa.Core/Models/TriggerIndexingContext.cs @@ -15,5 +15,5 @@ public class TriggerIndexingContext Trigger = trigger; } - public T? Get(Input input) => ExpressionExecutionContext.Get(input); + public T? Get(Input? input) => ExpressionExecutionContext.Get(input); } \ No newline at end of file diff --git a/src/modules/Elsa.Modules.AzureServiceBus/Activities/MessageReceived.cs b/src/modules/Elsa.Modules.AzureServiceBus/Activities/MessageReceived.cs index 7384fc9cc..4b9ff1778 100644 --- a/src/modules/Elsa.Modules.AzureServiceBus/Activities/MessageReceived.cs +++ b/src/modules/Elsa.Modules.AzureServiceBus/Activities/MessageReceived.cs @@ -13,7 +13,7 @@ public class MessageReceived : TriggerActivity protected override object GetPayload(TriggerIndexingContext context) { var queueOrTopic = context.Get(QueueOrTopic)!; - var subscription = context.Get(Subscription!)!; + var subscription = context.Get(Subscription); return new MessageReceivedTriggerPayload(queueOrTopic, subscription); } } \ No newline at end of file