Merge pull request #2373 from akoeplinger/servicemodel-tcpreplychannel-race

[ServiceModel] Make TcpReplyChannel.OnClose thread-safe

2 files changed, 15 insertions, 3 deletions

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/HttpReplyChannel.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/HttpReplyChannel.cs
index 03e7cad1f1c..098b622aa83 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/HttpReplyChannel.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/HttpReplyChannel.cs
@@ -104,12 +104,15 @@ namespace System.ServiceModel.Channels.Http
 		}
 
 		bool close_started;
+		object close_lock = new object ();
 
 		protected override void OnClose (TimeSpan timeout)
 		{
-			if (close_started)
-				return;
-			close_started = true;
+			lock (close_lock) {
+				if (close_started)
+					return;
+				close_started = true;
+			}
 			DateTime start = DateTime.Now;
 
 			// FIXME: consider timeout
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels.NetTcp/TcpReplyChannel.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels.NetTcp/TcpReplyChannel.cs
index f597167e9d1..b005ad6c18a 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels.NetTcp/TcpReplyChannel.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels.NetTcp/TcpReplyChannel.cs
@@ -135,9 +135,18 @@ namespace System.ServiceModel.Channels.NetTcp
 		{
 			throw new NotImplementedException ();
 		}
+		
+		bool close_started;
+		object close_lock = new object ();
 
 		protected override void OnClose (TimeSpan timeout)
 		{
+			lock (close_lock) {
+				if (close_started)
+					return;
+				close_started = true;
+			}
+
 			client.Close ();
 			client = null;
 			base.OnClose (timeout);