Fix ThreadLocalOverPerLockedStacksObjectPool<T>.PerCoreStack.FillFrom…

…GlobalReserve() method throwing
Enderlook · Dec 6, 2021 · e733ef5 · e733ef5
1 parent 3058f61
commit e733ef5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -7,4 +7,5 @@ Initial release.
 - Fix documentation
 - Specify that `ObjectPool<T>.ApproximateCount()` must return `-1` if the operation is not supported.
 - Specify that `ObjectPool<T>.Return(T obj)` must never fail silently if `obj` is `null`.
-- Fix `DynamicObjectPool<T>` not auto-trimming.
+- Fix `DynamicObjectPool<T>` not auto-trimming.
+- Fix `ThreadLocalOverPerLockedStacksObjectPool<T>.Rent()` (implementation behind `ObjectPool<T>.Shared.Rent()`) throwing when getting elements from global reserve.
diff --git a/Net Pools/src/ThreadLocalOverPerCoreLockedStacksObjectPool.cs b/Net Pools/src/ThreadLocalOverPerCoreLockedStacksObjectPool.cs
@@ -586,13 +586,13 @@ public bool TryPush(T element)
 
                     ObjectWrapper<T?>[] items = array;
 
-                    int length = Math.Min(MaxObjectsPerCore - count, globalCount);
+                    int length = Math.Min(MaxObjectsPerCore - count_, globalCount);
                     int start = globalCount - length;
-                    Array.Copy(globalReserve_, start, items, count, length);
+                    Array.Copy(globalReserve_, start, items, count_, length);
                     Array.Clear(globalReserve_, start, length);
 
                     globalCount = start;
-                    count += length;
+                    count_ += length;
 
                     globalReserveCount = globalCount;
                 }