commit 22bd3450c6e97e348d64fb6a75171e8ced79d1e4
author Stephen Starkie <stephen@egtechnology.co.uk> Tue Mar 20 13:28:40 2018 +0000
committer James E. King III <jking@apache.org> Tue Mar 20 16:32:32 2018 -0400
tree 9e6c97d191ced0d31e18fb438901ddcbf46b8c77
parent e46419b5ecb8e430d8555c2d5fbcffbc6a91ff83

THRIFT-4524: .NET Core Server doesn't close properly when cancelled
Also fixed up the project files to include quoted Program Files paths
Client: netcore

This closes #1512

lib/netcore/Thrift/Server/AsyncBaseServer.cs

diff --git a/lib/netcore/Thrift/Server/AsyncBaseServer.cs b/lib/netcore/Thrift/Server/AsyncBaseServer.cs
index 0032ca3..325c39c 100644
--- a/lib/netcore/Thrift/Server/AsyncBaseServer.cs
+++ b/lib/netcore/Thrift/Server/AsyncBaseServer.cs
@@ -100,7 +100,11 @@
                 }
                 else
                 {
-                    await Task.Delay(TimeSpan.FromMilliseconds(_clientWaitingDelay), cancellationToken);
+                    try
+                    {
+                        await Task.Delay(TimeSpan.FromMilliseconds(_clientWaitingDelay), cancellationToken);
+                    }
+                    catch(TaskCanceledException) { }
                 }
             }
 

test/netcore/Client/Client.csproj

diff --git a/test/netcore/Client/Client.csproj b/test/netcore/Client/Client.csproj
index 4b31a7d..f16af39 100644
--- a/test/netcore/Client/Client.csproj
+++ b/test/netcore/Client/Client.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <AssemblyName>Client</AssemblyName>
@@ -24,8 +24,8 @@
     <Exec Condition="'$(OS)' == 'Windows_NT'" Command="where thrift" ConsoleToMSBuild="true">
       <Output TaskParameter="ConsoleOutput" PropertyName="PathToThrift" />
     </Exec>
-    <Exec Condition="Exists('$(PathToThrift)')" Command="$(PathToThrift) -out $(ProjectDir) -gen netcore:wcf,union,serial,hashcode -r ./../../ThriftTest.thrift" />
+    <Exec Condition="Exists('$(PathToThrift)')" Command="&quot;$(PathToThrift)&quot; -out $(ProjectDir) -gen netcore:wcf,union,serial,hashcode -r ./../../ThriftTest.thrift" />
     <Exec Condition="Exists('thrift')" Command="thrift -out $(ProjectDir) -gen netcore:wcf,union,serial,hashcode -r ./../../ThriftTest.thrift" />
     <Exec Condition="Exists('$(ProjectDir)/../../../compiler/cpp/thrift')" Command="$(ProjectDir)/../../../compiler/cpp/thrift -out $(ProjectDir) -gen netcore:wcf,union,serial,hashcode -r ./../../ThriftTest.thrift" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>

test/netcore/Server/Server.csproj

diff --git a/test/netcore/Server/Server.csproj b/test/netcore/Server/Server.csproj
index ad2fb7c..2f9b4b1 100644
--- a/test/netcore/Server/Server.csproj
+++ b/test/netcore/Server/Server.csproj
@@ -24,7 +24,7 @@
     <Exec Condition="'$(OS)' == 'Windows_NT'" Command="where thrift" ConsoleToMSBuild="true">
       <Output TaskParameter="ConsoleOutput" PropertyName="PathToThrift" />
     </Exec>
-    <Exec Condition="Exists('$(PathToThrift)')" Command="$(PathToThrift) -out $(ProjectDir) -gen netcore:wcf,union,serial,hashcode -r ./../../ThriftTest.thrift" />
+    <Exec Condition="Exists('$(PathToThrift)')" Command="&quot;$(PathToThrift)&quot; -out $(ProjectDir) -gen netcore:wcf,union,serial,hashcode -r ./../../ThriftTest.thrift" />
     <Exec Condition="Exists('thrift')" Command="thrift -out $(ProjectDir) -gen netcore:wcf,union,serial,hashcode -r ./../../ThriftTest.thrift" />
     <Exec Condition="Exists('$(ProjectDir)/../../../compiler/cpp/thrift')" Command="$(ProjectDir)/../../../compiler/cpp/thrift -out $(ProjectDir) -gen netcore:wcf,union,serial,hashcode -r ./../../ThriftTest.thrift" />
   </Target>