From 17741cbc50a584c7bf7e355f56c6c8178dff573f Mon Sep 17 00:00:00 2001
From: Stef Heyenrath <Stef.Heyenrath@gmail.com>
Date: Wed, 28 Feb 2018 08:34:57 +0100
Subject: [PATCH] FIx for IsStarted (#93)

---
 examples/WireMock.Net.StandAlone.NETCoreApp/Program.cs | 2 +-
 src/WireMock.Net/Owin/AspNetCoreSelfHost.cs            | 6 +++---
 src/WireMock.Net/Server/FluentMockServer.cs            | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/WireMock.Net.StandAlone.NETCoreApp/Program.cs b/examples/WireMock.Net.StandAlone.NETCoreApp/Program.cs
index 0cb3b371..8d1cffdf 100644
--- a/examples/WireMock.Net.StandAlone.NETCoreApp/Program.cs
+++ b/examples/WireMock.Net.StandAlone.NETCoreApp/Program.cs
@@ -37,7 +37,7 @@ namespace WireMock.Net.StandAlone.NETCoreApp
 
             while (true)
             {
-                Console.WriteLine($"{DateTime.UtcNow} WireMock.Net server running");
+                Console.WriteLine($"{DateTime.UtcNow} WireMock.Net server running : {_server.IsStarted}");
                 Thread.Sleep(sleepTime);
             }
         }
diff --git a/src/WireMock.Net/Owin/AspNetCoreSelfHost.cs b/src/WireMock.Net/Owin/AspNetCoreSelfHost.cs
index e9b8dcc0..71db3db2 100644
--- a/src/WireMock.Net/Owin/AspNetCoreSelfHost.cs
+++ b/src/WireMock.Net/Owin/AspNetCoreSelfHost.cs
@@ -87,20 +87,20 @@ namespace WireMock.Owin
 #endif
                 .Build();
 
+            IsStarted = true;
+
 #if NETSTANDARD1_3
             Console.WriteLine("WireMock.Net server using netstandard1.3");
             return Task.Run(() =>
             {
                 _host.Run(_cts.Token);
-                IsStarted = true;
             }, _cts.Token);
 #else
             System.Console.WriteLine("WireMock.Net server using netstandard2.0");
-            IsStarted = true;
+
             return Task.Run(() =>
             {
                 _host.Run();
-                IsStarted = true;
             }, _cts.Token);
 #endif
         }
diff --git a/src/WireMock.Net/Server/FluentMockServer.cs b/src/WireMock.Net/Server/FluentMockServer.cs
index 9083816a..63eb80c0 100644
--- a/src/WireMock.Net/Server/FluentMockServer.cs
+++ b/src/WireMock.Net/Server/FluentMockServer.cs
@@ -181,8 +181,6 @@ namespace WireMock.Server
 #else
             _httpServer = new OwinSelfHost(_options, Urls);
 #endif
-            IsStarted = _httpServer.IsStarted;
-
             Ports = _httpServer.Ports;
 
             _httpServer.StartAsync();
@@ -190,6 +188,8 @@ namespace WireMock.Server
             // Fix for 'Bug: Server not listening after Start() returns (on macOS)'
             Task.Delay(ServerStartDelay).Wait();
 
+            IsStarted = _httpServer.IsStarted;
+
             if (settings.AllowPartialMapping == true)
             {
                 AllowPartialMapping();