Max ThreadStatic actually static

Author: benaadams

src/Benchmarks/Startup.cs

@@ -131,7 +131,7 @@ public class PooledContextFactory : IHttpContextFactory
             private IHttpContextAccessor _httpContextAccessor;
 
             [ThreadStatic]
-            Queue<DefaultHttpContext> _contextPool;
+            static Queue<DefaultHttpContext> _contextPool;
 
             public PooledContextFactory() : this(httpContextAccessor: null)
             {
@@ -150,23 +150,20 @@ private Queue<DefaultHttpContext> ContextPool
                     {
                         _contextPool = new Queue<DefaultHttpContext>(16);
                     }
+
                     return _contextPool;
                 }
             }
 
             public HttpContext Create(IFeatureCollection featureCollection)
             {
                 var contextPool = ContextPool;
-                // locking as ThreadStatic didn't appear to be behaving thread safe via property on coreclr x64
-                lock (contextPool)
+                if (contextPool.Count > 0)
                 {
-                    if (contextPool.Count > 0)
-                    {
-                        var context = contextPool.Dequeue();
-                        // Needs https://github.com/aspnet/HttpAbstractions/pull/501
-                        context.UpdateFeatures(featureCollection);
-                        return context;
-                    }
+                    var context = contextPool.Dequeue();
+                    // Needs https://github.com/aspnet/HttpAbstractions/pull/501
+                    //context.UpdateFeatures(featureCollection);
+                    return context;
                 }
 
                 return new DefaultHttpContext(featureCollection);
@@ -184,13 +181,10 @@ public void Dispose(HttpContext httpContext)
                 if (context != null)
                 {
                     var contextPool = ContextPool;
-                    // locking as ThreadStatic didn't appear to be behaving thread safe via property on coreclr x64
-                    lock (contextPool)
+
+                    if (contextPool.Count < 16)
                     {
-                        if (contextPool.Count < 16)
-                        {
-                            contextPool.Enqueue(context);
-                        }
+                        contextPool.Enqueue(context);
                     }
                 }
             }