Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions
--- 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);