com.wallstop-studios.dxmessaging 2.1.2 → 2.1.4

package/Runtime/Core/MessageBus/MessageBus.cs

@@ -32,6 +32,31 @@ namespace DxMessaging.Core.MessageBus
             public long version;
             public long lastSeenVersion = -1;
             public long lastSeenEmissionId;
+
+            /// <summary>
+            /// Clears all cached handler references and resets the version tracking metadata.
+            /// </summary>
+            public void Clear()
+            {
+                handlers.Clear();
+                order.Clear();
+                cache.Clear();
+                version = 0;
+                lastSeenVersion = -1;
+                lastSeenEmissionId = 0;
+            }
+        }
+
+        private sealed class InterceptorCache<TValue>
+        {
+            public readonly SortedList<int, List<TValue>> handlers = new();
+            public long lastSeenEmissionId;
+
+            public void Clear()
+            {
+                handlers.Clear();
+                lastSeenEmissionId = 0;
+            }
         }
 
         private sealed class HandlerCache
@@ -41,6 +66,18 @@ namespace DxMessaging.Core.MessageBus
             public long version;
             public long lastSeenVersion = -1;
             public long lastSeenEmissionId;
+
+            /// <summary>
+            /// Clears all cached handler references and resets the version tracking metadata.
+            /// </summary>
+            public void Clear()
+            {
+                handlers.Clear();
+                cache.Clear();
+                version = 0;
+                lastSeenVersion = -1;
+                lastSeenEmissionId = 0;
+            }
         }
 
         public int RegisteredTargeted
@@ -48,14 +85,11 @@ namespace DxMessaging.Core.MessageBus
             get
             {
                 int count = 0;
-                using MessageCache<
-                    Dictionary<InstanceId, HandlerCache<int, HandlerCache>>
-                >.MessageCacheEnumerator enumeratorT = _targetedSinks.GetEnumerator();
-                while (enumeratorT.MoveNext())
+                foreach (
+                    Dictionary<InstanceId, HandlerCache<int, HandlerCache>> entry in _targetedSinks
+                )
                 {
-                    Dictionary<InstanceId, HandlerCache<int, HandlerCache>> entry =
-                        enumeratorT.Current;
-                    count += entry.Count;
+                    count += entry?.Count ?? 0;
                 }
 
                 return count;
@@ -69,14 +103,11 @@ namespace DxMessaging.Core.MessageBus
             get
             {
                 int count = 0;
-                using MessageCache<
-                    Dictionary<InstanceId, HandlerCache<int, HandlerCache>>
-                >.MessageCacheEnumerator enumeratorB = _broadcastSinks.GetEnumerator();
-                while (enumeratorB.MoveNext())
+                foreach (
+                    Dictionary<InstanceId, HandlerCache<int, HandlerCache>> entry in _broadcastSinks
+                )
                 {
-                    Dictionary<InstanceId, HandlerCache<int, HandlerCache>> entry =
-                        enumeratorB.Current;
-                    count += entry.Count;
+                    count += entry?.Count ?? 0;
                 }
 
                 return count;
@@ -88,13 +119,9 @@ namespace DxMessaging.Core.MessageBus
             get
             {
                 int count = 0;
-                using MessageCache<
-                    HandlerCache<int, HandlerCache>
-                >.MessageCacheEnumerator enumeratorU = _sinks.GetEnumerator();
-                while (enumeratorU.MoveNext())
+                foreach (HandlerCache<int, HandlerCache> entry in _sinks)
                 {
-                    HandlerCache<int, HandlerCache> entry = enumeratorU.Current;
-                    count += entry.handlers.Count;
+                    count += entry?.handlers?.Count ?? 0;
                 }
 
                 return count;
@@ -150,12 +177,9 @@ namespace DxMessaging.Core.MessageBus
         private readonly HandlerCache _globalSinks = new();
 
         // Interceptors split by category to avoid mixing types
-        private readonly MessageCache<HandlerCache<int, List<object>>> _untargetedInterceptsByType =
-            new();
-        private readonly MessageCache<HandlerCache<int, List<object>>> _targetedInterceptsByType =
-            new();
-        private readonly MessageCache<HandlerCache<int, List<object>>> _broadcastInterceptsByType =
-            new();
+        private readonly MessageCache<InterceptorCache<object>> _untargetedInterceptsByType = new();
+        private readonly MessageCache<InterceptorCache<object>> _targetedInterceptsByType = new();
+        private readonly MessageCache<InterceptorCache<object>> _broadcastInterceptsByType = new();
         private readonly Dictionary<object, Dictionary<int, int>> _uniqueInterceptorsAndPriorities =
             new();
 
@@ -177,9 +201,46 @@ namespace DxMessaging.Core.MessageBus
             GlobalMessageBufferSize
         );
 
-        private bool _diagnosticsMode = GlobalDiagnosticsMode;
+        private bool _diagnosticsMode = IMessageBus.ShouldEnableDiagnostics();
         private bool _loggedReflexiveWarning;
 
+        internal void ResetState()
+        {
+            _emissionId = 0;
+            _diagnosticsMode = IMessageBus.ShouldEnableDiagnostics();
+            _loggedReflexiveWarning = false;
+
+            _sinks.Clear();
+            _targetedSinks.Clear();
+            _broadcastSinks.Clear();
+            _postProcessingSinks.Clear();
+            _postProcessingTargetedSinks.Clear();
+            _postProcessingBroadcastSinks.Clear();
+            _postProcessingTargetedWithoutTargetingSinks.Clear();
+            _postProcessingBroadcastWithoutSourceSinks.Clear();
+            _globalSinks.Clear();
+
+            _untargetedInterceptsByType.Clear();
+            _targetedInterceptsByType.Clear();
+            _broadcastInterceptsByType.Clear();
+            _uniqueInterceptorsAndPriorities.Clear();
+            _broadcastMethodsByType.Clear();
+            _innerInterceptorsStack.Clear();
+            _methodCache.Clear();
+
+#if UNITY_2021_3_OR_NEWER
+            _recipientCache.Clear();
+            _componentCache.Clear();
+#endif
+
+            bool enabled = _log.Enabled;
+            _log.Clear();
+            _log.Enabled = enabled;
+            _emissionBuffer.Resize(GlobalMessageBufferSize);
+            _emissionBuffer.Clear();
+        }
+
+        /// <inheritdoc />
         public Action RegisterUntargeted<T>(MessageHandler messageHandler, int priority = 0)
             where T : IUntargetedMessage
         {
@@ -191,6 +252,7 @@ namespace DxMessaging.Core.MessageBus
             );
         }
 
+        /// <inheritdoc />
         public Action RegisterTargeted<T>(
             InstanceId target,
             MessageHandler messageHandler,
@@ -207,6 +269,7 @@ namespace DxMessaging.Core.MessageBus
             );
         }
 
