Participant Role test and session fix (#204)

* Participant Role test and session fix
* Refactor CanCancel and Cancel using only thread safe methods

Author: lxatstariongroup

CDP4Common.NetCore.Tests/Poco/ParticipantRoleTestFixture.cs

@@ -1,8 +1,8 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="ParticipantRoleTestFixture.cs" company="RHEA System S.A.">
-//    Copyright (c) 2015-2020 RHEA System S.A.
+//    Copyright (c) 2015-2021 RHEA System S.A.
 //
-//    Author: Sam Gerené, Merlin Bieze, Alex Vorobiev, Naron Phou
+//    Author: Sam Gerené, Alex Vorobiev, Naron Phou, Patxi Ozkoidi, Alexander van Delft, Nathanael Smiechowski, Ahmed Ahmed, Simon Wood
 //
 //    This file is part of CDP4-SDK Community Edition
 //
@@ -38,8 +38,8 @@ internal class ParticipantRoleTestFixture
         public void VerifyPopulateParticipantPermissions()
         {
             var participantRole = new ParticipantRole();
-            Assert.AreEqual(48, participantRole.ParticipantPermission.Count);
+            Assert.AreEqual(49, participantRole.ParticipantPermission.Count);
             Assert.IsTrue(participantRole.ParticipantPermission.All(x => x.AccessRight == ParticipantAccessRightKind.NONE));
         }
     }
-}
+}

CDP4Common.Tests/Poco/ParticipantRoleTestFixture.cs

@@ -1,9 +1,8 @@
-#region Copyright
-// --------------------------------------------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------------------------------------------
 // <copyright file="ParticipantRoleTestFixture.cs" company="RHEA System S.A.">
-//    Copyright (c) 2015-2019 RHEA System S.A.
+//    Copyright (c) 2015-2021 RHEA System S.A.
 //
-//    Author: Sam Gerené, Merlin Bieze, Alex Vorobiev, Naron Phou
+//    Author: Sam Gerené, Alex Vorobiev, Naron Phou, Patxi Ozkoidi, Alexander van Delft, Nathanael Smiechowski, Ahmed Ahmed, Simon Wood
 //
 //    This file is part of CDP4-SDK Community Edition
 //
@@ -22,13 +21,14 @@
 //    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
-#endregion
 
 namespace CDP4Common.Tests.Poco
 {
     using System.Linq;
+
     using CDP4Common.CommonData;
     using CDP4Common.SiteDirectoryData;
+    
     using NUnit.Framework;
 
     [TestFixture]
@@ -38,8 +38,8 @@ internal class ParticipantRoleTestFixture
         public void VerifyPopulateParticipantPermissions()
         {
             var participantRole = new ParticipantRole();
-            Assert.AreEqual(48, participantRole.ParticipantPermission.Count);
+            Assert.AreEqual(49, participantRole.ParticipantPermission.Count);
             Assert.IsTrue(participantRole.ParticipantPermission.All(x => x.AccessRight == ParticipantAccessRightKind.NONE));
         }
     }
-}
+}

CDP4Dal/Session.cs

@@ -785,9 +785,12 @@ private static bool CanCancel(CancellationTokenSource cancellationTokenSource)
         /// </returns>
         public bool CanCancel()
         {
-            foreach (var cancellationTokenSourceKey in this.cancellationTokenSourceDictionary.Keys)
+            foreach (var cancellationTokenSourceKey in this.cancellationTokenSourceDictionary.Keys.ToList())
             {
-                this.cancellationTokenSourceDictionary.TryGetValue(cancellationTokenSourceKey, out var cancellationTokenSource);
+                if (!this.cancellationTokenSourceDictionary.TryGetValue(cancellationTokenSourceKey, out var cancellationTokenSource))
+                {
+                    continue;
+                }
 
                 if (!CanCancel(cancellationTokenSource))
                 {
@@ -805,11 +808,14 @@ public bool CanCancel()
         /// </summary>
         public void Cancel()
         {
-            foreach (var cancellationTokenSourceKey in this.cancellationTokenSourceDictionary.Keys)
+            foreach (var cancellationTokenSourceKey in this.cancellationTokenSourceDictionary.Keys.ToList())
             {
-                if (CanCancel(this.cancellationTokenSourceDictionary[cancellationTokenSourceKey]))
+                if (this.cancellationTokenSourceDictionary.TryGetValue(cancellationTokenSourceKey, out var cancellationTokenSource))
                 {
-                    this.cancellationTokenSourceDictionary[cancellationTokenSourceKey].Cancel();
+                    if (CanCancel(cancellationTokenSource))
+                    {
+                        cancellationTokenSource.Cancel();
+                    }
                 }
             }
         }