Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@ -35,6 +35,9 @@ using System.Threading;
using System.Transactions;
using System.ServiceModel;
using System.ServiceModel.Description;
using System.Net.Sockets;
using System.Xml;
using System.IO;
namespace System.ServiceModel.Dispatcher
{
@ -598,7 +601,10 @@ namespace System.ServiceModel.Dispatcher
if (ProcessErrorWithHandlers (reply, ex, out res))
return;
rc.Reply (res);
if ((!(ex is SocketException)) &&
(!(ex is XmlException)) &&
(!(ex is IOException)))
rc.Reply (res);
reply.Close (owner.DefaultCloseTimeout); // close the channel
} finally {