+        /// <inheritdoc />
         public Action RegisterSourcedBroadcast<T>(
             InstanceId source,
             MessageHandler messageHandler,
@@ -223,6 +286,7 @@ namespace DxMessaging.Core.MessageBus
             );
         }
 
+        /// <inheritdoc />
         public Action RegisterSourcedBroadcastWithoutSource<T>(
             MessageHandler messageHandler,
             int priority = 0
@@ -237,6 +301,7 @@ namespace DxMessaging.Core.MessageBus
             );
         }
 
+        /// <inheritdoc />
         public Action RegisterTargetedWithoutTargeting<T>(
             MessageHandler messageHandler,
             int priority = 0
@@ -251,6 +316,7 @@ namespace DxMessaging.Core.MessageBus
             );
         }
 
+        /// <inheritdoc />
         public Action RegisterGlobalAcceptAll(MessageHandler messageHandler)
         {
             _globalSinks.version++;
@@ -303,35 +369,16 @@ namespace DxMessaging.Core.MessageBus
             };
         }
 
+        /// <inheritdoc />
         public Action RegisterUntargetedInterceptor<T>(
             UntargetedInterceptor<T> interceptor,
             int priority = 0
         )
             where T : IUntargetedMessage
         {
-            HandlerCache<int, List<object>> prioritizedInterceptors =
+            InterceptorCache<object> prioritizedInterceptors =
                 _untargetedInterceptsByType.GetOrAdd<T>();
 
-            if (
-                !prioritizedInterceptors.handlers.TryGetValue(
-                    priority,
-                    out List<object> interceptors
-                )
-            )
-            {
-                prioritizedInterceptors.version++;
-                interceptors = new List<object>();
-                prioritizedInterceptors.handlers[priority] = interceptors;
-                // maintain sorted order
-                List<int> order = prioritizedInterceptors.order;
-                int idx = 0;
-                while (idx < order.Count && order[idx] < priority)
-                {
-                    idx++;
-                }
-                order.Insert(idx, priority);
-            }
-
             if (
                 !_uniqueInterceptorsAndPriorities.TryGetValue(
                     interceptor,
@@ -343,6 +390,13 @@ namespace DxMessaging.Core.MessageBus
                 _uniqueInterceptorsAndPriorities[interceptor] = priorityCount;
             }
 
+            List<object> interceptors;
+            if (!prioritizedInterceptors.handlers.TryGetValue(priority, out interceptors))
+            {
+                interceptors = new List<object>();
+                prioritizedInterceptors.handlers.Add(priority, interceptors);
+            }
+
             if (!priorityCount.TryGetValue(priority, out int count))
             {
                 count = 0;
@@ -406,20 +460,17 @@ namespace DxMessaging.Core.MessageBus
                 {
                     if (_untargetedInterceptsByType.TryGetValue<T>(out prioritizedInterceptors))
                     {
-                        prioritizedInterceptors.version++;
                         if (
-                            prioritizedInterceptors.handlers.TryGetValue(priority, out interceptors)
+                            prioritizedInterceptors.handlers.TryGetValue(
+                                priority,
+                                out List<object> interceptors
+                            )
                         )
                         {
                             complete = interceptors.Remove(interceptor);
                             if (interceptors.Count == 0)
                             {
                                 _ = prioritizedInterceptors.handlers.Remove(priority);
-                                int removeIdx = prioritizedInterceptors.order.IndexOf(priority);
-                                if (removeIdx >= 0)
-                                {
-                                    prioritizedInterceptors.order.RemoveAt(removeIdx);
-                                }
                             }
                         }
                     }
@@ -436,35 +487,16 @@ namespace DxMessaging.Core.MessageBus
             };
         }
 
+        /// <inheritdoc />
         public Action RegisterTargetedInterceptor<T>(
             TargetedInterceptor<T> interceptor,
             int priority = 0
         )
             where T : ITargetedMessage
         {
-            HandlerCache<int, List<object>> prioritizedInterceptors =
+            InterceptorCache<object> prioritizedInterceptors =
                 _targetedInterceptsByType.GetOrAdd<T>();
 
-            if (
-                !prioritizedInterceptors.handlers.TryGetValue(
-                    priority,
-                    out List<object> interceptors
-                )
-            )
-            {
-                prioritizedInterceptors.version++;
-                interceptors = new List<object>();
-                prioritizedInterceptors.handlers[priority] = interceptors;
-                // maintain sorted order
-                List<int> order = prioritizedInterceptors.order;
-                int idx = 0;
-                while (idx < order.Count && order[idx] < priority)
-                {
-                    idx++;
-                }
-                order.Insert(idx, priority);
-            }
-
             if (
                 !_uniqueInterceptorsAndPriorities.TryGetValue(
                     interceptor,
@@ -476,6 +508,13 @@ namespace DxMessaging.Core.MessageBus
                 _uniqueInterceptorsAndPriorities[interceptor] = priorityCount;
             }
 
+            List<object> interceptors;
+            if (!prioritizedInterceptors.handlers.TryGetValue(priority, out interceptors))
+            {
+                interceptors = new List<object>();
+                prioritizedInterceptors.handlers.Add(priority, interceptors);
+            }
+
             if (!priorityCount.TryGetValue(priority, out int count))
             {
                 count = 0;
@@ -539,20 +578,17 @@ namespace DxMessaging.Core.MessageBus
                 {
                     if (_targetedInterceptsByType.TryGetValue<T>(out prioritizedInterceptors))
                     {
-                        prioritizedInterceptors.version++;
                         if (
-                            prioritizedInterceptors.handlers.TryGetValue(priority, out interceptors)
+                            prioritizedInterceptors.handlers.TryGetValue(
+                                priority,
+                                out List<object> interceptors
+                            )
                         )
                         {
                             complete = interceptors.Remove(interceptor);
                             if (interceptors.Count == 0)
                             {
                                 _ = prioritizedInterceptors.handlers.Remove(priority);
-                                int removeIdx = prioritizedInterceptors.order.IndexOf(priority);
-                                if (removeIdx >= 0)
-                                {
-                                    prioritizedInterceptors.order.RemoveAt(removeIdx);
-                                }
                             }
                         }
                     }
@@ -569,35 +605,16 @@ namespace DxMessaging.Core.MessageBus
             };
         }
 
+        /// <inheritdoc />
         public Action RegisterBroadcastInterceptor<T>(
             BroadcastInterceptor<T> interceptor,
             int priority = 0
         )
             where T : IBroadcastMessage
         {
-            HandlerCache<int, List<object>> prioritizedInterceptors =
+            InterceptorCache<object> prioritizedInterceptors =
                 _broadcastInterceptsByType.GetOrAdd<T>();
 
-            if (
-                !prioritizedInterceptors.handlers.TryGetValue(
-                    priority,
-                    out List<object> interceptors
-                )
-            )
-            {
-                prioritizedInterceptors.version++;
-                interceptors = new List<object>();
-                prioritizedInterceptors.handlers[priority] = interceptors;
-                // maintain sorted order
-                List<int> order = prioritizedInterceptors.order;
-                int idx = 0;
-                while (idx < order.Count && order[idx] < priority)
-                {
-                    idx++;
-                }
-                order.Insert(idx, priority);
-            }
-
             if (
                 !_uniqueInterceptorsAndPriorities.TryGetValue(
                     interceptor,
@@ -609,6 +626,13 @@ namespace DxMessaging.Core.MessageBus
                 _uniqueInterceptorsAndPriorities[interceptor] = priorityCount;
             }
 
+            List<object> interceptors;
+            if (!prioritizedInterceptors.handlers.TryGetValue(priority, out interceptors))
+            {
+                interceptors = new List<object>();
+                prioritizedInterceptors.handlers.Add(priority, interceptors);
+            }
+
             if (!priorityCount.TryGetValue(priority, out int count))
             {
                 count = 0;
@@ -672,20 +696,17 @@ namespace DxMessaging.Core.MessageBus
                 {
                     if (_broadcastInterceptsByType.TryGetValue<T>(out prioritizedInterceptors))
                     {
-                        prioritizedInterceptors.version++;
                         if (
-                            prioritizedInterceptors.handlers.TryGetValue(priority, out interceptors)
+                            prioritizedInterceptors.handlers.TryGetValue(
+                                priority,
+                                out List<object> interceptors
+                            )
                         )
                         {
                             complete = interceptors.Remove(interceptor);
                             if (interceptors.Count == 0)
                             {
                                 _ = prioritizedInterceptors.handlers.Remove(priority);
-                                int removeIdx = prioritizedInterceptors.order.IndexOf(priority);
-                                if (removeIdx >= 0)
-                                {
-                                    prioritizedInterceptors.order.RemoveAt(removeIdx);
-                                }
                             }
                         }
                     }
@@ -702,6 +723,7 @@ namespace DxMessaging.Core.MessageBus
             };
         }
 
+        /// <inheritdoc />
         public Action RegisterUntargetedPostProcessor<T>(
             MessageHandler messageHandler,
             int priority = 0
@@ -716,6 +738,7 @@ namespace DxMessaging.Core.MessageBus
             );
         }
 
+        /// <inheritdoc />
         public Action RegisterTargetedPostProcessor<T>(
             InstanceId target,
             MessageHandler messageHandler,
@@ -732,6 +755,7 @@ namespace DxMessaging.Core.MessageBus
             );
         }
 
+        /// <inheritdoc />
         public Action RegisterTargetedWithoutTargetingPostProcessor<T>(
             MessageHandler messageHandler,
             int priority = 0
@@ -746,6 +770,7 @@ namespace DxMessaging.Core.MessageBus
             );
         }
 
+        /// <inheritdoc />
         public Action RegisterBroadcastPostProcessor<T>(
             InstanceId source,
             MessageHandler messageHandler,
@@ -762,6 +787,7 @@ namespace DxMessaging.Core.MessageBus
             );
         }
 
+        /// <inheritdoc />
         public Action RegisterBroadcastWithoutSourcePostProcessor<T>(
             MessageHandler messageHandler,
             int priority = 0
@@ -778,6 +804,7 @@ namespace DxMessaging.Core.MessageBus
 
         // Legacy RegisterInterceptor removed in favor of split implementations above
 
+        /// <inheritdoc />
         public void UntypedUntargetedBroadcast(IUntargetedMessage typedMessage)
         {
             Type messageType = typedMessage.MessageType;
@@ -807,6 +834,7 @@ namespace DxMessaging.Core.MessageBus
             broadcast.Invoke(typedMessage);
         }
 
+        /// <inheritdoc />
         public void UntargetedBroadcast<TMessage>(ref TMessage typedMessage)
             where TMessage : IUntargetedMessage
         {
@@ -1010,6 +1038,7 @@ namespace DxMessaging.Core.MessageBus
             }
         }
 
+        /// <inheritdoc />
         public void UntypedTargetedBroadcast(InstanceId target, ITargetedMessage typedMessage)
         {
             Type messageType = typedMessage.MessageType;
@@ -1039,6 +1068,7 @@ namespace DxMessaging.Core.MessageBus
             broadcast.Invoke(target, typedMessage);
         }
 
+        /// <inheritdoc />
         public void TargetedBroadcast<TMessage>(ref InstanceId target, ref TMessage typedMessage)
             where TMessage : ITargetedMessage
         {
@@ -2047,6 +2077,7 @@ namespace DxMessaging.Core.MessageBus
             }
         }
 
+        /// <inheritdoc />
         public void UntypedSourcedBroadcast(InstanceId source, IBroadcastMessage typedMessage)
         {
             Type messageType = typedMessage.MessageType;
@@ -2079,6 +2110,7 @@ namespace DxMessaging.Core.MessageBus
             broadcast.Invoke(source, typedMessage);
         }
 
+        /// <inheritdoc />
         public void SourcedBroadcast<TMessage>(ref InstanceId source, ref TMessage typedMessage)
             where TMessage : IBroadcastMessage
         {
@@ -2939,39 +2971,24 @@ namespace DxMessaging.Core.MessageBus
         }
 
         private bool TryGetUntargetedInterceptorCaches<TMessage>(
-            out List<KeyValuePair<int, List<object>>> interceptorStack,
+            out SortedList<int, List<object>> interceptorHandlers,
             out List<object> interceptorObjects
         )
             where TMessage : IUntargetedMessage
         {
             if (
                 !_untargetedInterceptsByType.TryGetValue<TMessage>(
-                    out HandlerCache<int, List<object>> interceptors
+                    out InterceptorCache<object> interceptors
                 )
                 || interceptors.handlers.Count == 0
             )
             {
-                interceptorStack = default;
+                interceptorHandlers = default;
                 interceptorObjects = default;
                 return false;
             }
 
-            interceptorStack = interceptors.cache;
-            if (interceptors.version != interceptors.lastSeenVersion)
-            {
-                interceptorStack.Clear();
-                List<int> keys = interceptors.order;
-                for (int i = 0; i < keys.Count; ++i)
-                {
-                    int key = keys[i];
-                    if (interceptors.handlers.TryGetValue(key, out List<object> values))
-                    {
-                        interceptorStack.Add(new KeyValuePair<int, List<object>>(key, values));
-                    }
-                }
-
-                interceptors.lastSeenVersion = interceptors.version;
-            }
+            interceptorHandlers = interceptors.handlers;
 
             if (!_innerInterceptorsStack.TryPop(out interceptorObjects))
             {
@@ -2982,39 +2999,24 @@ namespace DxMessaging.Core.MessageBus
         }
 
         private bool TryGetTargetedInterceptorCaches<TMessage>(
-            out List<KeyValuePair<int, List<object>>> interceptorStack,
+            out SortedList<int, List<object>> interceptorHandlers,
             out List<object> interceptorObjects
         )
             where TMessage : ITargetedMessage
         {
             if (
                 !_targetedInterceptsByType.TryGetValue<TMessage>(
-                    out HandlerCache<int, List<object>> interceptors
+                    out InterceptorCache<object> interceptors
                 )
                 || interceptors.handlers.Count == 0
             )
             {
-                interceptorStack = default;
+                interceptorHandlers = default;
                 interceptorObjects = default;
                 return false;
             }
 
-            interceptorStack = interceptors.cache;
-            if (interceptors.version != interceptors.lastSeenVersion)
-            {
-                interceptorStack.Clear();
-                List<int> keys = interceptors.order;
-                for (int i = 0; i < keys.Count; ++i)
-                {
-                    int key = keys[i];
-                    if (interceptors.handlers.TryGetValue(key, out List<object> values))
-                    {
-                        interceptorStack.Add(new KeyValuePair<int, List<object>>(key, values));
-                    }
-                }
-
-                interceptors.lastSeenVersion = interceptors.version;
-            }
+            interceptorHandlers = interceptors.handlers;
 
             if (!_innerInterceptorsStack.TryPop(out interceptorObjects))
             {
@@ -3025,39 +3027,24 @@ namespace DxMessaging.Core.MessageBus
         }
 
         private bool TryGetBroadcastInterceptorCaches<TMessage>(
-            out List<KeyValuePair<int, List<object>>> interceptorStack,
+            out SortedList<int, List<object>> interceptorHandlers,
             out List<object> interceptorObjects
         )
             where TMessage : IBroadcastMessage
         {
             if (
                 !_broadcastInterceptsByType.TryGetValue<TMessage>(
-                    out HandlerCache<int, List<object>> interceptors
+                    out InterceptorCache<object> interceptors
                 )
                 || interceptors.handlers.Count == 0
             )
             {
-                interceptorStack = default;
+                interceptorHandlers = default;
                 interceptorObjects = default;
                 return false;
             }
 
-            interceptorStack = interceptors.cache;
-            if (interceptors.version != interceptors.lastSeenVersion)
-            {
-                interceptorStack.Clear();
-                List<int> keys = interceptors.order;
-                for (int i = 0; i < keys.Count; ++i)
-                {
-                    int key = keys[i];
-                    if (interceptors.handlers.TryGetValue(key, out List<object> values))
-                    {
-                        interceptorStack.Add(new KeyValuePair<int, List<object>>(key, values));
-                    }
-                }
-
-                interceptors.lastSeenVersion = interceptors.version;
-            }
+            interceptorHandlers = interceptors.handlers;
 
             if (!_innerInterceptorsStack.TryPop(out interceptorObjects))
             {
@@ -3072,7 +3059,7 @@ namespace DxMessaging.Core.MessageBus
         {
             if (
                 !TryGetUntargetedInterceptorCaches<T>(
-                    out List<KeyValuePair<int, List<object>>> interceptorStack,
+                    out SortedList<int, List<object>> interceptorHandlers,
                     out List<object> interceptorObjects
                 )
             )
@@ -3082,11 +3069,11 @@ namespace DxMessaging.Core.MessageBus
 
             try
             {
-                for (int s = 0; s < interceptorStack.Count; ++s)
+                IList<List<object>> prioritizedInterceptors = interceptorHandlers.Values;
+                for (int s = 0; s < prioritizedInterceptors.Count; ++s)
                 {
-                    KeyValuePair<int, List<object>> entry = interceptorStack[s];
                     interceptorObjects.Clear();
-                    List<object> interceptors = entry.Value;
+                    List<object> interceptors = prioritizedInterceptors[s];
                     interceptorObjects.AddRange(interceptors);
 
                     for (int i = 0; i < interceptorObjects.Count; ++i)
@@ -3114,7 +3101,7 @@ namespace DxMessaging.Core.MessageBus
         {
             if (
                 !TryGetTargetedInterceptorCaches<T>(
-                    out List<KeyValuePair<int, List<object>>> interceptorStack,
+                    out SortedList<int, List<object>> interceptorHandlers,
                     out List<object> interceptorObjects
                 )
             )
@@ -3124,11 +3111,11 @@ namespace DxMessaging.Core.MessageBus
 
             try
             {
-                for (int s = 0; s < interceptorStack.Count; ++s)
+                IList<List<object>> prioritizedInterceptors = interceptorHandlers.Values;
+                for (int s = 0; s < prioritizedInterceptors.Count; ++s)
                 {
-                    KeyValuePair<int, List<object>> entry = interceptorStack[s];
                     interceptorObjects.Clear();
-                    List<object> interceptors = entry.Value;
+                    List<object> interceptors = prioritizedInterceptors[s];
                     interceptorObjects.AddRange(interceptors);
 
                     for (int i = 0; i < interceptorObjects.Count; ++i)
@@ -3156,7 +3143,7 @@ namespace DxMessaging.Core.MessageBus
         {
             if (
                 !TryGetBroadcastInterceptorCaches<T>(
-                    out List<KeyValuePair<int, List<object>>> interceptorStack,
+                    out SortedList<int, List<object>> interceptorHandlers,
                     out List<object> interceptorObjects
                 )
             )
@@ -3166,11 +3153,11 @@ namespace DxMessaging.Core.MessageBus
 
             try
             {
-                for (int s = 0; s < interceptorStack.Count; ++s)
+                IList<List<object>> prioritizedInterceptors = interceptorHandlers.Values;
+                for (int s = 0; s < prioritizedInterceptors.Count; ++s)
                 {
-                    KeyValuePair<int, List<object>> entry = interceptorStack[s];
                     interceptorObjects.Clear();
-                    List<object> interceptors = entry.Value;
+                    List<object> interceptors = prioritizedInterceptors[s];
                     interceptorObjects.AddRange(interceptors);
 
                     for (int i = 0; i < interceptorObjects.Count; ++i)