Fix SocketException from AcceptTcpClientAsync during Dispose (#130)

rnwood · Jan 7, 2021 · df3052f · df3052f
1 parent 56702c5
commit df3052f
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/Rnwood.SmtpServer/SmtpServer.cs b/Rnwood.SmtpServer/SmtpServer.cs
@@ -253,6 +253,17 @@ private async Task AcceptNextClient()
 			{
 				tcpClient = await this.listener.AcceptTcpClientAsync().ConfigureAwait(false);
 			}
+			catch (SocketException)
+			{
+				if (this.IsRunning)
+				{
+					throw;
+				}
+
+				this.logger.LogDebug("Got SocketException on listener, shutting down");
+
+				// normal - caused by _listener.Stop();
+			}
 			catch (InvalidOperationException)
 			{
 				if (this.IsRunning)