From c0a53b81df519393f107229dc38979aae04468d1 Mon Sep 17 00:00:00 2001
From: Halil ibrahim Kalkan <hi_kalkan@yahoo.com>
Date: Tue, 19 Feb 2019 22:01:32 +0300
Subject: [PATCH] Implemente double check pattern for
 AspNetCoreCorrelationIdProvider

---
 .../AspNetCoreCorrelationIdProvider.cs        | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Tracing/AspNetCoreCorrelationIdProvider.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Tracing/AspNetCoreCorrelationIdProvider.cs
index 78383d1252..e62f1ed2a4 100644
--- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Tracing/AspNetCoreCorrelationIdProvider.cs
+++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Tracing/AspNetCoreCorrelationIdProvider.cs
@@ -27,18 +27,21 @@ namespace Volo.Abp.AspNetCore.Tracing
                 return CreateNewCorrelationId();
             }
 
-            lock (HttpContextAccessor.HttpContext.Request.Headers)
-            {
-                string correlationId = HttpContextAccessor.HttpContext.Request.Headers[Options.HttpHeaderName];
+            string correlationId = HttpContextAccessor.HttpContext.Request.Headers[Options.HttpHeaderName];
 
-                if (correlationId.IsNullOrEmpty())
+            if (correlationId.IsNullOrEmpty())
+            {
+                lock (HttpContextAccessor.HttpContext.Request.Headers)
                 {
-                    correlationId = CreateNewCorrelationId();
-                    HttpContextAccessor.HttpContext.Request.Headers[Options.HttpHeaderName] = correlationId;
+                    if (correlationId.IsNullOrEmpty())
+                    {
+                        correlationId = CreateNewCorrelationId();
+                        HttpContextAccessor.HttpContext.Request.Headers[Options.HttpHeaderName] = correlationId;
+                    }
                 }
-
-                return correlationId;
             }
+
+            return correlationId;
         }
 
         protected virtual string CreateNewCorrelationId()