fix extras racecondition for cancellation token (#1965)

asynkron · Apr 4, 2023 · 9736e45 · 9736e45
1 parent b6cf8bb
commit 9736e45
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/src/Proto.Actor/Context/ActorContext.cs b/src/Proto.Actor/Context/ActorContext.cs
@@ -600,8 +600,21 @@ private ActorContextExtras EnsureExtras()
             return _extras;
         }
 
-        var context = _props.ContextDecoratorChain?.Invoke(this) ?? this;
-        _extras = new ActorContextExtras(context);
+
+        //YOLO: nobody else should touch this....
+#pragma warning disable RCS1059
+        lock (this)
+#pragma warning restore RCS1059
+        {
+            //early exit if another thread already created the extras
+            if (_extras is not null)
+            {
+                return _extras;
+            }
+
+            var context = _props.ContextDecoratorChain?.Invoke(this) ?? this;
+            _extras = new ActorContextExtras(context);
+        }
 
         return _extras;
     }