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

Make ConnectionComparer more resilient

Browse source
This commit is contained in:
Sipke Schoorstra 2023-09-28 14:09:34 +02:00
parent f6f1d930e2
commit 2a7ca95456
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/bundles/Elsa.WorkflowServer.Web/Elsa.WorkflowServer.Web.csproj
View file

@ -40,10 +40,5 @@
<PackageReference Include="Proto.Persistence.Sqlite" Version="1.1.0"/>
<PackageReference Include="Proto.Persistence.SqlServer" Version="1.3.1-alpha.0.2"/>
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\DropIns\"/>
</ItemGroup>
</Project>

7
src/modules/Elsa.Workflows.Core/Activities/Flowchart/Serialization/ConnectionComparer.cs
View file

@ -14,6 +14,13 @@ public class ConnectionComparer : IEqualityComparer<Connection>
if (ReferenceEquals(x, null)) return false;
if (ReferenceEquals(y, null)) return false;
if (x.GetType() != y.GetType()) return false;
// ReSharper disable ConditionalAccessQualifierIsNonNullableAccordingToAPIContract
// Justification: These can be null when the designer is in an invalid state. For example, if a NotFoundActivity is used that no longer has the same outcomes.
if (x.Source.Activity?.Id == null || x.Target.Activity?.Id == null || y.Source.Activity?.Id == null || y.Target.Activity?.Id == null)
return false;
// ReSharper restore ConditionalAccessQualifierIsNonNullableAccordingToAPIContract
return x.Source.Activity.Id.Equals(y.Source.Activity.Id) && x.Target.Activity.Id.Equals(y.Target.Activity.Id) && x.Source.Port == y.Source.Port && x.Target.Port == y.Target.Port;
}