fix: separate delegate handler cache

KennanChan · Feb 27, 2020 · ff5be80 · ff5be80
1 parent 3931735
commit ff5be80
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/Revit.Async.Shared/RevitTask.cs b/Revit.Async.Shared/RevitTask.cs
@@ -8,6 +8,7 @@
 using Revit.Async.ExternalEvents;
 using Revit.Async.Interfaces;
 using Revit.Async.Utils;
+
 #if NET40
 using Revit.Async.Extensions;
 
@@ -24,18 +25,25 @@ public class RevitTask
     {
         #region Fields
 
-        private static ConcurrentDictionary<Type, ExternalEventPair> _delegateExternalEvents;
+        private static ConcurrentDictionary<Type, ExternalEventPair> _asyncDelegateExternalEvents;
+        private static ConcurrentDictionary<Type, ExternalEventPair> _syncDelegateExternalEvents;
         private static ConcurrentDictionary<Type, ExternalEventPair> _registeredExternalEvents;
 
         #endregion
 
         #region Properties
 
         /// <summary>
-        ///     Cache all the created <see cref="ExternalEvent" />s and their <see cref="IExternalEventHandler" />
+        ///     Cache all the created <see cref="ExternalEvent" />s and their <see cref="IExternalEventHandler" /> running async code
+        /// </summary>
+        private static ConcurrentDictionary<Type, ExternalEventPair> AsyncDelegateExternalEvents =>
+            _asyncDelegateExternalEvents ?? (_asyncDelegateExternalEvents = new ConcurrentDictionary<Type, ExternalEventPair>());
+
+        /// <summary>
+        ///     Cache all the created <see cref="ExternalEvent" />s and their <see cref="IExternalEventHandler" /> running sync code
         /// </summary>
-        private static ConcurrentDictionary<Type, ExternalEventPair> DelegateExternalEvents =>
-            _delegateExternalEvents ?? (_delegateExternalEvents = new ConcurrentDictionary<Type, ExternalEventPair>());
+        private static ConcurrentDictionary<Type, ExternalEventPair> SyncDelegateExternalEvents =>
+            _syncDelegateExternalEvents ?? (_syncDelegateExternalEvents = new ConcurrentDictionary<Type, ExternalEventPair>());
 
         /// <summary>
         ///     Use to create any other external events
@@ -125,7 +133,7 @@ public static Task<TResult> RunAsync<TResult>(Func<TResult> function)
         /// <returns>The result</returns>
         public static Task<TResult> RunAsync<TResult>(Func<UIApplication, TResult> function)
         {
-            var externalEventPair = DelegateExternalEvents.GetOrAdd(typeof(TResult), _ =>
+            var externalEventPair = SyncDelegateExternalEvents.GetOrAdd(typeof(TResult), _ =>
             {
                 var handler = new SyncDelegateExternalEventHandler<TResult>();
                 return new ExternalEventPair(handler, () => CreateExternalEvent(handler));
@@ -158,7 +166,7 @@ public static Task<TResult> RunAsync<TResult>(Func<Task<TResult>> function)
         /// <returns></returns>
         public static Task<TResult> RunAsync<TResult>(Func<UIApplication, Task<TResult>> function)
         {
-            var externalEventPair = DelegateExternalEvents.GetOrAdd(typeof(TResult), _ =>
+            var externalEventPair = AsyncDelegateExternalEvents.GetOrAdd(typeof(TResult), _ =>
             {
                 var handler = new AsyncDelegateExternalEventHandler<TResult>();
                 return new ExternalEventPair(handler, () => CreateExternalEvent(handler));