Merge pull request #552 from Orckestra/dev

Fixing an exception during setup if a C1 console for the same website is opened
Orckestra · Mar 6, 2018 · 0b2a13a · 0b2a13a
2 parents ba75fb5 + 9ff44fd
commit 0b2a13a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Composite/Core/ServiceLocator.cs b/Composite/Core/ServiceLocator.cs
@@ -132,7 +132,7 @@ internal static bool HasService(Type serviceType)
         {
             Verify.ArgumentNotNull(serviceType, nameof(serviceType));
 
-            if (!SystemSetupFacade.IsSystemFirstTimeInitialized || SystemSetupFacade.SetupIsRunning)
+            if (ServiceLocatorNotInitialized)
             {
                 return false;
             }
@@ -221,7 +221,7 @@ internal static void DisposeRequestServicesScope(HttpContext context)
 
         internal static IDisposable EnsureThreadDataServiceScope()
         {
-            if (RequestScopedServiceProvider != null) return EmptyDisposable.Instance;
+            if (RequestScopedServiceProvider != null || ServiceLocatorNotInitialized) return EmptyDisposable.Instance;
 
             var current = ThreadDataManager.GetCurrentNotNull();
 
@@ -277,5 +277,7 @@ public void Dispose()
             }
         }
 
+        private static bool ServiceLocatorNotInitialized =>
+            !SystemSetupFacade.IsSystemFirstTimeInitialized || SystemSetupFacade.SetupIsRunning;
     }
 }